svn commit: r1820199 - in /jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document: AbstractDocumentStoreTest.java DocumentStoreFixture.java mongo/MongoCacheConsistencyTest.java

[reschke]

Author: reschke
Date: Thu Jan  4 20:18:20 2018
New Revision: 1820199

URL: http://svn.apache.org/viewvc?rev=1820199&view=rev
Log:
OAK-7121: DocumentStore testing: allow config of DocumentMK.Builder in 
AbstractDocumentStoreTest

Modified:
    
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java
    
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
    
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoCacheConsistencyTest.java

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java?rev=1820199&r1=1820198&r2=1820199&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentStoreTest.java
 Thu Jan  4 20:18:20 2018
@@ -43,11 +43,15 @@ public abstract class AbstractDocumentSt
 
     public AbstractDocumentStoreTest(DocumentStoreFixture dsf) {
         this.dsf = dsf;
-        this.ds = dsf.createDocumentStore(1);
+        this.ds = dsf.createDocumentStore(getBuilder().setClusterId(1));
         this.dsname = dsf.getName();
         this.rdbDataSource = dsf.getRDBDataSource();
     }
 
+    public DocumentMK.Builder getBuilder() {
+        return new DocumentMK.Builder();
+    }
+    
     @After
     public void cleanUp() throws Exception {
         
removeTestNodes(org.apache.jackrabbit.oak.plugins.document.Collection.NODES, 
removeMe);

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java?rev=1820199&r1=1820198&r2=1820199&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreFixture.java
 Thu Jan  4 20:18:20 2018
@@ -91,10 +91,14 @@ public abstract class DocumentStoreFixtu
 
     public abstract String getName();
 
-    public abstract DocumentStore createDocumentStore(int clusterId);
+    public abstract DocumentStore createDocumentStore(DocumentMK.Builder 
builder);
+
+    public DocumentStore createDocumentStore(int clusterId) {
+        return createDocumentStore(new 
DocumentMK.Builder().setClusterId(clusterId));
+    }
 
     public DocumentStore createDocumentStore() {
-        return createDocumentStore(1);
+        return createDocumentStore(new DocumentMK.Builder().setClusterId(1));
     }
 
     public boolean isAvailable() {
@@ -126,7 +130,7 @@ public abstract class DocumentStoreFixtu
         }
 
         @Override
-        public DocumentStore createDocumentStore(int clusterId) {
+        public DocumentStore createDocumentStore(DocumentMK.Builder builder) {
             return new MemoryDocumentStore();
         }
 
@@ -163,12 +167,12 @@ public abstract class DocumentStoreFixtu
         }
 
         @Override
-        public DocumentStore createDocumentStore(int clusterId) {
-            if (clusterId == 1) {
-                store1 = new RDBDocumentStore(dataSource, new 
DocumentMK.Builder().setClusterId(1), options);
+        public DocumentStore createDocumentStore(DocumentMK.Builder builder) {
+            if (builder.getClusterId() == 1) {
+                store1 = new RDBDocumentStore(dataSource, builder, options);
                 return store1;
-            } else if (clusterId == 2) {
-                store2 = new RDBDocumentStore(dataSource, new 
DocumentMK.Builder().setClusterId(2), options);
+            } else if (builder.getClusterId() == 2) {
+                store2 = new RDBDocumentStore(dataSource, builder, options);
                 return store2;
             } else {
                 throw new RuntimeException("expect clusterId == 1 or == 2");
@@ -206,12 +210,12 @@ public abstract class DocumentStoreFixtu
         }
 
         @Override
-        public DocumentStore createDocumentStore(int clusterId) {
+        public DocumentStore createDocumentStore(DocumentMK.Builder builder) {
             try {
                 MongoConnection connection = MongoUtils.getConnection();
                 connections.add(connection);
                 DB db = connection.getDB();
-                return new MongoDocumentStore(db, new 
DocumentMK.Builder().setClusterId(clusterId));
+                return new MongoDocumentStore(db, builder);
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }

Modified: 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoCacheConsistencyTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoCacheConsistencyTest.java?rev=1820199&r1=1820198&r2=1820199&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoCacheConsistencyTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoCacheConsistencyTest.java
 Thu Jan  4 20:18:20 2018
@@ -99,7 +99,7 @@ public class MongoCacheConsistencyTest e
             }
 
             @Override
-            public DocumentStore createDocumentStore(int clusterId) {
+            public DocumentStore createDocumentStore(DocumentMK.Builder 
builder) {
                 return store;
             }
         };