svn commit: r1536319 - in /subversion/trunk/subversion/bindings/javahl: src/org/apache/subversion/javahl/ClientNotifyInformation.java tests/org/apache/subversion/javahl/BasicTests.java

[br...@apache.org]

Author: brane
Date: Mon Oct 28 12:01:45 2013
New Revision: 1536319

URL: http://svn.apache.org/r1536319
Log:
Add missing enumeration mappings to JavaHL and re-enable test that was broken
because of the omission.

[in subversion/bindings/javahl/src/org/apache/subversion/javahl]
* ClientNotifyInformation.java
  (ClientNotifyInformation.Action.cleanup_external,
   ClientNotifyInformation.Action.failed_requires_target): New enum constants.

[in subversion/bindings/javahl/tests/org/apache/subversion/javahl]
* BasicTests.java (BasicTests.testCommitPartialMove): Enable test.

Modified:
    subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
    subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java

Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java?rev=1536319&r1=1536318&r2=1536319&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java Mon Oct 28 12:01:45 2013
@@ -612,7 +612,16 @@ public class ClientNotifyInformation ext
 
         /** A move in the working copy has been broken
          * @since New in 1.8. */
-        move_broken ("move broken");
+        move_broken ("move broken"),
+
+        /** Running cleanup on an external module.
+         * @since New in 1.9. */
+        cleanup_external ("cleanup external"),
+
+        /** The operation failed because the operation (E.g. commit)
+         * is only valid if the operation includes this path.
+         * @since New in 1.9. */
+        failed_requires_target ("failed requires target");
 
         /**
          * The description of the action.

Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1536319&r1=1536318&r2=1536319&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Mon Oct 28 12:01:45 2013
@@ -1064,28 +1064,29 @@ public class BasicTests extends SVNTests
     public void testCommitPartialMove() throws Throwable
     {
         OneTest thisTest = new OneTest();
-//        String root = thisTest.getWorkingCopy().getAbsolutePath();
-//        ClientException caught = null;
-//
-//        Set<String> srcPaths = new HashSet<String>(1);
-//        srcPaths.add(root + "/A/B/E/alpha");
-//        client.move(srcPaths, root + "/moved-alpha",
-//                    false, false, false, false, false, null, null, null);
-//
-//        try {
-//            client.commit(srcPaths, Depth.infinity, false, false, null, null,
-//                          new ConstMsg("Commit half of a move"), null);
-//        } catch (ClientException ex) {
-//            caught = ex;
-//        }
-//
-//        assertNotNull("Commit of partial move did not fail", caught);
-//
-//        List<ClientException.ErrorMessage> msgs = caught.getAllMessages();
-//        System.err.println(caught.getMessage());
-//        assertTrue(msgs.size() >= 2);
-//        assertTrue(msgs.get(0).getMessage().startsWith("Commit failed"));
-//        assertTrue(msgs.get(0).getMessage().startsWith("Cannot commit"));
+        String root = thisTest.getWorkingCopy().getAbsolutePath();
+        ClientException caught = null;
+
+        Set<String> srcPaths = new HashSet<String>(1);
+        srcPaths.add(root + "/A/B/E/alpha");
+        client.move(srcPaths, root + "/moved-alpha",
+                    false, false, false, false, false, null, null, null);
+
+        try {
+            client.commit(srcPaths, Depth.infinity, false, false, null, null,
+                          new ConstMsg("Commit half of a move"), null);
+        } catch (ClientException ex) {
+            caught = ex;
+        }
+
+        assertNotNull("Commit of partial move did not fail", caught);
+
+        List<ClientException.ErrorMessage> msgs = caught.getAllMessages();
+        System.err.println(caught.getMessage());
+        assertTrue(msgs.size() >= 3);
+        assertTrue(msgs.get(0).getMessage().startsWith("Illegal target"));
+        assertTrue(msgs.get(1).getMessage().startsWith("Commit failed"));
+        assertTrue(msgs.get(2).getMessage().startsWith("Cannot commit"));
     }
 
     /**