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 mr...@apache.org on 2014/01/28 12:28:25 UTC
svn commit: r1562039 [2/3] - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/
oak-core/src/main/java/org/apache/jackrabbit/oak/core/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/
oak-core/src/main/java/or...
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterInfoTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterInfoTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterInfoTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterInfoTest.java Tue Jan 28 11:28:23 2014
@@ -38,11 +38,11 @@ public class ClusterInfoTest {
public void readWriteMode() throws InterruptedException {
MemoryDocumentStore mem = new MemoryDocumentStore();
- MongoNodeStore ns1 = new MongoMK.Builder().
+ DocumentNodeStore ns1 = new DocumentMK.Builder().
setDocumentStore(mem).
setAsyncDelay(0).
getNodeStore();
- MongoNodeStore ns2 = new MongoMK.Builder().
+ DocumentNodeStore ns2 = new DocumentMK.Builder().
setDocumentStore(mem).
setAsyncDelay(0).
getNodeStore();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterJoinTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterJoinTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterJoinTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterJoinTest.java Tue Jan 28 11:28:23 2014
@@ -33,24 +33,24 @@ public class ClusterJoinTest extends Abs
mk.getNodeStore().setAsyncDelay(0);
rev1 = mk.commit("/", "+\"foo\":{}", null, null);
- // start a new MongoMK instance. this instance sees /foo
- // because it started after the commit on the first MongoMK
- MongoMK mk2 = new MongoMK.Builder().setAsyncDelay(0)
+ // start a new DocumentMK instance. this instance sees /foo
+ // because it started after the commit on the first DocumentMK
+ DocumentMK mk2 = new DocumentMK.Builder().setAsyncDelay(0)
.setMongoDB(MongoUtils.getConnection().getDB()).open();
try {
- // this creates a first commit from the second MongoMK instance
- // the first MongoMK instance does not see this yet
+ // this creates a first commit from the second DocumentMK instance
+ // the first DocumentMK instance does not see this yet
mk2.commit("/", "+\"bar\":{}+\"bla\":{}", null, null);
- // create a commit on the first MongoMK. this commit revision
- // is higher than the previous commit on the second MongoMK
+ // create a commit on the first DocumentMK. this commit revision
+ // is higher than the previous commit on the second DocumentMK
rev2 = mk.commit("/", "+\"baz\":{}+\"qux\":{}", null, null);
// @rev1 must only see /foo
assertChildNodeCount("/", rev1, 1);
// read children @rev2, should not contain /bar, /bla
// because there was no background read yet
JSONObject obj = parseJSONObject(mk.getNodes("/", rev2, 0, 0, 10, null));
- // make changes from second MongoMK visible
+ // make changes from second DocumentMK visible
mk2.runBackgroundOperations();
mk.runBackgroundOperations();
// check child nodes of previous getNodes() call
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java Tue Jan 28 11:28:23 2014
@@ -58,17 +58,17 @@ public class ClusterTest {
public void threeNodes() throws Exception {
MemoryDocumentStore ds = new MemoryDocumentStore();
MemoryBlobStore bs = new MemoryBlobStore();
- MongoMK.Builder builder;
+ DocumentMK.Builder builder;
- builder = new MongoMK.Builder();
+ builder = new DocumentMK.Builder();
builder.setDocumentStore(ds).setBlobStore(bs).setAsyncDelay(0);
- MongoMK mk1 = builder.setClusterId(1).open();
- builder = new MongoMK.Builder();
+ DocumentMK mk1 = builder.setClusterId(1).open();
+ builder = new DocumentMK.Builder();
builder.setDocumentStore(ds).setBlobStore(bs).setAsyncDelay(0);
- MongoMK mk2 = builder.setClusterId(2).open();
- builder = new MongoMK.Builder();
+ DocumentMK mk2 = builder.setClusterId(2).open();
+ builder = new DocumentMK.Builder();
builder.setDocumentStore(ds).setBlobStore(bs).setAsyncDelay(0);
- MongoMK mk3 = builder.setClusterId(3).open();
+ DocumentMK mk3 = builder.setClusterId(3).open();
mk1.commit("/", "+\"test\":{}", null, null);
mk2.commit("/", "+\"a\":{}", null, null);
@@ -136,26 +136,26 @@ public class ClusterTest {
MemoryDocumentStore ds = new MemoryDocumentStore();
MemoryBlobStore bs = new MemoryBlobStore();
- MongoMK mk1 = createMK(1, 0, ds, bs);
+ DocumentMK mk1 = createMK(1, 0, ds, bs);
mk1.commit("/", "+\"a\": {}", null, null);
mk1.commit("/", "-\"a\"", null, null);
mk1.runBackgroundOperations();
- MongoMK mk2 = createMK(2, 0, ds, bs);
+ DocumentMK mk2 = createMK(2, 0, ds, bs);
mk2.commit("/", "+\"a\": {}", null, null);
mk2.commit("/", "-\"a\"", null, null);
mk2.runBackgroundOperations();
- MongoMK mk3 = createMK(3, 0, ds, bs);
+ DocumentMK mk3 = createMK(3, 0, ds, bs);
mk3.commit("/", "+\"a\": {}", null, null);
mk3.commit("/", "-\"a\"", null, null);
mk3.runBackgroundOperations();
- MongoMK mk4 = createMK(4, 0, ds, bs);
+ DocumentMK mk4 = createMK(4, 0, ds, bs);
mk4.commit("/", "+\"a\": {}", null, null);
mk4.runBackgroundOperations();
- MongoMK mk5 = createMK(5, 0, ds, bs);
+ DocumentMK mk5 = createMK(5, 0, ds, bs);
mk5.commit("/", "-\"a\"", null, null);
mk5.commit("/", "+\"a\": {}", null, null);
@@ -168,8 +168,8 @@ public class ClusterTest {
@Test
public void clusterNodeId() {
- MongoMK mk1 = createMK(0);
- MongoMK mk2 = createMK(0);
+ DocumentMK mk1 = createMK(0);
+ DocumentMK mk2 = createMK(0);
assertEquals(1, mk1.getClusterInfo().getId());
assertEquals(2, mk2.getClusterInfo().getId());
mk1.dispose();
@@ -178,7 +178,7 @@ public class ClusterTest {
@Test
public void clusterBranchInVisibility() throws InterruptedException {
- MongoMK mk1 = createMK(1);
+ DocumentMK mk1 = createMK(1);
mk1.commit("/", "+\"regular\": {}", null, null);
String b1 = mk1.branch(null);
String b2 = mk1.branch(null);
@@ -190,7 +190,7 @@ public class ClusterTest {
// unsaved last revisions
mk1.dispose();
- MongoMK mk2 = createMK(2);
+ DocumentMK mk2 = createMK(2);
String nodes = mk2.getNodes("/", null, 0, 0, 100, null);
assertEquals("{\"branchVisible\":{},\"regular\":{},\":childNodeCount\":2}", nodes);
@@ -202,11 +202,11 @@ public class ClusterTest {
*/
@Test
public void clusterBranchRebase() throws Exception {
- MongoMK mk1 = createMK(1, 0);
+ DocumentMK mk1 = createMK(1, 0);
mk1.commit("/", "+\"test\":{}", null, null);
mk1.runBackgroundOperations();
- MongoMK mk2 = createMK(2, 0);
- MongoMK mk3 = createMK(3, 0);
+ DocumentMK mk2 = createMK(2, 0);
+ DocumentMK mk3 = createMK(3, 0);
KernelNodeStore ns3 = new KernelNodeStore(mk3);
// the next line is required for the test even if it
@@ -285,8 +285,8 @@ public class ClusterTest {
@Test
public void conflict() {
- MongoMK mk1 = createMK(1, 0);
- MongoMK mk2 = createMK(2, 0);
+ DocumentMK mk1 = createMK(1, 0);
+ DocumentMK mk2 = createMK(2, 0);
String m1r0 = mk1.getHeadRevision();
String m2r0 = mk2.getHeadRevision();
@@ -312,8 +312,8 @@ public class ClusterTest {
@Test
public void revisionVisibility() throws InterruptedException {
- MongoMK mk1 = createMK(1);
- MongoMK mk2 = createMK(2);
+ DocumentMK mk1 = createMK(1);
+ DocumentMK mk2 = createMK(2);
String m2h;
m2h = mk2.getNodes("/", mk2.getHeadRevision(), 0, 0, 2, null);
@@ -350,8 +350,8 @@ public class ClusterTest {
@Test
public void rollbackAfterConflict() {
- MongoMK mk1 = createMK(1);
- MongoMK mk2 = createMK(2);
+ DocumentMK mk1 = createMK(1);
+ DocumentMK mk2 = createMK(2);
String m1r0 = mk1.getHeadRevision();
String m2r0 = mk2.getHeadRevision();
@@ -378,14 +378,14 @@ public class ClusterTest {
}
}
- private MongoMK createMK(int clusterId) {
+ private DocumentMK createMK(int clusterId) {
return createMK(clusterId, 10);
}
- private MongoMK createMK(int clusterId, int asyncDelay) {
+ private DocumentMK createMK(int clusterId, int asyncDelay) {
if (MONGO_DB) {
DB db = MongoUtils.getConnection().getDB();
- return new MongoMK.Builder().setMongoDB(db)
+ return new DocumentMK.Builder().setMongoDB(db)
.setClusterId(clusterId).setAsyncDelay(asyncDelay).open();
} else {
if (ds == null) {
@@ -398,9 +398,9 @@ public class ClusterTest {
}
}
- private MongoMK createMK(int clusterId, int asyncDelay,
+ private DocumentMK createMK(int clusterId, int asyncDelay,
DocumentStore ds, BlobStore bs) {
- return new MongoMK.Builder().setDocumentStore(ds).setBlobStore(bs)
+ return new DocumentMK.Builder().setDocumentStore(ds).setBlobStore(bs)
.setClusterId(clusterId).setAsyncDelay(asyncDelay).open();
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest2.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest2.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest2.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest2.java Tue Jan 28 11:28:23 2014
@@ -31,14 +31,14 @@ public class ClusterTest2 {
public void twoNodes() throws Exception {
MemoryDocumentStore ds = new MemoryDocumentStore();
MemoryBlobStore bs = new MemoryBlobStore();
- MongoMK.Builder builder;
+ DocumentMK.Builder builder;
- builder = new MongoMK.Builder();
+ builder = new DocumentMK.Builder();
builder.setDocumentStore(ds).setBlobStore(bs);
- MongoMK mk1 = builder.setClusterId(1).open();
- builder = new MongoMK.Builder();
+ DocumentMK mk1 = builder.setClusterId(1).open();
+ builder = new DocumentMK.Builder();
builder.setDocumentStore(ds).setBlobStore(bs);
- MongoMK mk2 = builder.setClusterId(2).open();
+ DocumentMK mk2 = builder.setClusterId(2).open();
mk1.commit("/", "+\"test\":{\"x\": 1}", null, null);
mk1.backgroundWrite();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java Tue Jan 28 11:28:23 2014
@@ -43,7 +43,7 @@ public class CommitQueueTest {
@Test
public void concurrentCommits() throws Exception {
- final MongoNodeStore store = new MongoMK.Builder().getNodeStore();
+ final DocumentNodeStore store = new DocumentMK.Builder().getNodeStore();
ChangeDispatcher dispatcher = new ChangeDispatcher(store.getRoot());
AtomicBoolean running = new AtomicBoolean(true);
final CommitQueue queue = new CommitQueue(store, dispatcher);
@@ -54,7 +54,7 @@ public class CommitQueueTest {
@Override
public void contentChanged(@Nonnull NodeState root, @Nullable CommitInfo info) {
- MongoNodeState after = (MongoNodeState) root;
+ DocumentNodeState after = (DocumentNodeState) root;
Revision r = after.getRevision();
// System.out.println("seen: " + r);
if (r.compareRevisionTime(before) < 0) {
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentConflictTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentConflictTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentConflictTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentConflictTest.java Tue Jan 28 11:28:23 2014
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertEqu
/**
* <code>ConcurrentConflictTest</code>...
*/
-public class ConcurrentConflictTest extends BaseMongoMKTest {
+public class ConcurrentConflictTest extends BaseDocumentMKTest {
private static final boolean USE_LOGGER = true;
private static final Logger LOG = LoggerFactory.getLogger(ConcurrentConflictTest.class);
@@ -49,26 +49,26 @@ public class ConcurrentConflictTest exte
private static final int NUM_NODES = 10;
private static final int NUM_TRANSFERS_PER_THREAD = 10;
private DocumentStore store;
- private List<MongoMK> kernels = new ArrayList<MongoMK>();
+ private List<DocumentMK> kernels = new ArrayList<DocumentMK>();
private final StringBuilder logBuffer = new StringBuilder();
@Before
@Override
- public void initMongoMK() {
+ public void initDocumentMK() {
logBuffer.setLength(0);
this.store = new MemoryDocumentStore();
- MongoMK mk = openMongoMK();
+ DocumentMK mk = openDocumentMK();
for (int i = 0; i < NUM_NODES; i++) {
mk.commit("/", "+\"node-" + i + "\":{\"value\":100}", null, null);
}
mk.dispose();
for (int i = 0; i < NUM_WRITERS; i++) {
- kernels.add(openMongoMK());
+ kernels.add(openDocumentMK());
}
}
- private MongoMK openMongoMK() {
- return new MongoMK.Builder().setAsyncDelay(10).setDocumentStore(store).open();
+ private DocumentMK openDocumentMK() {
+ return new DocumentMK.Builder().setAsyncDelay(10).setDocumentStore(store).open();
}
@Ignore
@@ -171,10 +171,10 @@ public class ConcurrentConflictTest exte
t.join();
}
// dispose will flush all pending revisions
- for (MongoMK mk : kernels) {
+ for (DocumentMK mk : kernels) {
mk.dispose();
}
- MongoMK mk = openMongoMK();
+ DocumentMK mk = openDocumentMK();
String rev = mk.getHeadRevision();
long sum = 0;
for (int i = 0; i < NUM_NODES; i++) {
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentUpdatesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentUpdatesTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentUpdatesTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentUpdatesTest.java Tue Jan 28 11:28:23 2014
@@ -23,7 +23,7 @@ import java.util.List;
import org.junit.Test;
/**
- * Performs non-conflicting property updates on MongoMK with multiple threads.
+ * Performs non-conflicting property updates on DocumentMK with multiple threads.
*/
public class ConcurrentUpdatesTest extends AbstractMongoConnectionTest {
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConflictTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConflictTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConflictTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConflictTest.java Tue Jan 28 11:28:23 2014
@@ -25,7 +25,7 @@ import static org.junit.Assert.fail;
* <code>ConflictTest</code> checks
* <a href="http://wiki.apache.org/jackrabbit/Conflict%20handling%20through%20rebasing%20branches">conflict handling</a>.
*/
-public class ConflictTest extends BaseMongoMKTest {
+public class ConflictTest extends BaseDocumentMKTest {
@Test
public void addExistingProperty() {
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBranchMergeTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKBranchMergeTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBranchMergeTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBranchMergeTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKBranchMergeTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKBranchMergeTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBranchMergeTest.java Tue Jan 28 11:28:23 2014
@@ -30,7 +30,7 @@ import static org.junit.Assert.fail;
/**
* Tests for {@code MicroKernel#branch}
*/
-public class MongoMKBranchMergeTest extends BaseMongoMKTest {
+public class DocumentMKBranchMergeTest extends BaseDocumentMKTest {
@Test
public void oneBranchAddedChildren1() {
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBranchMergeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBranchMergeTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBranchTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKBranchTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBranchTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBranchTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKBranchTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKBranchTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBranchTest.java Tue Jan 28 11:28:23 2014
@@ -26,10 +26,10 @@ import static org.junit.Assert.assertFal
import static org.junit.Assert.assertTrue;
/**
- * <code>MongoMKBranchTest</code> performs a test to check if commits
+ * <code>DocumentMKBranchTest</code> performs a test to check if commits
* to a branch are not visible to other branches.
*/
-public class MongoMKBranchTest extends BaseMongoMKTest {
+public class DocumentMKBranchTest extends BaseDocumentMKTest {
/**
* Creates the following revision history:
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBranchTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBranchTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitAddTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitAddTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitAddTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java Tue Jan 28 11:28:23 2014
@@ -32,7 +32,7 @@ import org.junit.Test;
/**
* Tests for add node and property operations.
*/
-public class MongoMKCommitAddTest extends BaseMongoMKTest {
+public class DocumentMKCommitAddTest extends BaseDocumentMKTest {
@Test
public void addSingleNode() throws Exception {
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitAddTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitCopyTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitCopyTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitCopyTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitCopyTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitCopyTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitCopyTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitCopyTest.java Tue Jan 28 11:28:23 2014
@@ -27,7 +27,7 @@ import org.junit.Test;
/**
* Tests with emphasis on copy operations.
*/
-public class MongoMKCommitCopyTest extends BaseMongoMKTest {
+public class DocumentMKCommitCopyTest extends BaseDocumentMKTest {
@Test
public void copyNode() throws Exception {
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitCopyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitCopyTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitMoveTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitMoveTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitMoveTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitMoveTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitMoveTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitMoveTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitMoveTest.java Tue Jan 28 11:28:23 2014
@@ -28,7 +28,7 @@ import org.junit.Test;
* Tests for commit with emphasis on move operations.
*/
@Ignore
-public class MongoMKCommitMoveTest extends BaseMongoMKTest {
+public class DocumentMKCommitMoveTest extends BaseDocumentMKTest {
@Test
public void moveNode() throws Exception {
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitMoveTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitMoveTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitRemoveTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitRemoveTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitRemoveTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitRemoveTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitRemoveTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKCommitRemoveTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitRemoveTest.java Tue Jan 28 11:28:23 2014
@@ -26,7 +26,7 @@ import org.junit.Test;
/**
* Tests with emphasis on remove node and property operations.
*/
-public class MongoMKCommitRemoveTest extends BaseMongoMKTest {
+public class DocumentMKCommitRemoveTest extends BaseDocumentMKTest {
@Test
public void removeSingleNode() throws Exception {
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitRemoveTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKCommitRemoveTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKDiffTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKDiffTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKDiffTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKDiffTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKDiffTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKDiffTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKDiffTest.java Tue Jan 28 11:28:23 2014
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertTru
/**
* Tests for MicroKernel#diff
*/
-public class MongoMKDiffTest extends AbstractMongoConnectionTest {
+public class DocumentMKDiffTest extends AbstractMongoConnectionTest {
@Test
public void oak596() {
@@ -93,7 +93,7 @@ public class MongoMKDiffTest extends Abs
}
@Test
- @Ignore("New MongoMK only supports depth 0")
+ @Ignore("New DocumentMK only supports depth 0")
public void removePath() {
// Add level1 & level1/level2
String rev0 = mk.commit("/",
@@ -134,7 +134,7 @@ public class MongoMKDiffTest extends Abs
}
@Test
- @Ignore("New MongoMK only supports depth 0")
+ @Ignore("New DocumentMK only supports depth 0")
public void movePath() {
String rev1 = mk.commit("/", "+\"level1\":{}", null, null);
rev1 = mk.commit("/", "+\"level1/level2\":{}", null, null);
@@ -252,7 +252,7 @@ public class MongoMKDiffTest extends Abs
@Test
public void diffForChangeBelowManyChildren() throws InterruptedException {
StringBuilder sb = new StringBuilder();
- for (int i = 0; i < MongoMK.MANY_CHILDREN_THRESHOLD * 2; i++) {
+ for (int i = 0; i < DocumentMK.MANY_CHILDREN_THRESHOLD * 2; i++) {
sb.append("+\"node-").append(i).append("\":{}");
}
String branchRev = mk.branch(null);
@@ -288,16 +288,16 @@ public class MongoMKDiffTest extends Abs
private void diffManyChildren(boolean onBranch) {
String baseRev = mk.getHeadRevision();
StringBuilder sb = new StringBuilder();
- for (int i = 0; i < MongoMK.MANY_CHILDREN_THRESHOLD * 2; i++) {
+ for (int i = 0; i < DocumentMK.MANY_CHILDREN_THRESHOLD * 2; i++) {
sb.append("+\"node-").append(i).append("\":{}");
}
String rev = mk.commit("/", sb.toString(), null, null);
String jsop = mk.diff(baseRev, rev, "/", 0);
- for (int i = 0; i < MongoMK.MANY_CHILDREN_THRESHOLD * 2; i++) {
+ for (int i = 0; i < DocumentMK.MANY_CHILDREN_THRESHOLD * 2; i++) {
assertTrue(jsop, jsop.contains("+\"/node-" + i + "\""));
}
jsop = mk.diff(rev, baseRev, "/", 0);
- for (int i = 0; i < MongoMK.MANY_CHILDREN_THRESHOLD * 2; i++) {
+ for (int i = 0; i < DocumentMK.MANY_CHILDREN_THRESHOLD * 2; i++) {
assertTrue(jsop, jsop.contains("-\"/node-" + i + "\""));
}
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKDiffTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKDiffTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKGetHeadRevisionTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKGetHeadRevisionTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKGetHeadRevisionTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKGetHeadRevisionTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKGetHeadRevisionTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKGetHeadRevisionTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKGetHeadRevisionTest.java Tue Jan 28 11:28:23 2014
@@ -25,7 +25,7 @@ import org.junit.Test;
/**
* Tests for {@code MongoMicroKernel#getHeadRevision()}.
*/
-public class MongoMKGetHeadRevisionTest extends BaseMongoMKTest {
+public class DocumentMKGetHeadRevisionTest extends BaseDocumentMKTest {
@Test
public void simple() throws Exception {
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKGetHeadRevisionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKGetHeadRevisionTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKGetNodesTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKGetNodesTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKGetNodesTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKGetNodesTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKGetNodesTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKGetNodesTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKGetNodesTest.java Tue Jan 28 11:28:23 2014
@@ -26,7 +26,7 @@ import org.junit.Test;
/**
* Tests for getNodes().
*/
-public class MongoMKGetNodesTest extends BaseMongoMKTest {
+public class DocumentMKGetNodesTest extends BaseDocumentMKTest {
@Test
public void nonExistingRevision() throws Exception {
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKGetNodesTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKGetNodesTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKNodeExistsTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKNodeExistsTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKNodeExistsTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKNodeExistsTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKNodeExistsTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKNodeExistsTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKNodeExistsTest.java Tue Jan 28 11:28:23 2014
@@ -26,7 +26,7 @@ import org.junit.Test;
/**
* Tests for nodeExists.
*/
-public class MongoMKNodeExistsTest extends BaseMongoMKTest {
+public class DocumentMKNodeExistsTest extends BaseDocumentMKTest {
@Test
public void simple() throws Exception {
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKNodeExistsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKNodeExistsTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKRebaseTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKRebaseTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKRebaseTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKRebaseTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKRebaseTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKRebaseTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKRebaseTest.java Tue Jan 28 11:28:23 2014
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertTru
* Tests for {@code MicroKernel#rebase}
* FIXME: this is copied from MicroKernelImplTest. Factor out.
*/
-public class MongoMKRebaseTest extends BaseMongoMKTest {
+public class DocumentMKRebaseTest extends BaseDocumentMKTest {
@Test
public void rebaseWithoutChanges() {
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKRebaseTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKRebaseTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKResetTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKResetTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKResetTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKResetTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKResetTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKResetTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKResetTest.java Tue Jan 28 11:28:23 2014
@@ -24,9 +24,9 @@ import static org.junit.Assert.assertTru
import static org.junit.Assert.fail;
/**
- * Tests MongoMKs implementation of MicroKernel.reset(String, String).
+ * Tests DocumentMKs implementation of MicroKernel.reset(String, String).
*/
-public class MongoMKResetTest extends BaseMongoMKTest {
+public class DocumentMKResetTest extends BaseDocumentMKTest {
@Test
public void resetToCurrentBranchHead() {
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKResetTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKResetTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKTestBase.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKTestBase.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKTestBase.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKTestBase.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKTestBase.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKTestBase.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKTestBase.java Tue Jan 28 11:28:23 2014
@@ -28,9 +28,9 @@ import static org.junit.Assert.assertNul
import static org.junit.Assert.assertTrue;
/**
- * <code>MongoMKTestBase</code> provides utility methods for MongoMK tests.
+ * <code>DocumentMKTestBase</code> provides utility methods for DocumentMK tests.
*/
-public abstract class MongoMKTestBase {
+public abstract class DocumentMKTestBase {
protected abstract MicroKernel getMicroKernel();
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKTestBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKTestBase.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java (from r1562024, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStoreTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStoreTest.java&r1=1562024&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoNodeStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java Tue Jan 28 11:28:23 2014
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-public class MongoNodeStoreTest {
+public class DocumentNodeStoreTest {
// OAK-1254
@Test
@@ -50,9 +50,9 @@ public class MongoNodeStoreTest {
semaphore.release();
}
};
- final MongoNodeStore store1 = new MongoMK.Builder().setAsyncDelay(0)
+ final DocumentNodeStore store1 = new DocumentMK.Builder().setAsyncDelay(0)
.setDocumentStore(testStore).setClusterId(1).getNodeStore();
- MongoNodeStore store2 = new MongoMK.Builder().setAsyncDelay(0)
+ DocumentNodeStore store2 = new DocumentMK.Builder().setAsyncDelay(0)
.setDocumentStore(docStore).setClusterId(2).getNodeStore();
NodeBuilder builder = store2.getRoot().builder();
@@ -97,7 +97,7 @@ public class MongoNodeStoreTest {
@Test
public void childNodeCache() throws Exception {
- MongoNodeStore store = new MongoMK.Builder().getNodeStore();
+ DocumentNodeStore store = new DocumentMK.Builder().getNodeStore();
NodeBuilder builder = store.getRoot().builder();
int max = (int) (KernelNodeState.MAX_CHILD_NODE_NAMES * 1.5);
SortedSet<String> children = new TreeSet<String>();
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java Tue Jan 28 11:28:23 2014
@@ -40,12 +40,12 @@ import static org.junit.Assert.assertTru
/**
* Check correct splitting of documents (OAK-926).
*/
-public class DocumentSplitTest extends BaseMongoMKTest {
+public class DocumentSplitTest extends BaseDocumentMKTest {
@Test
public void splitRevisions() throws Exception {
DocumentStore store = mk.getDocumentStore();
- MongoNodeStore ns = mk.getNodeStore();
+ DocumentNodeStore ns = mk.getNodeStore();
Set<Revision> revisions = Sets.newHashSet();
NodeDocument doc = store.find(NODES, Utils.getIdFromPath("/"));
assertNotNull(doc);
@@ -77,7 +77,7 @@ public class DocumentSplitTest extends B
@Test
public void splitDeleted() throws Exception {
DocumentStore store = mk.getDocumentStore();
- MongoNodeStore ns = mk.getNodeStore();
+ DocumentNodeStore ns = mk.getNodeStore();
Set<Revision> revisions = Sets.newHashSet();
mk.commit("/", "+\"foo\":{}", null, null);
NodeDocument doc = store.find(NODES, Utils.getIdFromPath("/foo"));
@@ -140,7 +140,7 @@ public class DocumentSplitTest extends B
@Test
public void splitPropertyRevisions() throws Exception {
DocumentStore store = mk.getDocumentStore();
- MongoNodeStore ns = mk.getNodeStore();
+ DocumentNodeStore ns = mk.getNodeStore();
mk.commit("/", "+\"foo\":{}", null, null);
NodeDocument doc = store.find(NODES, Utils.getIdFromPath("/foo"));
assertNotNull(doc);
@@ -171,22 +171,22 @@ public class DocumentSplitTest extends B
public void cluster() {
MemoryDocumentStore ds = new MemoryDocumentStore();
MemoryBlobStore bs = new MemoryBlobStore();
- MongoMK.Builder builder;
+ DocumentMK.Builder builder;
- builder = new MongoMK.Builder();
+ builder = new DocumentMK.Builder();
builder.setDocumentStore(ds).setBlobStore(bs).setAsyncDelay(0);
- MongoMK mk1 = builder.setClusterId(1).open();
+ DocumentMK mk1 = builder.setClusterId(1).open();
mk1.commit("/", "+\"test\":{\"prop1\":0}", null, null);
- // make sure the new node is visible to other MongoMK instances
+ // make sure the new node is visible to other DocumentMK instances
mk1.backgroundWrite();
- builder = new MongoMK.Builder();
+ builder = new DocumentMK.Builder();
builder.setDocumentStore(ds).setBlobStore(bs).setAsyncDelay(0);
- MongoMK mk2 = builder.setClusterId(2).open();
- builder = new MongoMK.Builder();
+ DocumentMK mk2 = builder.setClusterId(2).open();
+ builder = new DocumentMK.Builder();
builder.setDocumentStore(ds).setBlobStore(bs).setAsyncDelay(0);
- MongoMK mk3 = builder.setClusterId(3).open();
+ DocumentMK mk3 = builder.setClusterId(3).open();
for (int i = 0; i < NodeDocument.NUM_REVS_THRESHOLD; i++) {
mk1.commit("/", "^\"test/prop1\":" + i, null, null);
@@ -220,11 +220,11 @@ public class DocumentSplitTest extends B
MemoryBlobStore bs = new MemoryBlobStore();
List<Set<String>> changes = new ArrayList<Set<String>>();
- List<MongoMK> mks = new ArrayList<MongoMK>();
+ List<DocumentMK> mks = new ArrayList<DocumentMK>();
for (int i = 1; i <= numMKs; i++) {
- MongoMK.Builder builder = new MongoMK.Builder();
+ DocumentMK.Builder builder = new DocumentMK.Builder();
builder.setDocumentStore(ds).setBlobStore(bs).setAsyncDelay(0);
- MongoMK mk = builder.setClusterId(i).open();
+ DocumentMK mk = builder.setClusterId(i).open();
mks.add(mk);
changes.add(new HashSet<String>());
if (i == 1) {
@@ -239,8 +239,8 @@ public class DocumentSplitTest extends B
for (int i = 0; i < 1000; i++) {
int mkIdx = random.nextInt(mks.size());
// pick mk
- MongoMK mk = mks.get(mkIdx);
- MongoNodeStore ns = mk.getNodeStore();
+ DocumentMK mk = mks.get(mkIdx);
+ DocumentNodeStore ns = mk.getNodeStore();
// pick property name to update
String name = propNames.get(random.nextInt(propNames.size()));
// need to sync?
@@ -269,12 +269,12 @@ public class DocumentSplitTest extends B
mk.commit("/test", "^\"" + name + "\":" + value, null, null);
changes.get(mkIdx).add(name);
}
- for (MongoMK mk : mks) {
+ for (DocumentMK mk : mks) {
mk.dispose();
}
}
- private void syncMKs(List<MongoMK> mks, int idx) {
+ private void syncMKs(List<DocumentMK> mks, int idx) {
mks.get(idx).runBackgroundOperations();
for (int i = 0; i < mks.size(); i++) {
if (idx != i) {
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/IsolationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/IsolationTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/IsolationTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/IsolationTest.java Tue Jan 28 11:28:23 2014
@@ -22,7 +22,7 @@ import org.junit.Test;
* Tests if commits to branches and trunk are properly isolated and repository
* state on a given revision is stable.
*/
-public class IsolationTest extends BaseMongoMKTest {
+public class IsolationTest extends BaseDocumentMKTest {
@Test
public void phantomReadOnBranch() {
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyChildNodesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyChildNodesTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyChildNodesTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyChildNodesTest.java Tue Jan 28 11:28:23 2014
@@ -41,11 +41,11 @@ public class ManyChildNodesTest {
@Test
public void manyChildNodes() throws Exception {
TestStore store = new TestStore();
- MongoMK mk = new MongoMK.Builder().setDocumentStore(store).open();
+ DocumentMK mk = new DocumentMK.Builder().setDocumentStore(store).open();
NodeStore ns = mk.getNodeStore();
NodeBuilder builder = ns.getRoot().builder();
- for (int i = 0; i < MongoNodeState.MAX_FETCH_SIZE * 2; i++) {
+ for (int i = 0; i < DocumentNodeState.MAX_FETCH_SIZE * 2; i++) {
builder.child("c-" + i);
}
ns.merge(builder, EmptyHook.INSTANCE, null);
@@ -55,9 +55,9 @@ public class ManyChildNodesTest {
entry.getName();
}
// maximum fetch size is MAX_FETCH_SIZE plus one because
- // MongoNodeStore will use this value to find out if there
+ // DocumentNodeStore will use this value to find out if there
// are more child nodes than requested
- int maxFetchSize = MongoNodeState.MAX_FETCH_SIZE + 1;
+ int maxFetchSize = DocumentNodeState.MAX_FETCH_SIZE + 1;
for (Map.Entry<String, Integer> e : store.queries.entrySet()) {
assertTrue(e.getValue() + " > " + maxFetchSize,
e.getValue() <= maxFetchSize);
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MergeRetryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MergeRetryTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MergeRetryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MergeRetryTest.java Tue Jan 28 11:28:23 2014
@@ -67,8 +67,8 @@ public class MergeRetryTest {
MemoryDocumentStore ds = new MemoryDocumentStore();
MemoryBlobStore bs = new MemoryBlobStore();
- MongoMK mk1 = createMK(1, 1000, ds, bs);
- MongoMK mk2 = createMK(2, 1000, ds, bs);
+ DocumentMK mk1 = createMK(1, 1000, ds, bs);
+ DocumentMK mk2 = createMK(2, 1000, ds, bs);
try {
NodeStore ns1 = new KernelNodeStore(mk1);
@@ -96,8 +96,8 @@ public class MergeRetryTest {
MemoryDocumentStore ds = new MemoryDocumentStore();
MemoryBlobStore bs = new MemoryBlobStore();
- MongoMK mk1 = createMK(1, 1000, ds, bs);
- MongoMK mk2 = createMK(2, 1000, ds, bs);
+ DocumentMK mk1 = createMK(1, 1000, ds, bs);
+ DocumentMK mk2 = createMK(2, 1000, ds, bs);
try {
NodeStore ns1 = new KernelNodeStore(mk1);
@@ -129,9 +129,9 @@ public class MergeRetryTest {
}
}
- private MongoMK createMK(int clusterId, int asyncDelay,
+ private DocumentMK createMK(int clusterId, int asyncDelay,
DocumentStore ds, BlobStore bs) {
- return new MongoMK.Builder().setDocumentStore(ds).setBlobStore(bs)
+ return new DocumentMK.Builder().setDocumentStore(ds).setBlobStore(bs)
.setClusterId(clusterId).setAsyncDelay(asyncDelay).open();
}
}
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKDocumentStoreIT.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKDocumentStoreIT.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoMKDocumentStoreIT.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java Tue Jan 28 11:28:23 2014
@@ -34,7 +34,7 @@ import static junit.framework.Assert.ass
/**
* Tests {@code MongoDocumentStore} with concurrent updates.
*/
-public class MongoMKDocumentStoreIT extends AbstractMongoConnectionTest {
+public class MongoDocumentStoreIT extends AbstractMongoConnectionTest {
private static final int NUM_THREADS = 3;
private static final int UPDATES_PER_THREAD = 10;
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreIT.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoDocumentStoreTest.java Tue Jan 28 11:28:23 2014
@@ -58,7 +58,7 @@ public class MongoDocumentStoreTest {
DocumentStore openDocumentStore() {
if (MONGO_DB) {
- return new MongoDocumentStore(MongoUtils.getConnection().getDB(), new MongoMK.Builder());
+ return new MongoDocumentStore(MongoUtils.getConnection().getDB(), new DocumentMK.Builder());
}
return new MemoryDocumentStore();
}
@@ -192,15 +192,15 @@ public class MongoDocumentStoreTest {
DocumentStore docStore = openDocumentStore();
Revision rev = Revision.newRevision(0);
List<UpdateOp> inserts = new ArrayList<UpdateOp>();
- for (int i = 0; i < MongoMK.MANY_CHILDREN_THRESHOLD * 2; i++) {
+ for (int i = 0; i < DocumentMK.MANY_CHILDREN_THRESHOLD * 2; i++) {
Node n = new Node("/node-" + i, rev);
inserts.add(n.asOperation(true));
}
docStore.create(Collection.NODES, inserts);
List<NodeDocument> docs = docStore.query(Collection.NODES,
Utils.getKeyLowerLimit("/"), Utils.getKeyUpperLimit("/"),
- MongoMK.MANY_CHILDREN_THRESHOLD);
- assertEquals(MongoMK.MANY_CHILDREN_THRESHOLD, docs.size());
+ DocumentMK.MANY_CHILDREN_THRESHOLD);
+ assertEquals(DocumentMK.MANY_CHILDREN_THRESHOLD, docs.size());
}
@Test
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/OptimizedChildFetchTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/OptimizedChildFetchTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/OptimizedChildFetchTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/OptimizedChildFetchTest.java Tue Jan 28 11:28:23 2014
@@ -37,13 +37,13 @@ import static org.junit.Assert.assertFal
import static org.junit.matchers.JUnitMatchers.hasItem;
-public class OptimizedChildFetchTest extends BaseMongoMKTest {
+public class OptimizedChildFetchTest extends BaseDocumentMKTest {
private TestDocumentStore ds = new TestDocumentStore();
@Before
- public void initMongoMK() {
- mk = new MongoMK.Builder().setDocumentStore(ds).open();
+ public void initDocumentMK() {
+ mk = new DocumentMK.Builder().setDocumentStore(ds).open();
}
@Test
@@ -90,8 +90,8 @@ public class OptimizedChildFetchTest ext
}
private void resetMK() {
- disposeMongoMK();
- initMongoMK();
+ disposeDocumentMK();
+ initDocumentMK();
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RandomizedClusterTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RandomizedClusterTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RandomizedClusterTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RandomizedClusterTest.java Tue Jan 28 11:28:23 2014
@@ -50,7 +50,7 @@ public class RandomizedClusterTest {
private MemoryDocumentStore ds;
private MemoryBlobStore bs;
- private MongoMK[] mkList = new MongoMK[MK_COUNT];
+ private DocumentMK[] mkList = new DocumentMK[MK_COUNT];
private String[] revList = new String[MK_COUNT];
@SuppressWarnings({ "unchecked", "cast" })
private HashSet<Integer>[] unseenChanges = (HashSet<Integer>[]) new HashSet[MK_COUNT];
@@ -219,7 +219,7 @@ public class RandomizedClusterTest {
log("get " + node2);
x = get(i, node2);
log("get " + node2 + " returns " + x);
- MongoMK mk = mkList[mkId];
+ DocumentMK mk = mkList[mkId];
ClusterRev cr = new ClusterRev();
cr.mkId = mkId;
cr.rev = mk.getHeadRevision();
@@ -277,17 +277,17 @@ public class RandomizedClusterTest {
private void syncClusterNode() {
for (int i = 0; i < mkList.length; i++) {
- MongoMK mk = mkList[i];
+ DocumentMK mk = mkList[i];
mk.backgroundWrite();
}
- MongoMK mk = mkList[mkId];
+ DocumentMK mk = mkList[mkId];
mk.backgroundRead();
}
private void syncAndRefreshAllClusterNodes() {
syncClusterNode();
for (int i = 0; i < mkList.length; i++) {
- MongoMK mk = mkList[i];
+ DocumentMK mk = mkList[i];
mk.backgroundRead();
revList[i] = mk.getHeadRevision();
unseenChanges[i].clear();
@@ -302,13 +302,13 @@ public class RandomizedClusterTest {
private boolean exists(String node) {
String head = revList[mkId];
- MongoMK mk = mkList[mkId];
+ DocumentMK mk = mkList[mkId];
return mk.nodeExists("/" + node, head);
}
private boolean get(int maxOp, String node, String head) {
String p = "/" + node;
- MongoMK mk = mkList[mkId];
+ DocumentMK mk = mkList[mkId];
String value = getValue(mkId, maxOp, node);
if (value == null) {
assertFalse("path: " + p + " is supposed to not exist",
@@ -338,7 +338,7 @@ public class RandomizedClusterTest {
private String commit(String diff, boolean conflictExpected) {
boolean ok = false;
- MongoMK mk = mkList[mkId];
+ DocumentMK mk = mkList[mkId];
String rev = revList[mkId];
String result = null;
String ex = null;
@@ -370,8 +370,8 @@ public class RandomizedClusterTest {
return result;
}
- private MongoMK createMK(int clusterId) {
- MongoMK.Builder builder = new MongoMK.Builder();
+ private DocumentMK createMK(int clusterId) {
+ DocumentMK.Builder builder = new DocumentMK.Builder();
builder.setAsyncDelay(0);
if (MONGO_DB) {
DB db = MongoUtils.getConnection().getDB();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RandomizedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RandomizedTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RandomizedTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/RandomizedTest.java Tue Jan 28 11:28:23 2014
@@ -41,7 +41,7 @@ public class RandomizedTest {
private static final boolean MONGO_DB = false;
// private static final boolean MONGO_DB = true;
- private MongoMK mk;
+ private DocumentMK mk;
private MicroKernelImpl mkGold;
private String commitRev;
@@ -236,8 +236,8 @@ public class RandomizedTest {
return ok;
}
- private static MongoMK createMK() {
- MongoMK.Builder builder = new MongoMK.Builder();
+ private static DocumentMK createMK() {
+ DocumentMK.Builder builder = new DocumentMK.Builder();
if (MONGO_DB) {
DB db = MongoUtils.getConnection().getDB();
MongoUtils.dropCollections(db);
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SimpleTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SimpleTest.java?rev=1562039&r1=1562038&r2=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SimpleTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/SimpleTest.java Tue Jan 28 11:28:23 2014
@@ -44,7 +44,7 @@ public class SimpleTest {
@Test
public void test() {
- MongoMK mk = new MongoMK.Builder().open();
+ DocumentMK mk = new DocumentMK.Builder().open();
mk.dispose();
}
@@ -70,7 +70,7 @@ public class SimpleTest {
@Test
public void addNodeGetNode() {
- MongoMK mk = new MongoMK.Builder().open();
+ DocumentMK mk = new DocumentMK.Builder().open();
Revision rev = Revision.fromString(mk.getHeadRevision());
Node n = new Node("/test", rev);
n.setProperty("name", "Hello");
@@ -78,7 +78,7 @@ public class SimpleTest {
// mark as commit root
NodeDocument.setRevision(op, rev, "c");
DocumentStore s = mk.getDocumentStore();
- MongoNodeStore ns = mk.getNodeStore();
+ DocumentNodeStore ns = mk.getNodeStore();
assertTrue(s.create(Collection.NODES, Lists.newArrayList(op)));
Node n2 = ns.getNode("/test", rev);
assertEquals("Hello", n2.getProperty("name"));
@@ -87,7 +87,7 @@ public class SimpleTest {
@Test
public void nodeIdentifier() {
- MongoMK mk = createMK(true);
+ DocumentMK mk = createMK(true);
String rev0 = mk.getHeadRevision();
String rev1 = mk.commit("/", "+\"test\":{}", null, null);
@@ -121,7 +121,7 @@ public class SimpleTest {
@Test
public void conflict() {
- MongoMK mk = createMK();
+ DocumentMK mk = createMK();
mk.commit("/", "+\"a\": {}", null, null);
try {
mk.commit("/", "+\"b\": {} +\"a\": {}", null, null);
@@ -137,7 +137,7 @@ public class SimpleTest {
@Test
public void diff() {
- MongoMK mk = createMK();
+ DocumentMK mk = createMK();
String rev0 = mk.getHeadRevision();
String rev1 = mk.commit("/", "+\"t1\":{}", null, null);
@@ -169,7 +169,7 @@ public class SimpleTest {
@Test
public void reAddDeleted() {
- MongoMK mk = createMK();
+ DocumentMK mk = createMK();
String rev0 = mk.getHeadRevision();
String rev1 = mk.commit("/", "+\"test\":{\"name\": \"Hello\"} ^ \"x\": 1", null, null);
String rev2 = mk.commit("/", "-\"test\" ^ \"x\": 2", null, null);
@@ -187,7 +187,7 @@ public class SimpleTest {
@Test
public void reAddDeleted2() {
- MongoMK mk = createMK();
+ DocumentMK mk = createMK();
String rev = mk.commit("/", "+\"test\":{\"x\":\"1\",\"child\": {}}", null, null);
rev = mk.commit("/", "-\"test\"", rev, null);
rev = mk.commit("/", "+\"test\":{} +\"test2\": {}", null, null);
@@ -200,7 +200,7 @@ public class SimpleTest {
@Test
public void move() {
- MongoMK mk = createMK();
+ DocumentMK mk = createMK();
String rev = mk.commit("/", "+\"test\":{\"x\":\"1\",\"child\": {}}", null, null);
rev = mk.commit("/", ">\"test\": \"/test2\"", rev, null);
String test = mk.getNodes("/test2", rev, 0, 0, Integer.MAX_VALUE, null);
@@ -212,7 +212,7 @@ public class SimpleTest {
@Test
public void copy() {
- MongoMK mk = createMK();
+ DocumentMK mk = createMK();
String rev = mk.commit("/", "+\"test\":{\"x\":\"1\",\"child\": {}}", null, null);
rev = mk.commit("/", "*\"test\": \"/test2\"", rev, null);
String test = mk.getNodes("/test2", rev, 0, 0, Integer.MAX_VALUE, null);
@@ -224,7 +224,7 @@ public class SimpleTest {
@Test
public void escapePropertyName() {
- MongoMK mk = createMK();
+ DocumentMK mk = createMK();
String rev = mk.commit(
"/", "+\"test\":{\"name.first\": \"Hello\", \"_id\": \"a\", \"$x\": \"1\"}", null, null);
String test = mk.getNodes("/test", rev, 0, 0, Integer.MAX_VALUE, null);
@@ -234,8 +234,8 @@ public class SimpleTest {
@Test
public void commit() {
- MongoMK mk = createMK();
- MongoNodeStore ns = mk.getNodeStore();
+ DocumentMK mk = createMK();
+ DocumentNodeStore ns = mk.getNodeStore();
String rev = mk.commit("/", "+\"test\":{\"name\": \"Hello\"}", null, null);
String test = mk.getNodes("/test", rev, 0, 0, Integer.MAX_VALUE, null);
@@ -263,8 +263,8 @@ public class SimpleTest {
@Test
public void delete() {
- MongoMK mk = createMK();
- MongoNodeStore ns = mk.getNodeStore();
+ DocumentMK mk = createMK();
+ DocumentNodeStore ns = mk.getNodeStore();
mk.commit("/", "+\"testDel\":{\"name\": \"Hello\"}", null, null);
mk.commit("/testDel", "+\"a\":{\"name\": \"World\"}", null, null);
@@ -289,7 +289,7 @@ public class SimpleTest {
@Test
public void escapeUnescape() {
- MongoMK mk = createMK();
+ DocumentMK mk = createMK();
String rev;
String nodes;
Random r = new Random(1);
@@ -333,7 +333,7 @@ public class SimpleTest {
@Test
public void nodeAndPropertyNames() {
- MongoMK mk = createMK();
+ DocumentMK mk = createMK();
String rev;
String nodes;
for (String s : new String[] { "_", "$", "__", "_id", "$x", ".", ".\\", "x\\", "\\x", "first.name" }) {
@@ -366,7 +366,7 @@ public class SimpleTest {
@Test
public void addAndMove() {
- MongoMK mk = createMK();
+ DocumentMK mk = createMK();
String head = mk.getHeadRevision();
head = mk.commit("",
@@ -385,7 +385,7 @@ public class SimpleTest {
@Test
public void commitRoot() {
- MongoMK mk = createMK();
+ DocumentMK mk = createMK();
try {
DocumentStore store = mk.getDocumentStore();
Revision head = Revision.fromString(mk.getHeadRevision());
@@ -433,12 +433,12 @@ public class SimpleTest {
}
}
- private static MongoMK createMK() {
+ private static DocumentMK createMK() {
return createMK(false);
}
- private static MongoMK createMK(boolean useSimpleRevision) {
- MongoMK.Builder builder = new MongoMK.Builder();
+ private static DocumentMK createMK(boolean useSimpleRevision) {
+ DocumentMK.Builder builder = new DocumentMK.Builder();
if (MONGO_DB) {
DB db = MongoUtils.getConnection().getDB();
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKGetLengthGridFSTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKGetLengthGridFSTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKGetLengthGridFSTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKGetLengthGridFSTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKGetLengthGridFSTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKGetLengthGridFSTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKGetLengthGridFSTest.java Tue Jan 28 11:28:23 2014
@@ -27,7 +27,7 @@ import org.junit.Test;
/**
* Tests for {@code MongoMicroKernel#getLength(String)}
*/
-public class MongoMKGetLengthGridFSTest extends AbstractMongoConnectionTest {
+public class DocumentMKGetLengthGridFSTest extends AbstractMongoConnectionTest {
@Test
public void nonExistent() throws Exception {
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKGetLengthGridFSTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKGetLengthTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKGetLengthTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKGetLengthTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKGetLengthTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKGetLengthTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKGetLengthTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKGetLengthTest.java Tue Jan 28 11:28:23 2014
@@ -27,7 +27,7 @@ import org.junit.Test;
/**
* Tests for {@code MongoMicroKernel#getLength(String)}
*/
-public class MongoMKGetLengthTest extends AbstractMongoConnectionTest {
+public class DocumentMKGetLengthTest extends AbstractMongoConnectionTest {
@Test
public void nonExistent() throws Exception {
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKGetLengthTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKGetLengthTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadGridFSTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKReadGridFSTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadGridFSTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadGridFSTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKReadGridFSTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKReadGridFSTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadGridFSTest.java Tue Jan 28 11:28:23 2014
@@ -28,7 +28,7 @@ import org.junit.Test;
/**
* Tests for {@code MongoMicroKernel#read(String, long, byte[], int, int)}
*/
-public class MongoMKReadGridFSTest extends AbstractMongoConnectionTest {
+public class DocumentMKReadGridFSTest extends AbstractMongoConnectionTest {
private byte[] blob;
private String blobId;
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadGridFSTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadGridFSTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKReadTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKReadTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKReadTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadTest.java Tue Jan 28 11:28:23 2014
@@ -28,7 +28,7 @@ import org.junit.Test;
/**
* Tests for {@code MongoMicroKernel#read(String, long, byte[], int, int)}
*/
-public class MongoMKReadTest extends AbstractMongoConnectionTest {
+public class DocumentMKReadTest extends AbstractMongoConnectionTest {
private byte[] blob;
private String blobId;
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKWriteGridFSTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKWriteGridFSTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKWriteGridFSTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKWriteGridFSTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKWriteGridFSTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKWriteGridFSTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKWriteGridFSTest.java Tue Jan 28 11:28:23 2014
@@ -29,7 +29,7 @@ import org.junit.Test;
/**
* Tests for {@code MongoMicroKernel#write(java.io.InputStream)}
*/
-public class MongoMKWriteGridFSTest extends AbstractMongoConnectionTest {
+public class DocumentMKWriteGridFSTest extends AbstractMongoConnectionTest {
@Test
public void small() throws Exception {
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKWriteGridFSTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKWriteGridFSTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKWriteTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKWriteTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKWriteTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKWriteTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKWriteTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/MongoMKWriteTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKWriteTest.java Tue Jan 28 11:28:23 2014
@@ -29,7 +29,7 @@ import org.junit.Test;
/**
* Tests for {@code MongoMicroKernel#write(java.io.InputStream)}
*/
-public class MongoMKWriteTest extends AbstractMongoConnectionTest {
+public class DocumentMKWriteTest extends AbstractMongoConnectionTest {
@Test
public void small() throws Exception {
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKWriteTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKWriteTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKConcurrentAddTest.java (from r1562019, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKConcurrentAddTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKConcurrentAddTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKConcurrentAddTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKConcurrentAddTest.java&r1=1562019&r2=1562039&rev=1562039&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/MongoMKConcurrentAddTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKConcurrentAddTest.java Tue Jan 28 11:28:23 2014
@@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
-import org.apache.jackrabbit.oak.plugins.document.MongoMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.MongoUtils;
import org.apache.jackrabbit.oak.plugins.document.util.MongoConnection;
import org.junit.After;
@@ -38,7 +38,7 @@ import com.mongodb.DB;
/**
* Test for OAK-566.
*/
-public class MongoMKConcurrentAddTest extends AbstractMongoConnectionTest {
+public class DocumentMKConcurrentAddTest extends AbstractMongoConnectionTest {
private static final int NB_THREADS = 16;
@@ -48,7 +48,7 @@ public class MongoMKConcurrentAddTest ex
MongoConnection connection = MongoUtils.getConnection();
connections.add(connection);
DB mongoDB = connection.getDB();
- return new MongoMK.Builder().setMongoDB(mongoDB).open();
+ return new DocumentMK.Builder().setMongoDB(mongoDB).open();
}
@After
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKConcurrentAddTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/impl/DocumentMKConcurrentAddTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL