From 02e4da12771cc0bad1f109d1c36b8432781332d0 Mon Sep 17 00:00:00 2001 From: Tudor Rogoz Date: Mon, 1 Oct 2012 11:11:46 +0200 Subject: [PATCH] Inconsistency issue when committing a node under an old parent --- .../mongomk/command/CommitCommandMongoTest.java | 884 +++++++++++--------- 1 file changed, 500 insertions(+), 384 deletions(-) diff --git a/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/CommitCommandMongoTest.java b/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/CommitCommandMongoTest.java index 510a585..767f6c1 100644 --- a/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/CommitCommandMongoTest.java +++ b/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/command/CommitCommandMongoTest.java @@ -16,6 +16,7 @@ */ package org.apache.jackrabbit.mongomk.command; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.util.LinkedList; @@ -44,388 +45,503 @@ import org.junit.Test; @SuppressWarnings("javadoc") public class CommitCommandMongoTest extends BaseMongoTest { - @Test - @Ignore // FIXME - Implement - public void addIntermediataryNodes() throws Exception { - } - - @Test - public void addNewNodesToSameParent() throws Exception { - List instructions = new LinkedList(); - instructions.add(new AddNodeInstructionImpl("/", "1")); - - Commit commit = new CommitImpl("/", "+1 : {}", "This is the 1st commit", instructions); - CommitCommandMongo command = new CommitCommandMongo(mongoConnection, commit); - String firstRevisionId = command.execute(); - - instructions = new LinkedList(); - instructions.add(new AddNodeInstructionImpl("/", "2")); - - commit = new CommitImpl("/", "+2 : {}", "This is the 2nd commit", instructions); - command = new CommitCommandMongo(mongoConnection, commit); - String secondRevisionId = command.execute(); - - instructions = new LinkedList(); - instructions.add(new AddNodeInstructionImpl("/", "3")); - - commit = new CommitImpl("/", "+3 : {}", "This is the 3rd commit", instructions); - command = new CommitCommandMongo(mongoConnection, commit); - String thirdRevisionId = command.execute(); - - MongoAssert.assertNodesExist("", NodeBuilder.build(String.format( - "{ \"/#%3$s\" : { \"1#%1$s\" : { } , \"2#%2$s\" : { } , \"3#%3$s\" : { } } }", - firstRevisionId, secondRevisionId, thirdRevisionId))); - } - - @Test - public void addNodes() throws Exception { - List instructions = new LinkedList(); - instructions.add(new AddNodeInstructionImpl("/", "a")); - instructions.add(new AddNodeInstructionImpl("/a", "b")); - instructions.add(new AddNodeInstructionImpl("/a", "c")); - - Commit commit = new CommitImpl("/", "+a : { b : {} , c : {} }", - "This is a simple commit", instructions); - CommitCommandMongo command = new CommitCommandMongo(mongoConnection, commit); - String revisionId = command.execute(); - - Assert.assertNotNull(revisionId); - MongoAssert.assertNodesExist("", NodeBuilder.build(String.format( - "{ \"/#%1$s\" : { \"a#%1$s\" : { \"b#%1$s\" : {} , \"c#%1$s\" : {} } } }", revisionId))); - - MongoAssert.assertCommitExists(commit); - MongoAssert.assertCommitContainsAffectedPaths(commit.getRevisionId(), "/", "/a", "/a/b", "/a/c"); - MongoAssert.assertHeadRevision(1); - MongoAssert.assertNextRevision(2); - } - - @Test - public void addDuplicateNode() throws Exception { - // Add /a and /a/b - List instructions = new LinkedList(); - instructions.add(new AddNodeInstructionImpl("/", "a")); - instructions.add(new AddNodeInstructionImpl("/a", "b")); - Commit commit = new CommitImpl("/", "+a : { \"b\" : {} }", "Add /a, /a/b", instructions); - CommitCommandMongo command = new CommitCommandMongo(mongoConnection, commit); - command.execute(); - - // Add /a/b again - instructions = new LinkedList(); - instructions.add(new AddNodeInstructionImpl("/a", "b")); - commit = new CommitImpl("/a", "+b", "Add /a/b", instructions); - command = new CommitCommandMongo(mongoConnection, commit); - try { - command.execute(); - fail("Exception expected"); - } catch (Exception expected) { - } - } - - @Test - public void addNodesAndPropertiesOutOfOrder() throws Exception { - List instructions = new LinkedList(); - instructions.add(new AddPropertyInstructionImpl("/a", "key1", "value1")); - instructions.add(new AddNodeInstructionImpl("/", "a")); - instructions.add(new AddNodeInstructionImpl("/a", "b")); - instructions.add(new AddPropertyInstructionImpl("/a/b", "key2", "value2")); - instructions.add(new AddPropertyInstructionImpl("/a/c", "key3", "value3")); - instructions.add(new AddNodeInstructionImpl("/a", "c")); - - Commit commit = new CommitImpl("/", - "+a : { \"key1\" : \"value1\" , \"key2\" : \"value2\" , \"key3\" : \"value3\" }", - "This is a simple commit", instructions); - CommitCommandMongo command = new CommitCommandMongo(mongoConnection, commit); - String revisionId = command.execute(); - - Assert.assertNotNull(revisionId); - MongoAssert - .assertNodesExist( - "", - NodeBuilder.build(String - .format("{ \"/#%1$s\" : { \"a#%1$s\" : { \"key1\" : \"value1\", \"b#%1$s\" : { \"key2\" : \"value2\" } , \"c#%1$s\" : { \"key3\" : \"value3\" } } } }", - revisionId))); - - MongoAssert.assertCommitExists(commit); - MongoAssert.assertCommitContainsAffectedPaths(commit.getRevisionId(), "/", "/a", "/a/b", "/a/c"); - MongoAssert.assertHeadRevision(1); - MongoAssert.assertNextRevision(2); - } - - @Test - public void addNodesWhichAlreadyExist() throws Exception { - SimpleNodeScenario scenario1 = new SimpleNodeScenario(mongoConnection); - scenario1.create(); - - List instructions = new LinkedList(); - instructions.add(new AddNodeInstructionImpl("/", "a")); - instructions.add(new AddPropertyInstructionImpl("/a", "key1", "value1")); - instructions.add(new AddNodeInstructionImpl("/a", "b")); - instructions.add(new AddPropertyInstructionImpl("/a/b", "key2", "value2")); - instructions.add(new AddNodeInstructionImpl("/a", "c")); - instructions.add(new AddPropertyInstructionImpl("/a/c", "key3", "value3")); - - Commit commit = new CommitImpl("/", - "+a : { \"key1\" : \"value1\" , \"key2\" : \"value2\" , \"key3\" : \"value3\" }", - "This is a simple commit", instructions); - CommitCommandMongo command = new CommitCommandMongo(mongoConnection, commit); - String revisionId = command.execute(); - - Assert.assertNotNull(revisionId); - MongoAssert - .assertNodesExist( - "", - NodeBuilder.build(String - .format("{ \"/#%1$s\" : { \"a#%1$s\" : { \"int\" : 1 , \"key1\" : \"value1\", \"b#%1$s\" : { \"string\" : \"foo\" , \"key2\" : \"value2\" } , \"c#%1$s\" : { \"bool\" : true , \"key3\" : \"value3\" } } } }", - revisionId))); - - MongoAssert.assertCommitExists(commit); - // MongoAssert.assertCommitContainsAffectedPaths(commit.getRevisionId(), "/a", "/a/b", "/a/c"); TODO think about - // whether / should really be included since it already contained /a - MongoAssert.assertCommitContainsAffectedPaths(commit.getRevisionId(), "/", "/a", "/a/b", "/a/c"); - } - - @Test - public void commitAndMergeNodes() throws Exception { - SimpleNodeScenario scenario1 = new SimpleNodeScenario(mongoConnection); - String firstRevisionId = scenario1.create(); - String secondRevisionId = scenario1.update_A_and_add_D_and_E(); - - SimpleNodeScenario scenario2 = new SimpleNodeScenario(mongoConnection); - String thirdRevisionId = scenario2.create(); - - MongoAssert - .assertNodesExist( - "", - NodeBuilder.build(String - .format("{ \"/#%1$s\" : { \"a#%1$s\" : { \"int\" : 1 , \"b#%1$s\" : { \"string\" : \"foo\" } , \"c#%1$s\" : { \"bool\" : true } } } }", - firstRevisionId))); - MongoAssert - .assertNodesExist( - "", - NodeBuilder.build(String - .format("{ \"/#%1$s\" : { \"a#%2$s\" : { \"int\" : 1 , \"double\" : 0.123 , \"b#%2$s\" : { \"string\" : \"foo\" , \"e#%2$s\" : { \"array\" : [ 123, null, 123.456, \"for:bar\", true ] } } , \"c#%1$s\" : { \"bool\" : true }, \"d#%2$s\" : { \"null\" : null } } } }", - firstRevisionId, secondRevisionId))); - MongoAssert - .assertNodesExist( - "", - NodeBuilder.build(String - .format("{ \"/#%3$s\" : { \"a#%3$s\" : { \"int\" : 1 , \"double\" : 0.123 , \"b#%3$s\" : { \"string\" : \"foo\" , \"e#%2$s\" : { \"array\" : [ 123, null, 123.456, \"for:bar\", true ] } } , \"c#%3$s\" : { \"bool\" : true }, \"d#%2$s\" : { \"null\" : null } } } }", - firstRevisionId, secondRevisionId, - thirdRevisionId))); - } - - @Test - public void commitContainsAllAffectedNodes() throws Exception { - SimpleNodeScenario scenario = new SimpleNodeScenario(mongoConnection); - String firstRevisionId = scenario.create(); - String secondRevisionId = scenario.update_A_and_add_D_and_E(); - - MongoAssert.assertCommitContainsAffectedPaths(firstRevisionId, "/", "/a", "/a/b", "/a/c"); - MongoAssert.assertCommitContainsAffectedPaths(secondRevisionId, "/a", "/a/b", "/a/d", "/a/b/e"); - } - - @Test - public void removeNode() throws Exception { - List instructions = new LinkedList(); - instructions.add(new AddNodeInstructionImpl("/", "a")); - instructions.add(new AddNodeInstructionImpl("/a", "b")); - instructions.add(new AddNodeInstructionImpl("/a", "c")); - - Commit commit = new CommitImpl("/", "+a : { b : {} , c : {} }", - "This is a simple commit", instructions); - CommitCommandMongo command = new CommitCommandMongo(mongoConnection, commit); - String revisionId = command.execute(); - Assert.assertNotNull(revisionId); - - instructions = new LinkedList(); - instructions.add(new RemoveNodeInstructionImpl("/", "a")); - - commit = new CommitImpl("/", "-a", "This is a simple commit", instructions); - command = new CommitCommandMongo(mongoConnection, commit); - revisionId = command.execute(); - Assert.assertNotNull(revisionId); - - MongoAssert.assertNodesExist("", - NodeBuilder.build(String.format("{ \"/#%1$s\" : {} }", revisionId))); - - MongoAssert.assertCommitExists(commit); - MongoAssert.assertCommitContainsAffectedPaths(commit.getRevisionId(), "/"); - } - - @Test - public void removeNonExistentNode() throws Exception { - List instructions = new LinkedList(); - instructions.add(new AddNodeInstructionImpl("/", "a")); - instructions.add(new AddNodeInstructionImpl("/a", "b")); - - Commit commit = new CommitImpl("/", "+a : { b : {} }", "Add nodes", instructions); - CommitCommandMongo command = new CommitCommandMongo(mongoConnection, commit); - command.execute(); - - instructions = new LinkedList(); - instructions.add(new RemoveNodeInstructionImpl("/a", "c")); - - commit = new CommitImpl("/a", "-c", "Non-existent node delete", instructions); - command = new CommitCommandMongo(mongoConnection, commit); - try { - command.execute(); - fail("Exception expected"); - } catch (Exception expected) { - - } - } - - @Test - public void existingParentContainsChildren() throws Exception { - List instructions = new LinkedList(); - instructions.add(new AddNodeInstructionImpl("/", "a")); - instructions.add(new AddNodeInstructionImpl("/", "b")); - instructions.add(new AddNodeInstructionImpl("/", "c")); - - Commit commit = new CommitImpl("/", "+a : { b : {} , c : {} }", - "This is a simple commit", instructions); - CommitCommandMongo command = new CommitCommandMongo(mongoConnection, commit); - String revisionId = command.execute(); - - Assert.assertNotNull(revisionId); - MongoAssert.assertNodesExist("", NodeBuilder.build(String.format( - "{ \"/#%1$s\" : { \"a#%1$s\" : {}, \"b#%1$s\" : {} , \"c#%1$s\" : {} } }", revisionId))); - - GetNodesCommandMongo command2 = new GetNodesCommandMongo(mongoConnection, "/", revisionId, 0); - Node rootOfPath = command2.execute(); - Assert.assertEquals(3, rootOfPath.getChildCount()); - } - - @Test - public void mergePropertiesAndChildren_noneExistedAndNewAdded() throws Exception { - List instructions = new LinkedList(); - instructions.add(new AddNodeInstructionImpl("/", "a")); - instructions.add(new AddPropertyInstructionImpl("/a", "key1", "value1")); - instructions.add(new AddPropertyInstructionImpl("/a", "key2", "value2")); - instructions.add(new AddPropertyInstructionImpl("/a", "key3", "value3")); - - Commit commit = new CommitImpl("/", - "+a : { \"key1\" : \"value1\" , \"key2\" : \"value2\" , \"key3\" : \"value3\" }", - "This is a simple commit", instructions); - CommitCommandMongo command = new CommitCommandMongo(mongoConnection, commit); - String revisionId = command.execute(); - - MongoAssert.assertNodesExist("", NodeBuilder.build(String.format("{ \"/#%1$s\" : {} }", "0"))); - MongoAssert - .assertNodesExist( - "", - NodeBuilder.build(String - .format("{ \"/#%1$s\" : { \"a#%1$s\" : { \"key1\" : \"value1\", \"key2\" : \"value2\", \"key3\" : \"value3\" } } }", - revisionId))); - } - - @Test - public void mergePropertiesAndChildren_someExistedAndNewAdded() throws Exception { - List instructions = new LinkedList(); - instructions.add(new AddNodeInstructionImpl("/", "a")); - instructions.add(new AddPropertyInstructionImpl("/a", "existed_key1", "value1")); - instructions.add(new AddPropertyInstructionImpl("/a", "existed_key2", "value2")); - instructions.add(new AddPropertyInstructionImpl("/a", "existed_key3", "value3")); - - Commit commit = new CommitImpl("/", - "+a : { \"existed_key1\" : \"value1\" , \"existed_key2\" : \"value2\" , \"existed_key3\" : \"value3\" }", - "This is a simple commit", instructions); - CommitCommandMongo command = new CommitCommandMongo(mongoConnection, commit); - String revisionId = command.execute(); - - instructions = new LinkedList(); - instructions.add(new AddNodeInstructionImpl("/", "a")); - instructions.add(new AddPropertyInstructionImpl("/a", "key1", "value1")); - instructions.add(new AddPropertyInstructionImpl("/a", "key2", "value2")); - instructions.add(new AddPropertyInstructionImpl("/a", "key3", "value3")); - - commit = new CommitImpl("/", - "+a : { \"key1\" : \"value1\" , \"key2\" : \"value2\" , \"key3\" : \"value3\" }", - "This is a simple commit", instructions); - command = new CommitCommandMongo(mongoConnection, commit); - revisionId = command.execute(); - - MongoAssert.assertNodesExist("", NodeBuilder.build(String.format("{ \"/#%1$s\" : {} }", "0"))); - MongoAssert - .assertNodesExist( - "", - NodeBuilder.build(String - .format("{ \"/#%1$s\" : { \"a#%1$s\" : { \"existed_key1\" : \"value1\", \"existed_key2\" : \"value2\", \"existed_key3\" : \"value3\", \"key1\" : \"value1\", \"key2\" : \"value2\", \"key3\" : \"value3\" } } }", - revisionId))); - } - - @Test - public void noOtherNodesTouched() throws Exception { - List instructions = new LinkedList(); - instructions.add(new AddNodeInstructionImpl("/", "a")); - instructions.add(new AddNodeInstructionImpl("/", "b")); - instructions.add(new AddNodeInstructionImpl("/", "c")); - - Commit commit = new CommitImpl("/", "+a : { b : {} , c : {} }", - "This is a simple commit", instructions); - CommitCommandMongo command = new CommitCommandMongo(mongoConnection, commit); - String firstRevisionId = command.execute(); - - instructions = new LinkedList(); - instructions.add(new AddNodeInstructionImpl("/a", "d")); - instructions.add(new AddNodeInstructionImpl("/a", "e")); - - commit = new CommitImpl("/a", "+d: {} \n+e : {}", "This is a simple commit", instructions); - command = new CommitCommandMongo(mongoConnection, commit); - String secondRevisionId = command.execute(); - - MongoAssert.assertNodeRevisionId("/", firstRevisionId, true); - MongoAssert.assertNodeRevisionId("/a", firstRevisionId, true); - MongoAssert.assertNodeRevisionId("/b", firstRevisionId, true); - MongoAssert.assertNodeRevisionId("/c", firstRevisionId, true); - MongoAssert.assertNodeRevisionId("/a/d", firstRevisionId, false); - MongoAssert.assertNodeRevisionId("/a/e", firstRevisionId, false); - - MongoAssert.assertNodeRevisionId("/", secondRevisionId, false); - MongoAssert.assertNodeRevisionId("/a", secondRevisionId, true); - MongoAssert.assertNodeRevisionId("/b", secondRevisionId, false); - MongoAssert.assertNodeRevisionId("/c", secondRevisionId, false); - MongoAssert.assertNodeRevisionId("/a/d", secondRevisionId, true); - MongoAssert.assertNodeRevisionId("/a/e", secondRevisionId, true); - } - - @Test - public void rootNodeHasEmptyRootPath() throws Exception { - List instructions = new LinkedList(); - instructions.add(new AddNodeInstructionImpl("", "/")); - - Commit commit = new CommitImpl(MongoUtil.INITIAL_COMMIT_PATH, MongoUtil.INITIAL_COMMIT_DIFF, - MongoUtil.INITIAL_COMMIT_MESSAGE, instructions); - CommitCommandMongo command = new CommitCommandMongo(mongoConnection, commit); - String revisionId = command.execute(); - Assert.assertNotNull(revisionId); - - Node expected = NodeBuilder.build(String.format("{ \"/#%1$s\" : {} }", revisionId)); - MongoAssert.assertNodesExist(MongoUtil.INITIAL_COMMIT_PATH, expected); - } - - @Test - @Ignore - // FIXME - This currently fails due to some limit in property sizes in Mongo - // which affects path property. - public void bigCommit() throws Exception { - String path = "/"; - String baseNodeName = "test"; - int numberOfCommits = 1000; - - List instructions = new LinkedList(); - for (int i = 0; i < numberOfCommits; i++) { - instructions.clear(); - instructions.add(new AddNodeInstructionImpl(path, baseNodeName + i)); - Commit commit = new CommitImpl(path, "+" + baseNodeName + i + " : {}", - "Add node n" + i, instructions); - CommitCommandMongo command = new CommitCommandMongo( - mongoConnection, commit); - command.execute(); - if (!PathUtils.denotesRoot(path)) { - path += "/"; - } - path += baseNodeName + i; - } - } + @Test + @Ignore + // FIXME - Implement + public void addIntermediataryNodes() throws Exception { + } + + @Test + public void addNewNodesToSameParent() throws Exception { + List instructions = new LinkedList(); + instructions.add(new AddNodeInstructionImpl("/", "1")); + + Commit commit = new CommitImpl("/", "+1 : {}", + "This is the 1st commit", instructions); + CommitCommandMongo command = new CommitCommandMongo(mongoConnection, + commit); + String firstRevisionId = command.execute(); + + instructions = new LinkedList(); + instructions.add(new AddNodeInstructionImpl("/", "2")); + + commit = new CommitImpl("/", "+2 : {}", "This is the 2nd commit", + instructions); + command = new CommitCommandMongo(mongoConnection, commit); + String secondRevisionId = command.execute(); + + instructions = new LinkedList(); + instructions.add(new AddNodeInstructionImpl("/", "3")); + + commit = new CommitImpl("/", "+3 : {}", "This is the 3rd commit", + instructions); + command = new CommitCommandMongo(mongoConnection, commit); + String thirdRevisionId = command.execute(); + + MongoAssert + .assertNodesExist( + "", + NodeBuilder.build(String + .format("{ \"/#%3$s\" : { \"1#%1$s\" : { } , \"2#%2$s\" : { } , \"3#%3$s\" : { } } }", + firstRevisionId, secondRevisionId, + thirdRevisionId))); + } + + @Test + public void addNodes() throws Exception { + List instructions = new LinkedList(); + instructions.add(new AddNodeInstructionImpl("/", "a")); + instructions.add(new AddNodeInstructionImpl("/a", "b")); + instructions.add(new AddNodeInstructionImpl("/a", "c")); + + Commit commit = new CommitImpl("/", "+a : { b : {} , c : {} }", + "This is a simple commit", instructions); + CommitCommandMongo command = new CommitCommandMongo(mongoConnection, + commit); + String revisionId = command.execute(); + + Assert.assertNotNull(revisionId); + MongoAssert + .assertNodesExist( + "", + NodeBuilder.build(String + .format("{ \"/#%1$s\" : { \"a#%1$s\" : { \"b#%1$s\" : {} , \"c#%1$s\" : {} } } }", + revisionId))); + + MongoAssert.assertCommitExists(commit); + MongoAssert.assertCommitContainsAffectedPaths(commit.getRevisionId(), + "/", "/a", "/a/b", "/a/c"); + MongoAssert.assertHeadRevision(1); + MongoAssert.assertNextRevision(2); + } + + @Test + public void addDuplicateNode() throws Exception { + // Add /a and /a/b + List instructions = new LinkedList(); + instructions.add(new AddNodeInstructionImpl("/", "a")); + instructions.add(new AddNodeInstructionImpl("/a", "b")); + Commit commit = new CommitImpl("/", "+a : { \"b\" : {} }", + "Add /a, /a/b", instructions); + CommitCommandMongo command = new CommitCommandMongo(mongoConnection, + commit); + command.execute(); + + // Add /a/b again + instructions = new LinkedList(); + instructions.add(new AddNodeInstructionImpl("/a", "b")); + commit = new CommitImpl("/a", "+b", "Add /a/b", instructions); + command = new CommitCommandMongo(mongoConnection, commit); + try { + command.execute(); + fail("Exception expected"); + } catch (Exception expected) { + } + } + + @Test + public void addNodesAndPropertiesOutOfOrder() throws Exception { + List instructions = new LinkedList(); + instructions + .add(new AddPropertyInstructionImpl("/a", "key1", "value1")); + instructions.add(new AddNodeInstructionImpl("/", "a")); + instructions.add(new AddNodeInstructionImpl("/a", "b")); + instructions.add(new AddPropertyInstructionImpl("/a/b", "key2", + "value2")); + instructions.add(new AddPropertyInstructionImpl("/a/c", "key3", + "value3")); + instructions.add(new AddNodeInstructionImpl("/a", "c")); + + Commit commit = new CommitImpl( + "/", + "+a : { \"key1\" : \"value1\" , \"key2\" : \"value2\" , \"key3\" : \"value3\" }", + "This is a simple commit", instructions); + CommitCommandMongo command = new CommitCommandMongo(mongoConnection, + commit); + String revisionId = command.execute(); + + Assert.assertNotNull(revisionId); + MongoAssert + .assertNodesExist( + "", + NodeBuilder.build(String + .format("{ \"/#%1$s\" : { \"a#%1$s\" : { \"key1\" : \"value1\", \"b#%1$s\" : { \"key2\" : \"value2\" } , \"c#%1$s\" : { \"key3\" : \"value3\" } } } }", + revisionId))); + + MongoAssert.assertCommitExists(commit); + MongoAssert.assertCommitContainsAffectedPaths(commit.getRevisionId(), + "/", "/a", "/a/b", "/a/c"); + MongoAssert.assertHeadRevision(1); + MongoAssert.assertNextRevision(2); + } + + @Test + public void addNodesWhichAlreadyExist() throws Exception { + SimpleNodeScenario scenario1 = new SimpleNodeScenario(mongoConnection); + scenario1.create(); + + List instructions = new LinkedList(); + instructions.add(new AddNodeInstructionImpl("/", "a")); + instructions + .add(new AddPropertyInstructionImpl("/a", "key1", "value1")); + instructions.add(new AddNodeInstructionImpl("/a", "b")); + instructions.add(new AddPropertyInstructionImpl("/a/b", "key2", + "value2")); + instructions.add(new AddNodeInstructionImpl("/a", "c")); + instructions.add(new AddPropertyInstructionImpl("/a/c", "key3", + "value3")); + + Commit commit = new CommitImpl( + "/", + "+a : { \"key1\" : \"value1\" , \"key2\" : \"value2\" , \"key3\" : \"value3\" }", + "This is a simple commit", instructions); + CommitCommandMongo command = new CommitCommandMongo(mongoConnection, + commit); + String revisionId = command.execute(); + + Assert.assertNotNull(revisionId); + MongoAssert + .assertNodesExist( + "", + NodeBuilder.build(String + .format("{ \"/#%1$s\" : { \"a#%1$s\" : { \"int\" : 1 , \"key1\" : \"value1\", \"b#%1$s\" : { \"string\" : \"foo\" , \"key2\" : \"value2\" } , \"c#%1$s\" : { \"bool\" : true , \"key3\" : \"value3\" } } } }", + revisionId))); + + MongoAssert.assertCommitExists(commit); + // MongoAssert.assertCommitContainsAffectedPaths(commit.getRevisionId(), + // "/a", "/a/b", "/a/c"); TODO think about + // whether / should really be included since it already contained /a + MongoAssert.assertCommitContainsAffectedPaths(commit.getRevisionId(), + "/", "/a", "/a/b", "/a/c"); + } + + @Test + public void commitAndMergeNodes() throws Exception { + SimpleNodeScenario scenario1 = new SimpleNodeScenario(mongoConnection); + String firstRevisionId = scenario1.create(); + String secondRevisionId = scenario1.update_A_and_add_D_and_E(); + + SimpleNodeScenario scenario2 = new SimpleNodeScenario(mongoConnection); + String thirdRevisionId = scenario2.create(); + + MongoAssert + .assertNodesExist( + "", + NodeBuilder.build(String + .format("{ \"/#%1$s\" : { \"a#%1$s\" : { \"int\" : 1 , \"b#%1$s\" : { \"string\" : \"foo\" } , \"c#%1$s\" : { \"bool\" : true } } } }", + firstRevisionId))); + MongoAssert + .assertNodesExist( + "", + NodeBuilder.build(String + .format("{ \"/#%1$s\" : { \"a#%2$s\" : { \"int\" : 1 , \"double\" : 0.123 , \"b#%2$s\" : { \"string\" : \"foo\" , \"e#%2$s\" : { \"array\" : [ 123, null, 123.456, \"for:bar\", true ] } } , \"c#%1$s\" : { \"bool\" : true }, \"d#%2$s\" : { \"null\" : null } } } }", + firstRevisionId, secondRevisionId))); + MongoAssert + .assertNodesExist( + "", + NodeBuilder.build(String + .format("{ \"/#%3$s\" : { \"a#%3$s\" : { \"int\" : 1 , \"double\" : 0.123 , \"b#%3$s\" : { \"string\" : \"foo\" , \"e#%2$s\" : { \"array\" : [ 123, null, 123.456, \"for:bar\", true ] } } , \"c#%3$s\" : { \"bool\" : true }, \"d#%2$s\" : { \"null\" : null } } } }", + firstRevisionId, secondRevisionId, + thirdRevisionId))); + } + + @Test + public void commitContainsAllAffectedNodes() throws Exception { + SimpleNodeScenario scenario = new SimpleNodeScenario(mongoConnection); + String firstRevisionId = scenario.create(); + String secondRevisionId = scenario.update_A_and_add_D_and_E(); + + MongoAssert.assertCommitContainsAffectedPaths(firstRevisionId, "/", + "/a", "/a/b", "/a/c"); + MongoAssert.assertCommitContainsAffectedPaths(secondRevisionId, "/a", + "/a/b", "/a/d", "/a/b/e"); + } + + @Test + public void removeNode() throws Exception { + List instructions = new LinkedList(); + instructions.add(new AddNodeInstructionImpl("/", "a")); + instructions.add(new AddNodeInstructionImpl("/a", "b")); + instructions.add(new AddNodeInstructionImpl("/a", "c")); + + Commit commit = new CommitImpl("/", "+a : { b : {} , c : {} }", + "This is a simple commit", instructions); + CommitCommandMongo command = new CommitCommandMongo(mongoConnection, + commit); + String revisionId = command.execute(); + Assert.assertNotNull(revisionId); + + instructions = new LinkedList(); + instructions.add(new RemoveNodeInstructionImpl("/", "a")); + + commit = new CommitImpl("/", "-a", "This is a simple commit", + instructions); + command = new CommitCommandMongo(mongoConnection, commit); + revisionId = command.execute(); + Assert.assertNotNull(revisionId); + + MongoAssert.assertNodesExist("", NodeBuilder.build(String.format( + "{ \"/#%1$s\" : {} }", revisionId))); + + MongoAssert.assertCommitExists(commit); + MongoAssert.assertCommitContainsAffectedPaths(commit.getRevisionId(), + "/"); + } + + @Test + public void removeNonExistentNode() throws Exception { + List instructions = new LinkedList(); + instructions.add(new AddNodeInstructionImpl("/", "a")); + instructions.add(new AddNodeInstructionImpl("/a", "b")); + + Commit commit = new CommitImpl("/", "+a : { b : {} }", "Add nodes", + instructions); + CommitCommandMongo command = new CommitCommandMongo(mongoConnection, + commit); + command.execute(); + + instructions = new LinkedList(); + instructions.add(new RemoveNodeInstructionImpl("/a", "c")); + + commit = new CommitImpl("/a", "-c", "Non-existent node delete", + instructions); + command = new CommitCommandMongo(mongoConnection, commit); + try { + command.execute(); + fail("Exception expected"); + } catch (Exception expected) { + + } + } + + @Test + public void existingParentContainsChildren() throws Exception { + List instructions = new LinkedList(); + instructions.add(new AddNodeInstructionImpl("/", "a")); + instructions.add(new AddNodeInstructionImpl("/", "b")); + instructions.add(new AddNodeInstructionImpl("/", "c")); + + Commit commit = new CommitImpl("/", "+a : { b : {} , c : {} }", + "This is a simple commit", instructions); + CommitCommandMongo command = new CommitCommandMongo(mongoConnection, + commit); + String revisionId = command.execute(); + + Assert.assertNotNull(revisionId); + MongoAssert + .assertNodesExist( + "", + NodeBuilder.build(String + .format("{ \"/#%1$s\" : { \"a#%1$s\" : {}, \"b#%1$s\" : {} , \"c#%1$s\" : {} } }", + revisionId))); + + GetNodesCommandMongo command2 = new GetNodesCommandMongo( + mongoConnection, "/", revisionId, 0); + Node rootOfPath = command2.execute(); + Assert.assertEquals(3, rootOfPath.getChildCount()); + } + + @Test + public void mergePropertiesAndChildren_noneExistedAndNewAdded() + throws Exception { + List instructions = new LinkedList(); + instructions.add(new AddNodeInstructionImpl("/", "a")); + instructions + .add(new AddPropertyInstructionImpl("/a", "key1", "value1")); + instructions + .add(new AddPropertyInstructionImpl("/a", "key2", "value2")); + instructions + .add(new AddPropertyInstructionImpl("/a", "key3", "value3")); + + Commit commit = new CommitImpl( + "/", + "+a : { \"key1\" : \"value1\" , \"key2\" : \"value2\" , \"key3\" : \"value3\" }", + "This is a simple commit", instructions); + CommitCommandMongo command = new CommitCommandMongo(mongoConnection, + commit); + String revisionId = command.execute(); + + MongoAssert.assertNodesExist("", + NodeBuilder.build(String.format("{ \"/#%1$s\" : {} }", "0"))); + MongoAssert + .assertNodesExist( + "", + NodeBuilder.build(String + .format("{ \"/#%1$s\" : { \"a#%1$s\" : { \"key1\" : \"value1\", \"key2\" : \"value2\", \"key3\" : \"value3\" } } }", + revisionId))); + } + + @Test + public void mergePropertiesAndChildren_someExistedAndNewAdded() + throws Exception { + List instructions = new LinkedList(); + instructions.add(new AddNodeInstructionImpl("/", "a")); + instructions.add(new AddPropertyInstructionImpl("/a", "existed_key1", + "value1")); + instructions.add(new AddPropertyInstructionImpl("/a", "existed_key2", + "value2")); + instructions.add(new AddPropertyInstructionImpl("/a", "existed_key3", + "value3")); + + Commit commit = new CommitImpl( + "/", + "+a : { \"existed_key1\" : \"value1\" , \"existed_key2\" : \"value2\" , \"existed_key3\" : \"value3\" }", + "This is a simple commit", instructions); + CommitCommandMongo command = new CommitCommandMongo(mongoConnection, + commit); + String revisionId = command.execute(); + + instructions = new LinkedList(); + instructions.add(new AddNodeInstructionImpl("/", "a")); + instructions + .add(new AddPropertyInstructionImpl("/a", "key1", "value1")); + instructions + .add(new AddPropertyInstructionImpl("/a", "key2", "value2")); + instructions + .add(new AddPropertyInstructionImpl("/a", "key3", "value3")); + + commit = new CommitImpl( + "/", + "+a : { \"key1\" : \"value1\" , \"key2\" : \"value2\" , \"key3\" : \"value3\" }", + "This is a simple commit", instructions); + command = new CommitCommandMongo(mongoConnection, commit); + revisionId = command.execute(); + + MongoAssert.assertNodesExist("", + NodeBuilder.build(String.format("{ \"/#%1$s\" : {} }", "0"))); + MongoAssert + .assertNodesExist( + "", + NodeBuilder.build(String + .format("{ \"/#%1$s\" : { \"a#%1$s\" : { \"existed_key1\" : \"value1\", \"existed_key2\" : \"value2\", \"existed_key3\" : \"value3\", \"key1\" : \"value1\", \"key2\" : \"value2\", \"key3\" : \"value3\" } } }", + revisionId))); + } + + @Test + public void noOtherNodesTouched() throws Exception { + List instructions = new LinkedList(); + instructions.add(new AddNodeInstructionImpl("/", "a")); + instructions.add(new AddNodeInstructionImpl("/", "b")); + instructions.add(new AddNodeInstructionImpl("/", "c")); + + Commit commit = new CommitImpl("/", "+a : { b : {} , c : {} }", + "This is a simple commit", instructions); + CommitCommandMongo command = new CommitCommandMongo(mongoConnection, + commit); + String firstRevisionId = command.execute(); + + instructions = new LinkedList(); + instructions.add(new AddNodeInstructionImpl("/a", "d")); + instructions.add(new AddNodeInstructionImpl("/a", "e")); + + commit = new CommitImpl("/a", "+d: {} \n+e : {}", + "This is a simple commit", instructions); + command = new CommitCommandMongo(mongoConnection, commit); + String secondRevisionId = command.execute(); + + MongoAssert.assertNodeRevisionId("/", firstRevisionId, true); + MongoAssert.assertNodeRevisionId("/a", firstRevisionId, true); + MongoAssert.assertNodeRevisionId("/b", firstRevisionId, true); + MongoAssert.assertNodeRevisionId("/c", firstRevisionId, true); + MongoAssert.assertNodeRevisionId("/a/d", firstRevisionId, false); + MongoAssert.assertNodeRevisionId("/a/e", firstRevisionId, false); + + MongoAssert.assertNodeRevisionId("/", secondRevisionId, false); + MongoAssert.assertNodeRevisionId("/a", secondRevisionId, true); + MongoAssert.assertNodeRevisionId("/b", secondRevisionId, false); + MongoAssert.assertNodeRevisionId("/c", secondRevisionId, false); + MongoAssert.assertNodeRevisionId("/a/d", secondRevisionId, true); + MongoAssert.assertNodeRevisionId("/a/e", secondRevisionId, true); + } + + @Test + public void rootNodeHasEmptyRootPath() throws Exception { + List instructions = new LinkedList(); + instructions.add(new AddNodeInstructionImpl("", "/")); + + Commit commit = new CommitImpl(MongoUtil.INITIAL_COMMIT_PATH, + MongoUtil.INITIAL_COMMIT_DIFF, + MongoUtil.INITIAL_COMMIT_MESSAGE, instructions); + CommitCommandMongo command = new CommitCommandMongo(mongoConnection, + commit); + String revisionId = command.execute(); + Assert.assertNotNull(revisionId); + + Node expected = NodeBuilder.build(String.format("{ \"/#%1$s\" : {} }", + revisionId)); + MongoAssert.assertNodesExist(MongoUtil.INITIAL_COMMIT_PATH, expected); + } + + @Test + @Ignore + // FIXME - This currently fails due to some limit in property sizes in Mongo + // which affects path property. + public void bigCommit() throws Exception { + String path = "/"; + String baseNodeName = "test"; + int numberOfCommits = 1000; + + List instructions = new LinkedList(); + for (int i = 0; i < numberOfCommits; i++) { + instructions.clear(); + instructions + .add(new AddNodeInstructionImpl(path, baseNodeName + i)); + Commit commit = new CommitImpl(path, "+" + baseNodeName + i + + " : {}", "Add node n" + i, instructions); + CommitCommandMongo command = new CommitCommandMongo( + mongoConnection, commit); + command.execute(); + if (!PathUtils.denotesRoot(path)) { + path += "/"; + } + path += baseNodeName + i; + } + } + + @Test + public void commitNodeOldParent() throws Exception { + List instructions = new LinkedList(); + + // Add /a + instructions.add(new AddNodeInstructionImpl("/", "a")); + Commit commit1 = new CommitImpl("/", "+a : {}", "Add node a", + instructions); + CommitCommandMongo command = new CommitCommandMongo(mongoConnection, + commit1); + command.execute(); + + // Add /a/b + instructions = new LinkedList(); + instructions.add(new AddNodeInstructionImpl("/a", "b")); + Commit commit2 = new CommitImpl("/a", "+b : {}", "Add node a/b", + instructions); + command = new CommitCommandMongo(mongoConnection, commit2); + command.execute(); + + // Add /a/b/c + instructions = new LinkedList(); + instructions.add(new AddNodeInstructionImpl("/a/b", "c")); + Commit commit3 = new CommitImpl("/a/b", "+c : {}", "Add node a/b/c", + instructions); + command = new CommitCommandMongo(mongoConnection, commit3); + command.execute(); + try { + // Add /a/d + instructions = new LinkedList(); + instructions.add(new AddNodeInstructionImpl("/a", "d")); + Commit commit4 = new CommitImpl("/a", "+d : {}", "Add node a/d", + instructions); + command = new CommitCommandMongo(mongoConnection, commit4); + command.execute(); + + NodeExistsCommandMongo command2 = new NodeExistsCommandMongo( + mongoConnection, "/a/d", null); + boolean exists = command2.execute(); + assertTrue("The node a is not found in the head revision!", exists); + + } catch (Exception e) { + fail("The node \"d\" was not successfully added"); + } + + } } -- 1.7.9.5