svn commit: r1576341 - in /subversion/trunk/subversion/bindings/javahl: native/StatusCallback.cpp tests/org/apache/subversion/javahl/BasicTests.java

[br...@apache.org]

Author: brane
Date: Tue Mar 11 13:37:42 2014
New Revision: 1576341

URL: http://svn.apache.org/r1576341
Log:
Adjust JavaHL tests for the semantic change made in r1576308.

* subversion/bindings/javahl/native/StatusCallback.cpp: Revert r1576328.
* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
  (BasicTests.testBasicStatus): Adjust test verification.

Modified:
    subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp
    subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java

Modified: subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp?rev=1576341&r1=1576340&r2=1576341&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp Tue Mar 11 13:37:42 2014
@@ -54,20 +54,6 @@ StatusCallback::callback(void *baton,
                          const svn_client_status_t *status,
                          apr_pool_t *pool)
 {
-  if (!status->versioned
-      && !status->conflicted
-      && status->node_status == svn_wc_status_none
-      && status->repos_node_status == svn_wc_status_none)
-    {
-      /* Node does not exist in the WC, nor on disk, nor in the repository,
-         and it isn't even a tree conflict...
-
-         For legacy reasons the current JavaHL api doesn't want to know about
-         it even though it explicitly asked for the information. We probably
-         want to move this to the deprecated wrapper in a future iteration. */
-      return SVN_NO_ERROR;
-    }
-
   if (baton)
     return static_cast<StatusCallback *>(baton)->doStatus(
             local_abspath, status, pool);

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=1576341&r1=1576340&r2=1576341&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 Tue Mar 11 13:37:42 2014
@@ -315,8 +315,18 @@ public class BasicTests extends SVNTests
         MyStatusCallback statusCallback = new MyStatusCallback();
         client.status(fileToSVNPath(fileC, false), Depth.unknown, false, true,
                     false, false, null, statusCallback);
-        if (statusCallback.getStatusArray().length > 0)
-            fail("File foo.c should not return a status.");
+        if (statusCallback.getStatusArray().length > 1)
+            fail("File foo.c should not return more than one status.");
+        if (statusCallback.getStatusArray().length == 1)
+        {
+            Status st = statusCallback.getStatusArray()[0];
+            if (st.isConflicted()
+                || st.getTextStatus() != Status.Kind.none
+                || st.getPropStatus() != Status.Kind.none
+                || st.getRepositoryTextStatus() != Status.Kind.none
+                || st.getRepositoryPropStatus() != Status.Kind.none)
+                fail("File foo.c should not return a status.");
+        }
 
     }