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 2014/05/28 14:05:08 UTC
svn commit: r1597984 - in
/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document:
AbstractDocumentStoreTest.java AbstractMultiDocumentStoreTest.java
DocumentStoreFixture.java MultiDocumentStoreTest.java
Author: reschke
Date: Wed May 28 12:05:08 2014
New Revision: 1597984
URL: http://svn.apache.org/r1597984
Log:
OAK-1860 - change the fixture API to know about whether the persistence will be shared
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/AbstractMultiDocumentStoreTest.java
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/MultiDocumentStoreTest.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=1597984&r1=1597983&r2=1597984&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 Wed May 28 12:05:08 2014
@@ -66,13 +66,19 @@ public abstract class AbstractDocumentSt
@Parameterized.Parameters
public static Collection<Object[]> fixtures() {
+ return fixtures(false);
+ }
+
+ protected static Collection<Object[]> fixtures(boolean multi) {
Collection<Object[]> result = new ArrayList<Object[]>();
DocumentStoreFixture candidates[] = new DocumentStoreFixture[] { DocumentStoreFixture.MEMORY, DocumentStoreFixture.MONGO,
DocumentStoreFixture.RDB_H2, DocumentStoreFixture.RDB_PG, DocumentStoreFixture.RDB_DB2 };
for (DocumentStoreFixture dsf : candidates) {
if (dsf.isAvailable()) {
- result.add(new Object[] { dsf });
+ if (!multi || dsf.hasSinglePersistence()) {
+ result.add(new Object[] { dsf });
+ }
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMultiDocumentStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMultiDocumentStoreTest.java?rev=1597984&r1=1597983&r2=1597984&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMultiDocumentStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMultiDocumentStoreTest.java Wed May 28 12:05:08 2014
@@ -16,6 +16,10 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
+import java.util.Collection;
+
+import org.junit.runners.Parameterized;
+
public abstract class AbstractMultiDocumentStoreTest extends AbstractDocumentStoreTest {
protected DocumentStore ds1, ds2;
@@ -25,4 +29,9 @@ public abstract class AbstractMultiDocum
this.ds1 = super.ds;
this.ds2 = dsf.createDocumentStore(2);
}
+
+ @Parameterized.Parameters
+ public static Collection<Object[]> fixtures() {
+ return fixtures(true);
+ }
}
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=1597984&r1=1597983&r2=1597984&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 Wed May 28 12:05:08 2014
@@ -52,6 +52,11 @@ public abstract class DocumentStoreFixtu
return true;
}
+ // return false if the multiple instances will not share the same persistence
+ public boolean hasSinglePersistence() {
+ return true;
+ }
+
public void dispose() throws Exception {
}
@@ -66,6 +71,11 @@ public abstract class DocumentStoreFixtu
public DocumentStore createDocumentStore(int clusterId) {
return new MemoryDocumentStore();
}
+
+ @Override
+ public boolean hasSinglePersistence() {
+ return false;
+ }
}
public static class RDBFixture extends DocumentStoreFixture {
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=1597984&r1=1597983&r2=1597984&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 Wed May 28 12:05:08 2014
@@ -21,8 +21,6 @@ import static org.junit.Assert.assertTru
import java.util.Collections;
-import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
-import org.junit.Assume;
import org.junit.Test;
public class MultiDocumentStoreTest extends AbstractMultiDocumentStoreTest {
@@ -33,9 +31,6 @@ public class MultiDocumentStoreTest exte
@Test
public void testInterleavedUpdate() {
- // this does not work with the MemoryDocumentStore
- Assume.assumeTrue(!(super.ds instanceof MemoryDocumentStore));
-
String id = this.getClass().getName() + ".testInterleavedUpdate";
// remove if present