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 2013/04/15 15:12:25 UTC
svn commit: r1468034 - in /jackrabbit/oak/trunk/oak-mongomk/src:
main/java/org/apache/jackrabbit/mongomk/
test/java/org/apache/jackrabbit/mongomk/
test/java/org/apache/jackrabbit/mongomk/impl/
Author: mreutegg
Date: Mon Apr 15 13:12:24 2013
New Revision: 1468034
URL: http://svn.apache.org/r1468034
Log:
OAK-619 Lock-free MongoMK implementation
- Moved and changed more tests to use MemoryDocumentStore based MongoMK
Added:
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKCommitRemoveTest.java (contents, props changed)
- copied, changed from r1467952, jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKCommitRemoveTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKGetHeadRevisionTest.java (contents, props changed)
- copied, changed from r1467952, jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetHeadRevisionTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKGetNodesTest.java (contents, props changed)
- copied, changed from r1467952, jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetNodesTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKNodeExistsTest.java (contents, props changed)
- copied, changed from r1467952, jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKNodeExistsTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKRebaseTest.java (contents, props changed)
- copied, changed from r1467952, jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKRebaseTest.java
Removed:
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKCommitRemoveTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetHeadRevisionTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetNodesTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKNodeExistsTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKRebaseTest.java
Modified:
jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetChildCountTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetJournalTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetRevisionHistoryTest.java
jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWaitForCommitTest.java
Modified: jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java?rev=1468034&r1=1468033&r2=1468034&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/MongoMK.java Mon Apr 15 13:12:24 2013
@@ -791,6 +791,9 @@ public class MongoMK implements MicroKer
includeId |= filter != null && filter.contains(":hash");
json.object();
n.append(json, includeId);
+ if (maxChildNodes == -1) {
+ maxChildNodes = Integer.MAX_VALUE;
+ }
// FIXME: must not read all children!
Children c = getChildren(path, rev, Integer.MAX_VALUE);
for (long i = offset; i < c.children.size(); i++) {
Copied: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKCommitRemoveTest.java (from r1467952, jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKCommitRemoveTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKCommitRemoveTest.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKCommitRemoveTest.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKCommitRemoveTest.java&r1=1467952&r2=1468034&rev=1468034&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKCommitRemoveTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKCommitRemoveTest.java Mon Apr 15 13:12:24 2013
@@ -14,33 +14,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mongomk.impl;
+package org.apache.jackrabbit.mongomk;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.jackrabbit.mongomk.BaseMongoMicroKernelTest;
import org.junit.Ignore;
import org.junit.Test;
/**
* Tests with emphasis on remove node and property operations.
*/
-public class MongoMKCommitRemoveTest extends BaseMongoMicroKernelTest {
+public class MongoMKCommitRemoveTest extends BaseMongoMKTest {
@Test
- @Ignore
public void removeSingleNode() throws Exception {
mk.commit("/", "+\"a\" : {}", null, null);
- long childCount = mk.getChildNodeCount("/", null);
- assertEquals(1, childCount);
+ assertNodesExist(null, "/a");
mk.commit("/", "-\"a\"", null, null);
- childCount = mk.getChildNodeCount("/", null);
- assertEquals(0, childCount);
+ assertNodesNotExist(null, "/a");
}
@Test
@@ -54,7 +49,7 @@ public class MongoMKCommitRemoveTest ext
}
@Test
- @Ignore
+ @Ignore
public void removeNodeTwice() throws Exception {
String base = mk.commit("", "+\"/a\":{}", null, null);
mk.commit("", "-\"/a\"", base, null);
Propchange: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKCommitRemoveTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKCommitRemoveTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKGetHeadRevisionTest.java (from r1467952, jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetHeadRevisionTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKGetHeadRevisionTest.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKGetHeadRevisionTest.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetHeadRevisionTest.java&r1=1467952&r2=1468034&rev=1468034&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetHeadRevisionTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKGetHeadRevisionTest.java Mon Apr 15 13:12:24 2013
@@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mongomk.impl;
+package org.apache.jackrabbit.mongomk;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import org.apache.jackrabbit.mongomk.BaseMongoMicroKernelTest;
+import org.apache.jackrabbit.mongomk.impl.SimpleNodeScenario;
import org.junit.Test;
/**
* Tests for {@code MongoMicroKernel#getHeadRevision()}.
*/
-public class MongoMKGetHeadRevisionTest extends BaseMongoMicroKernelTest {
+public class MongoMKGetHeadRevisionTest extends BaseMongoMKTest {
@Test
public void simple() throws Exception {
Propchange: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKGetHeadRevisionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKGetHeadRevisionTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKGetNodesTest.java (from r1467952, jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetNodesTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKGetNodesTest.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKGetNodesTest.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetNodesTest.java&r1=1467952&r2=1468034&rev=1468034&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetNodesTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKGetNodesTest.java Mon Apr 15 13:12:24 2013
@@ -14,19 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mongomk.impl;
+package org.apache.jackrabbit.mongomk;
import static org.junit.Assert.fail;
-import org.apache.jackrabbit.mongomk.BaseMongoMicroKernelTest;
+import org.apache.jackrabbit.mongomk.impl.SimpleNodeScenario;
import org.json.simple.JSONObject;
import org.junit.Ignore;
import org.junit.Test;
/**
- * Tests for getHeadRevision().
+ * Tests for getNodes().
*/
-public class MongoMKGetNodesTest extends BaseMongoMicroKernelTest {
+public class MongoMKGetNodesTest extends BaseMongoMKTest {
@Test
public void nonExistingRevision() throws Exception {
@@ -49,19 +49,18 @@ public class MongoMKGetNodesTest extends
}
@Test
- @Ignore
public void afterDelete() throws Exception {
SimpleNodeScenario scenario = new SimpleNodeScenario(mk);
scenario.create();
- JSONObject root = parseJSONObject(mk.getNodes("/", null, 1, 0, -1, null));
+ JSONObject root = parseJSONObject(mk.getNodes("/", null, 0, 0, -1, null));
assertPropertyValue(root, ":childNodeCount", 1L);
- JSONObject a = resolveObjectValue(root, "a");
+ JSONObject a = parseJSONObject(mk.getNodes("/a", null, 0, 0, -1, null));
assertPropertyValue(a, ":childNodeCount", 2L);
scenario.deleteA();
- root = parseJSONObject(mk.getNodes("/", null, 1, 0, -1, null));
+ root = parseJSONObject(mk.getNodes("/", null, 0, 0, -1, null));
assertPropertyValue(root, ":childNodeCount", 0L);
}
@@ -76,7 +75,6 @@ public class MongoMKGetNodesTest extends
}
@Test
- @Ignore
public void depthZero() throws Exception {
SimpleNodeScenario scenario = new SimpleNodeScenario(mk);
scenario.create();
Propchange: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKGetNodesTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKGetNodesTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKNodeExistsTest.java (from r1467952, jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKNodeExistsTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKNodeExistsTest.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKNodeExistsTest.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKNodeExistsTest.java&r1=1467952&r2=1468034&rev=1468034&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKNodeExistsTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKNodeExistsTest.java Mon Apr 15 13:12:24 2013
@@ -14,19 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mongomk.impl;
+package org.apache.jackrabbit.mongomk;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.jackrabbit.mongomk.BaseMongoMicroKernelTest;
+import org.apache.jackrabbit.mongomk.impl.SimpleNodeScenario;
import org.junit.Test;
/**
* Tests for nodeExists.
*/
-public class MongoMKNodeExistsTest extends BaseMongoMicroKernelTest {
+public class MongoMKNodeExistsTest extends BaseMongoMKTest {
@Test
public void simple() throws Exception {
Propchange: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKNodeExistsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKNodeExistsTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKRebaseTest.java (from r1467952, jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKRebaseTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKRebaseTest.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKRebaseTest.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKRebaseTest.java&r1=1467952&r2=1468034&rev=1468034&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKRebaseTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKRebaseTest.java Mon Apr 15 13:12:24 2013
@@ -14,9 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mongomk.impl;
+package org.apache.jackrabbit.mongomk;
-import org.apache.jackrabbit.mongomk.BaseMongoMicroKernelTest;
import org.junit.Ignore;
import org.junit.Test;
@@ -30,7 +29,7 @@ import static org.junit.Assert.assertTru
* FIXME: this is copied from MicroKernelImplTest. Factor out.
*/
@Ignore
-public class MongoMKRebaseTest extends BaseMongoMicroKernelTest {
+public class MongoMKRebaseTest extends BaseMongoMKTest {
@Test
public void rebaseWithoutChanges() {
Propchange: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKRebaseTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKRebaseTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetChildCountTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetChildCountTest.java?rev=1468034&r1=1468033&r2=1468034&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetChildCountTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetChildCountTest.java Mon Apr 15 13:12:24 2013
@@ -26,17 +26,16 @@ import org.junit.Test;
/**
* Tests getChildNodeCount.
*/
+@Ignore("MongoMK does not implement getChildNodeCount()")
public class MongoMKGetChildCountTest extends BaseMongoMicroKernelTest {
@Test
- @Ignore
public void noChild() throws Exception {
long childCount = mk.getChildNodeCount("/", null);
assertEquals(0, childCount);
}
@Test
- @Ignore
public void singleChild() throws Exception {
mk.commit("/", "+\"a\" : {}", null, null);
@@ -45,7 +44,6 @@ public class MongoMKGetChildCountTest ex
}
@Test
- @Ignore
public void multipleChilden() throws Exception {
mk.commit("/", "+\"a\" : { \"b\": {}, \"c\": {}, \"d\" : {} }", null, null);
@@ -66,7 +64,6 @@ public class MongoMKGetChildCountTest ex
}
@Test
- @Ignore
public void multipleNestedChildren() throws Exception {
mk.commit("/", "+\"a\" : { \"b\": { \"c\" : { \"d\" : {} } } }", null, null);
Modified: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetJournalTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetJournalTest.java?rev=1468034&r1=1468033&r2=1468034&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetJournalTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetJournalTest.java Mon Apr 15 13:12:24 2013
@@ -27,10 +27,10 @@ import org.junit.Test;
/**
* Tests for {@code MongoMicroKernel#getJournal(String, String, String)}
*/
+@Ignore("MongoMK does not implement getJournal()")
public class MongoMKGetJournalTest extends BaseMongoMicroKernelTest {
@Test
- @Ignore
public void simple() throws Exception {
String fromDiff = "+\"/a\":{}";
String fromMsg = "Add /a";
@@ -57,7 +57,6 @@ public class MongoMKGetJournalTest exten
}
@Test
- @Ignore
public void commitAddWithDiffPaths() {
// Commit with empty path and retrieve with root path
String rev = mk.commit("", "+\"/a\":{}", null, "");
@@ -93,7 +92,6 @@ public class MongoMKGetJournalTest exten
}
@Test
- @Ignore
public void commitCopyWithDiffPaths() {
mk.commit("", "+\"/a\":{}", null, "");
@@ -125,7 +123,6 @@ public class MongoMKGetJournalTest exten
}
@Test
- @Ignore
public void commitMoveWithDiffPaths() {
mk.commit("", "+\"/a\":{}", null, "");
@@ -158,7 +155,6 @@ public class MongoMKGetJournalTest exten
}
@Test
- @Ignore
public void commitRemoveMoveWithDiffPaths() {
mk.commit("", "+\"/a\":{}", null, "");
@@ -192,7 +188,6 @@ public class MongoMKGetJournalTest exten
}
@Test
- @Ignore
public void commitSetPropertyWithDiffPaths() {
mk.commit("", "+\"/a\":{}", null, "");
Modified: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetRevisionHistoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetRevisionHistoryTest.java?rev=1468034&r1=1468033&r2=1468034&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetRevisionHistoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetRevisionHistoryTest.java Mon Apr 15 13:12:24 2013
@@ -26,10 +26,10 @@ import org.junit.Test;
/**
* Tests for getRevisionHistory
*/
+@Ignore("MongoMK does not implement getRevisionHistory()")
public class MongoMKGetRevisionHistoryTest extends BaseMongoMicroKernelTest {
@Test
- @Ignore
public void maxEntriesZero() throws Exception {
mk.commit("/", "+\"a\" : {}", null, null);
JSONArray array = parseJSONArray(mk.getRevisionHistory(0, 0, "/"));
@@ -37,7 +37,6 @@ public class MongoMKGetRevisionHistoryTe
}
@Test
- @Ignore
public void maxEntriesLimitless() throws Exception {
int count = 10;
for (int i = 0; i < count; i++) {
@@ -48,7 +47,6 @@ public class MongoMKGetRevisionHistoryTe
}
@Test
- @Ignore
public void maxEntriesLimited() throws Exception {
int count = 10;
int limit = 4;
@@ -61,7 +59,6 @@ public class MongoMKGetRevisionHistoryTe
}
@Test
- @Ignore
public void path() throws Exception {
int count1 = 5;
for (int i = 0; i < count1; i++) {
@@ -83,7 +80,6 @@ public class MongoMKGetRevisionHistoryTe
}
@Test
- @Ignore
public void since() throws Exception {
// To make sure there's a little delay since the initial commit.
Thread.sleep(100);
Modified: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWaitForCommitTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWaitForCommitTest.java?rev=1468034&r1=1468033&r2=1468034&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWaitForCommitTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWaitForCommitTest.java Mon Apr 15 13:12:24 2013
@@ -38,7 +38,7 @@ import com.mongodb.DB;
/**
* Tests for {@code MongoMicroKernel#waitForCommit(String, long)}
*/
-@Ignore
+@Ignore("MongoMK does not implement waitForCommit()")
public class MongoMKWaitForCommitTest extends BaseMongoMicroKernelTest {
private MicroKernel mk2;