You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2014/03/11 14:56:02 UTC
svn commit: r1576347 -
/subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
Author: rhuijben
Date: Tue Mar 11 13:56:02 2014
New Revision: 1576347
URL: http://svn.apache.org/r1576347
Log:
* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
(testBasicStatus): Following up on r1576341, apply a similar fix here.
Modified:
subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
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=1576347&r1=1576346&r2=1576347&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 Mar 11 13:56:02 2014
@@ -213,7 +213,16 @@ public class BasicTests extends SVNTests
Status s = client.singleStatus(fileToSVNPath(fileC, false), false);
if (s != null)
- fail("File foo.c should not return a status.");
+ {
+ if (s.hasTreeConflict()
+ || s.getTextStatus() != Status.Kind.none
+ || s.getPropStatus() != Status.Kind.none
+ || s.getRepositoryTextStatus() != Status.Kind.none
+ || s.getRepositoryPropStatus() != Status.Kind.none)
+ {
+ fail("File foo.c should not return a status.");
+ }
+ }
}