Author: philip
Date: Tue Jun  7 10:12:59 2011
New Revision: 1132942

URL: http://svn.apache.org/viewvc?rev=1132942&view=rev
Log:
Try to make the javahl tests pass on the buildbots.

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
  (BasicTests.testBasicInfo2): Add path to assert message, adjust depth
   expectaitions based on node type.

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

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=1132942&r1=1132941&r2=1132942&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 Jun  7 10:12:59 2011
@@ -2049,7 +2049,9 @@ public class BasicTests extends SVNTests
                          -1, info.getReposSize());
 
            // Examine depth
-           assertEquals(Depth.infinity, info.getDepth());
+           assertEquals("Unexpected depth for '" + info + "'",
+                        (isFile ? Depth.unknown : Depth.infinity),
+                        info.getDepth());
         }
 
         // Create wc with a depth of Depth.empty

Modified: 
subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java?rev=1132942&r1=1132941&r2=1132942&view=diff
==============================================================================
--- 
subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
 (original)
+++ 
subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
 Tue Jun  7 10:12:59 2011
@@ -2060,7 +2060,9 @@ public class BasicTests extends SVNTests
                          -1, info.getReposSize());
 
            // Examine depth
-           assertEquals(Depth.infinity, info.getDepth());
+           assertEquals("Unexpected depth for '" + info + "'",
+                        (isFile ? Depth.unknown : Depth.infinity),
+                        info.getDepth());
         }
 
         // Create wc with a depth of Depth.empty


Reply via email to