You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/09/01 20:11:35 UTC
svn commit: r991631 - in
/subversion/trunk/subversion/bindings/javahl/tests/org:
apache/subversion/javahl/BasicTests.java
tigris/subversion/javahl/BasicTests.java
Author: philip
Date: Wed Sep 1 18:11:34 2010
New Revision: 991631
URL: http://svn.apache.org/viewvc?rev=991631&view=rev
Log:
Fix javahl testBasicRevert by adjusting the expected outcome to match
the new single-db behaviour.
* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
(testBasicRevert): Children of a deleted/removed directory show up as
status deleted, revert restores the tree.
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=991631&r1=991630&r2=991631&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 Wed Sep 1 18:11:34 2010
@@ -1340,14 +1340,17 @@ public class BasicTests extends SVNTests
false, null, null);
removeDirOrFile(new File(thisTest.getWorkingCopy(), "A/B/E"));
thisTest.getWc().setItemTextStatus("A/B/E", Status.Kind.deleted);
- thisTest.getWc().removeItem("A/B/E/alpha");
- thisTest.getWc().removeItem("A/B/E/beta");
+ thisTest.getWc().setItemTextStatus("A/B/E/alpha", Status.Kind.deleted);
+ thisTest.getWc().setItemTextStatus("A/B/E/beta", Status.Kind.deleted);
// test the status of the working copy
thisTest.checkStatus();
- // revert A/B/E -> this will not resurect it
+ // revert A/B/E -> this will resurect it
client.revert(thisTest.getWCPath()+"/A/B/E", Depth.infinity, null);
+ thisTest.getWc().setItemTextStatus("A/B/E", Status.Kind.normal);
+ thisTest.getWc().setItemTextStatus("A/B/E/alpha", Status.Kind.normal);
+ thisTest.getWc().setItemTextStatus("A/B/E/beta", Status.Kind.normal);
// test the status of the working copy
thisTest.checkStatus();
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=991631&r1=991630&r2=991631&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 Wed Sep 1 18:11:34 2010
@@ -1352,14 +1352,17 @@ public class BasicTests extends SVNTests
client.remove(new String[] {thisTest.getWCPath()+"/A/B/E"}, null, true);
removeDirOrFile(new File(thisTest.getWorkingCopy(), "A/B/E"));
thisTest.getWc().setItemTextStatus("A/B/E", Status.Kind.deleted);
- thisTest.getWc().removeItem("A/B/E/alpha");
- thisTest.getWc().removeItem("A/B/E/beta");
+ thisTest.getWc().setItemTextStatus("A/B/E/alpha", Status.Kind.deleted);
+ thisTest.getWc().setItemTextStatus("A/B/E/beta", Status.Kind.deleted);
// test the status of the working copy
thisTest.checkStatus();
- // revert A/B/E -> this will not resurect it
+ // revert A/B/E -> this will resurect it
client.revert(thisTest.getWCPath()+"/A/B/E", true);
+ thisTest.getWc().setItemTextStatus("A/B/E", Status.Kind.normal);
+ thisTest.getWc().setItemTextStatus("A/B/E/alpha", Status.Kind.normal);
+ thisTest.getWc().setItemTextStatus("A/B/E/beta", Status.Kind.normal);
// test the status of the working copy
thisTest.checkStatus();