Author: reschke
Date: Tue Dec 8 16:49:31 2015
New Revision: 1718646
URL: http://svn.apache.org/viewvc?rev=1718646&view=rev
Log:
OAK-3750: BasicDocumentStoreTest: improve robustness of .removeWithCondition
test
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java?rev=1718646&r1=1718645&r2=1718646&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
Tue Dec 8 16:49:31 2015
@@ -794,6 +794,12 @@ public class BasicDocumentStoreTest exte
@Test
public void removeWithCondition() throws Exception {
+
+ Set<String> existingDocs = new HashSet<String>();
+ for (NodeDocument doc : Utils.getAllDocuments(ds)) {
+ existingDocs.add(doc.getPath());
+ }
+
List<UpdateOp> docs = Lists.newArrayList();
docs.add(newDocument("/foo", 100));
removeMe.add(Utils.getIdFromPath("/foo"));
@@ -818,7 +824,7 @@ public class BasicDocumentStoreTest exte
assertEquals(2, removed);
assertNotNull(ds.find(Collection.NODES, Utils.getIdFromPath("/bar")));
for (NodeDocument doc : Utils.getAllDocuments(ds)) {
- if (!doc.getPath().equals("/bar")) {
+ if (!doc.getPath().equals("/bar") &&
!existingDocs.contains(doc.getPath())) {
fail("document must not exist: " + doc.getId());
}
}