svn commit: r1770498 - in /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document: AbstractDocumentStoreTest.java BasicDocumentStoreTest.java

[reschke]

Author: reschke
Date: Sat Nov 19 15:34:49 2016
New Revision: 1770498

URL: http://svn.apache.org/viewvc?rev=1770498&view=rev
Log:
OAK-3001: improve test cleanup

Modified:
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java
    
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/AbstractDocumentStoreTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java?rev=1770498&r1=1770497&r2=1770498&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java
 Sat Nov 19 15:34:49 2016
@@ -37,6 +37,7 @@ public abstract class AbstractDocumentSt
     protected DataSource rdbDataSource;
     protected List<String> removeMe = new ArrayList<String>();
     protected List<String> removeMeSettings = new ArrayList<String>();
+    protected List<String> removeMeJournal = new ArrayList<String>();
 
     static final Logger LOG = 
LoggerFactory.getLogger(AbstractDocumentStoreTest.class);
 
@@ -51,6 +52,7 @@ public abstract class AbstractDocumentSt
     public void cleanUp() throws Exception {
         
removeTestNodes(org.apache.jackrabbit.oak.plugins.document.Collection.NODES, 
removeMe);
         
removeTestNodes(org.apache.jackrabbit.oak.plugins.document.Collection.SETTINGS, 
removeMeSettings);
+        
removeTestNodes(org.apache.jackrabbit.oak.plugins.document.Collection.JOURNAL, 
removeMeJournal);
         ds.dispose();
         dsf.dispose();
     }

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=1770498&r1=1770497&r2=1770498&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
 Sat Nov 19 15:34:49 2016
@@ -351,6 +351,7 @@ public class BasicDocumentStoreTest exte
             UpdateOp up = new UpdateOp(id, true);
             up.set("_modified", modTime);
             super.ds.create(Collection.JOURNAL, Collections.singletonList(up));
+            removeMeJournal.add(id);
         }
 
         assertEquals("Number of entries removed didn't match", 3,