Author: philip
Date: Thu Mar 14 11:29:47 2013
New Revision: 1456396
URL: http://svn.apache.org/r1456396
Log:
[in subversion/bindings/javahl]
* tests/org/apache/subversion/javahl/BasicTests.java
(testMove): Status is lexically ordered so simplify the test by getting
just the interesting items and expecting them in a particular order.
Modified:
subversion/trunk/subversion/bindings/javahl/tests/org/apache/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=1456396&r1=1456395&r2=1456396&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
Thu Mar 14 11:29:47 2013
@@ -1031,19 +1031,17 @@ public class BasicTests extends SVNTests
MyStatusCallback statusCallback = new MyStatusCallback();
String statusPath = fileToSVNPath(new File(thisTest.getWCPath() +
"/A/B"), true);
- client.status(statusPath, Depth.infinity, false, true, false, true,
+ client.status(statusPath, Depth.infinity, false, false, false, true,
null, statusCallback);
Status[] statusList = statusCallback.getStatusArray();
- String movedFrom = null;
- String movedTo = null;
- for (Status statusItem : statusList) {
- if (statusItem.getPath().equals(statusPath + "/E/alpha"))
- movedTo = statusItem.getMovedToAbspath();
- if (statusItem.getPath().equals(statusPath + "/F/beta"))
- movedFrom = statusItem.getMovedFromAbspath();
- }
- assertEquals(movedFrom, statusPath + "/E/beta");
- assertEquals(movedTo, statusPath + "/F/alpha");
+ assertEquals(statusPath + "/F/alpha",
+ statusList[0].getMovedToAbspath());
+ assertEquals(statusPath + "/F/beta",
+ statusList[1].getMovedToAbspath());
+ assertEquals(statusPath + "/E/alpha",
+ statusList[2].getMovedFromAbspath());
+ assertEquals(statusPath + "/E/beta",
+ statusList[3].getMovedFromAbspath());
// Commit the changes, and check the state of the WC.
checkCommitRevision(thisTest,
