svn commit: r1934014 - subversion/branches/javahl-1.15/subversion/bindings/javahl/tests/org/apache/subversion/javahl

Author: brane
Date: Sun May 10 03:26:36 2026
New Revision: 1934014

Log:
Author: brane
Date: Sat May  9 21:15:21 2026
New Revision: 1934009

Log:
On the javahl-1.15 branch: Add more checkout tests. Replace all uses of
the form of of SVNClient.checkout.

[in subversion/bindings/javahl/tests/org/apache/subversion/javahl]

* BasicTests.java
  (BasicTests.testCurrentWcVersionCheckout,
   BasicTests.testAncientWcVersionCheckout): New test cases.
  (BasicTests.testBasicCheckout,
   BasicTests.testBasicCheckoutDeleted,
   BasicTests.testBasicInfo2,
   BasicTests.testCrash_RequestChannel_nativeRead_AfterSvnError):
   Call the new version of SVNClient.checkout.
* SVNTests.java (SVNTests.createInitialWorkingCopy):
   Call the new version of SVNClient.checkout.

Modified:
   subversion/branches/javahl-1.15/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
   subversion/branches/javahl-1.15/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java

Modified: subversion/branches/javahl-1.15/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
==============================================================================
--- subversion/branches/javahl-1.15/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java	Sun May 10 02:40:31 2026	(r1934013)
+++ subversion/branches/javahl-1.15/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java	Sun May 10 03:26:36 2026	(r1934014)
@@ -861,7 +861,8 @@ public class BasicTests extends SVNTests
         {
             // obstructed checkout must fail
             client.checkout(thisTest.getUrl() + "/A", thisTest.getWCPath(),
-                            null, null, Depth.infinity, false, false);
+                            null, null, Depth.infinity, false, false,
+                            null, Tristate.Unknown);
             fail("missing exception");
         }
         catch (ClientException expected)
@@ -892,7 +893,8 @@ public class BasicTests extends SVNTests
 
         // recheckout the working copy
         client.checkout(thisTest.getUrl().toString(), thisTest.getWCPath(),
-                   null, null, Depth.infinity, false, false);
+                        null, null, Depth.infinity, false, false,
+                        null, Tristate.Unknown);
 
         // deleted file should reapear
         thisTest.getWc().setItemTextStatus("A/B/lambda", Status.Kind.normal);
@@ -902,6 +904,43 @@ public class BasicTests extends SVNTests
     }
 
     /**
+     * Test checkout with the current runtime WC version
+     * @throws Throwable
+     */
+    public void testCurrentWcVersionCheckout() throws Throwable
+    {
+        OneTest thisTest = new OneTest();
+        client.checkout(thisTest.getUrl() + "/A",
+                        thisTest.getWCPath()  + "/ZZZ",
+                        null, null, Depth.infinity, false, false,
+                        client.getRuntimeVersion(),
+                        Tristate.Unknown);
+    }
+
+    /**
+     * Test checkout with unsupported WC version
+     * @throws Throwable
+     */
+    public void testAncientWcVersionCheckout() throws Throwable
+    {
+        OneTest thisTest = new OneTest();
+
+        try
+        {
+            // Checkout with invalid version must fail
+            client.checkout(thisTest.getUrl() + "/A",
+                            thisTest.getWCPath()  + "/ZZZ",
+                            null, null, Depth.infinity, false, false,
+                            Version.getInstance(0, 9, 0),
+                            Tristate.Unknown);
+            fail("missing exception");
+        }
+        catch (ClientException expected)
+        {
+        }
+    }
+
+    /**
      * Test the basic SVNClient.commit functionality.
      * @throws Throwable
      */
@@ -2308,8 +2347,9 @@ public class BasicTests extends SVNTests
 
         // check out the previous revision
         client.checkout(thisTest.getUrl()+"/A/D",
-                thisTest.getWCPath()+"/new_D", new Revision.Number(1),
-                new Revision.Number(1), Depth.infinity, false, false);
+                        thisTest.getWCPath()+"/new_D", new Revision.Number(1),
+                        new Revision.Number(1), Depth.infinity, false, false,
+                        null, Tristate.Unknown);;
     }
 
     /**
@@ -2683,8 +2723,9 @@ public class BasicTests extends SVNTests
         String secondWC = thisTest.getWCPath() + ".empty";
         removeDirOrFile(new File(secondWC));
 
-        client.checkout(thisTest.getUrl().toString(), secondWC, null, null,
-                       Depth.empty, false, true);
+        client.checkout(thisTest.getUrl().toString(), secondWC,
+                        null, null, Depth.empty, false, true,
+                        null, Tristate.Unknown);
 
         infos = collectInfos(secondWC, null, null, Depth.empty, null);
 
@@ -4824,7 +4865,9 @@ public class BasicTests extends SVNTests
                                null,
                                Depth.infinity,
                                true,
-                               false);
+                               false,
+                               null,
+                               Tristate.Unknown);
 
             svnClient.dispose();
         }

Modified: subversion/branches/javahl-1.15/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
==============================================================================
--- subversion/branches/javahl-1.15/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java	Sun May 10 02:40:31 2026	(r1934013)
+++ subversion/branches/javahl-1.15/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java	Sun May 10 03:26:36 2026	(r1934014)
@@ -879,7 +879,8 @@ class SVNTests extends TestCase
             trackDir(workingCopy);
             // checkout the repository
             client.checkout(uri.toString(), workingCopy.getAbsolutePath(),
-                   null, null, Depth.infinity, false, false);
+                            null, null, Depth.infinity, false, false,
+                            null, Tristate.Unknown);
             // sanity check the working with its expected status
             checkStatus();
             return workingCopy;