You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2015/08/17 16:16:43 UTC
svn commit: r1696285 -
/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
Author: reschke
Date: Mon Aug 17 14:16:43 2015
New Revision: 1696285
URL: http://svn.apache.org/r1696285
Log:
OAK-3246: MultiDocumentStoreTest might fail to clean up test nodes
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java?rev=1696285&r1=1696284&r2=1696285&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MultiDocumentStoreTest.java Mon Aug 17 14:16:43 2015
@@ -44,6 +44,7 @@ public class MultiDocumentStoreTest exte
up.set("_id", id);
up.set("_foo", 0l);
assertTrue(super.ds1.create(Collection.NODES, Collections.singletonList(up)));
+ removeMe.add(id);
long increments = 10;
@@ -58,7 +59,6 @@ public class MultiDocumentStoreTest exte
super.ds2.update(Collection.NODES, Collections.singletonList(id), up);
}
}
- removeMe.add(id);
// read uncached
nd = super.ds1.find(Collection.NODES, id, 0);
@@ -79,6 +79,8 @@ public class MultiDocumentStoreTest exte
up.set("_id", id);
up.set("_modified", 1L);
assertTrue(super.ds1.create(Collection.NODES, Collections.singletonList(up)));
+ removeMe.add(id);
+
nd1 = super.ds1.find(Collection.NODES, id, 0);
Number n = nd1.getModCount();
if (n != null) {
@@ -155,6 +157,7 @@ public class MultiDocumentStoreTest exte
up.set("_id", id);
up.set("_foo", "bar");
assertTrue(super.ds1.create(Collection.NODES, Collections.singletonList(up)));
+ removeMe.add(id);
// fill both caches
NodeDocument nd1 = super.ds1.find(Collection.NODES, id);