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 md...@apache.org on 2013/08/19 11:11:46 UTC
svn commit: r1515324 - in
/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core:
RootFuzzIT.java RootTest.java
Author: mduerig
Date: Mon Aug 19 09:11:46 2013
New Revision: 1515324
URL: http://svn.apache.org/r1515324
Log:
OAK-962: RootFuzzIT fails on MongoMK with seed -1091889749
Move test case to proper location
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java?rev=1515324&r1=1515323&r2=1515324&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java Mon Aug 19 09:11:46 2013
@@ -46,7 +46,6 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -125,26 +124,12 @@ public class RootFuzzIT {
fixture.dispose(store2);
}
- // TODO move to a better location
- @Test
- @Ignore("OAK-962") // FIXME OAK-962
- public void oak962() throws CommitFailedException {
- Tree r = root1.getTree("/root");
- r.addChild("N3");
- r.addChild("N6");
- r.getChild("N6").addChild("N7");
- root1.commit();
- root1.move("/root/N6/N7", "/root/N3/N12");
- r.getChild("N3").getChild("N12").remove();
- r.getChild("N6").remove();
- root1.commit();
- }
-
- // FIXME currently fails on MongoMK due. See OAK-962
- // FIXME currently fails on SegmentMK. Needs further analysis
@Test
public void fuzzTest() throws Exception {
+ // FIXME fails on MongoMK due. See OAK-962
assumeTrue(fixture != NodeStoreFixture.MONGO_MK || EXECUTE_MONGO_MK);
+
+ // FIXME fails on SegmentMK. Needs further analysis
assumeTrue(fixture != NodeStoreFixture.SEGMENT_MK || EXECUTE_SEGMENT_MK);
for (Operation op : operations(OP_COUNT)) {
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootTest.java?rev=1515324&r1=1515323&r2=1515324&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootTest.java Mon Aug 19 09:11:46 2013
@@ -478,6 +478,23 @@ public class RootTest extends OakBaseTes
checkEqual(root1.getTree("/"), (root2.getTree("/")));
}
+ @Test
+ public void oak962() throws CommitFailedException {
+ // FIXME Fails on MongoMK. See OAK-962
+ assumeTrue(fixture != NodeStoreFixture.MONGO_MK);
+
+ Root root = session.getLatestRoot();
+ Tree r = root.getTree("/").addChild("root");
+ r.addChild("N3");
+ r.addChild("N6");
+ r.getChild("N6").addChild("N7");
+ root.commit();
+ root.move("/root/N6/N7", "/root/N3/N12");
+ r.getChild("N3").getChild("N12").remove();
+ r.getChild("N6").remove();
+ root.commit();
+ }
+
private static void checkEqual(Tree tree1, Tree tree2) {
assertEquals(tree1.getChildrenCount(Long.MAX_VALUE), tree2.getChildrenCount(Long.MAX_VALUE));
assertEquals(tree1.getPropertyCount(), tree2.getPropertyCount());