svn commit: r1738746 - in /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document: DocumentStoreFixture.java VersionGarbageCollectorIT.java

[mreutegg]

Author: mreutegg
Date: Tue Apr 12 09:49:05 2016
New Revision: 1738746

URL: http://svn.apache.org/viewvc?rev=1738746&view=rev
Log:
OAK-3858: Review slow running tests

Use correct fixture name for MemoryDocumentStore

Modified:
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java?rev=1738746&r1=1738745&r2=1738746&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
 Tue Apr 12 09:49:05 2016
@@ -36,9 +36,9 @@ import org.slf4j.LoggerFactory;
 import com.google.common.collect.Lists;
 import com.mongodb.DB;
 
+import static 
org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.DOCUMENT_MEM;
 import static 
org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.DOCUMENT_NS;
 import static 
org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.DOCUMENT_RDB;
-import static 
org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.MEMORY_NS;
 
 public abstract class DocumentStoreFixture {
 
@@ -73,7 +73,7 @@ public abstract class DocumentStoreFixtu
 
     public static List<Object[]> getFixtures() {
         List<Object[]> fixtures = Lists.newArrayList();
-        if (FixturesHelper.getFixtures().contains(MEMORY_NS)) {
+        if (FixturesHelper.getFixtures().contains(DOCUMENT_MEM)) {
             fixtures.add(new Object[] { new 
DocumentStoreFixture.MemoryFixture() });
         }
 

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java?rev=1738746&r1=1738745&r2=1738746&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
 Tue Apr 12 09:49:05 2016
@@ -34,9 +34,9 @@ import static com.google.common.collect.
 import static com.google.common.collect.Iterables.size;
 import static java.util.concurrent.TimeUnit.HOURS;
 import static java.util.concurrent.TimeUnit.MINUTES;
+import static 
org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.DOCUMENT_MEM;
 import static 
org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.DOCUMENT_NS;
 import static 
org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.DOCUMENT_RDB;
-import static 
org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture.MEMORY_NS;
 import static org.apache.jackrabbit.oak.commons.FixturesHelper.getFixtures;
 import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
 import static 
org.apache.jackrabbit.oak.plugins.document.NodeDocument.NUM_REVS_THRESHOLD;
@@ -92,7 +92,7 @@ public class VersionGarbageCollectorIT {
     @Parameterized.Parameters(name="{0}")
     public static Collection<Object[]> fixtures() throws IOException {
         List<Object[]> fixtures = Lists.newArrayList();
-        if (getFixtures().contains(MEMORY_NS)) {
+        if (getFixtures().contains(DOCUMENT_MEM)) {
             fixtures.add(new Object[] { new 
DocumentStoreFixture.MemoryFixture() });
         }