jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1349877 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ConflictHandlerTest.java
Date Wed, 13 Jun 2012 14:34:11 GMT
Author: mduerig
Date: Wed Jun 13 14:34:11 2012
New Revision: 1349877

URL: http://svn.apache.org/viewvc?rev=1349877&view=rev
Log:
OAK-133: Session.refresh(true) should allow for manual conflict reconciliation
test case

Added:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ConflictHandlerTest.java

Added: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ConflictHandlerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ConflictHandlerTest.java?rev=1349877&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ConflictHandlerTest.java
(added)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ConflictHandlerTest.java
Wed Jun 13 14:34:11 2012
@@ -0,0 +1,231 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.jackrabbit.oak.core;
+
+import org.apache.jackrabbit.mk.api.MicroKernel;
+import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.apache.jackrabbit.oak.api.CoreValue;
+import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.api.Root;
+import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+public class ConflictHandlerTest extends AbstractOakTest {
+    private Root ourRoot;
+    private Root theirRoot;
+    private CoreValue ourValue;
+    private CoreValue theirValue;
+
+    @Override
+    protected NodeState createInitialState(MicroKernel microKernel) {
+        String jsop = "^\"a\":1 ^\"b\":2 ^\"c\":3 +\"x\":{} +\"y\":{} +\"z\":{}";
+        microKernel.commit("/", jsop, microKernel.getHeadRevision(), "test data");
+
+        ourRoot = new RootImpl(store, "");
+        theirRoot = new RootImpl(store, "");
+
+        ourValue = valueFactory.createValue("foo");
+        theirValue = valueFactory.createValue("bar");
+        return store.getRoot();
+    }
+
+    @Test
+    public void testAddExistingPropertyOurs() throws CommitFailedException {
+        theirRoot.getTree("/").setProperty("p", theirValue);
+        ourRoot.getTree("/").setProperty("p", ourValue);
+
+        theirRoot.commit(DefaultConflictHandler.OURS);
+        ourRoot.commit(DefaultConflictHandler.OURS);
+
+        PropertyState p = ourRoot.getTree("/").getProperty("p");
+        assertNotNull(p);
+        assertEquals(ourValue, p.getValue());
+    }
+
+    @Test
+    public void testChangeDeletedPropertyOurs() throws CommitFailedException {
+        theirRoot.getTree("/").removeProperty("a");
+        ourRoot.getTree("/").setProperty("a", ourValue);
+
+        theirRoot.commit(DefaultConflictHandler.OURS);
+        ourRoot.commit(DefaultConflictHandler.OURS);
+
+        PropertyState p = ourRoot.getTree("/").getProperty("a");
+        assertNotNull(p);
+        assertEquals(ourValue, p.getValue());
+    }
+
+    @Test
+    public void testChangeChangedPropertyOurs() throws CommitFailedException {
+        theirRoot.getTree("/").setProperty("a", theirValue);
+        ourRoot.getTree("/").setProperty("a", ourValue);
+
+        theirRoot.commit(DefaultConflictHandler.OURS);
+        ourRoot.commit(DefaultConflictHandler.OURS);
+
+        PropertyState p = ourRoot.getTree("/").getProperty("a");
+        assertNotNull(p);
+        assertEquals(ourValue, p.getValue());
+    }
+
+    @Test
+    public void testDeleteChangedPropertyOurs() throws CommitFailedException {
+        theirRoot.getTree("/").setProperty("a", theirValue);
+        ourRoot.getTree("/").removeProperty("a");
+
+        theirRoot.commit(DefaultConflictHandler.OURS);
+        ourRoot.commit(DefaultConflictHandler.OURS);
+
+        PropertyState p = ourRoot.getTree("/").getProperty("a");
+        assertNull(p);
+    }
+
+    @Test
+    public void testAddExistingNodeOurs() throws CommitFailedException {
+        theirRoot.getTree("/").addChild("n").setProperty("p", theirValue);
+        ourRoot.getTree("/").addChild("n").setProperty("p", ourValue);
+
+        theirRoot.commit(DefaultConflictHandler.OURS);
+        ourRoot.commit(DefaultConflictHandler.OURS);
+
+        Tree n = ourRoot.getTree("/n");
+        assertNotNull(n);
+        assertEquals(ourValue, n.getProperty("p").getValue());
+    }
+
+    @Test
+    public void testChangeDeletedNodeOurs() throws CommitFailedException {
+        theirRoot.getTree("/").removeChild("x");
+        ourRoot.getTree("/x").setProperty("p", ourValue);
+
+        theirRoot.commit(DefaultConflictHandler.OURS);
+        ourRoot.commit(DefaultConflictHandler.OURS);
+
+        Tree n = ourRoot.getTree("/x");
+        assertNotNull(n);
+        assertEquals(ourValue, n.getProperty("p").getValue());
+    }
+
+    @Test
+    public void testDeleteChangedNodeOurs() throws CommitFailedException {
+        theirRoot.getTree("/x").setProperty("p", theirValue);
+        ourRoot.getTree("/").removeChild("x");
+
+        theirRoot.commit(DefaultConflictHandler.OURS);
+        ourRoot.commit(DefaultConflictHandler.OURS);
+
+        Tree n = ourRoot.getTree("/x");
+        assertNull(n);
+    }
+
+    @Test
+    public void testAddExistingPropertyTheirs() throws CommitFailedException {
+        theirRoot.getTree("/").setProperty("p", theirValue);
+        ourRoot.getTree("/").setProperty("p", ourValue);
+
+        theirRoot.commit(DefaultConflictHandler.THEIRS);
+        ourRoot.commit(DefaultConflictHandler.THEIRS);
+
+        PropertyState p = ourRoot.getTree("/").getProperty("p");
+        assertNotNull(p);
+        assertEquals(theirValue, p.getValue());
+    }
+
+    @Test
+    public void testChangeDeletedPropertyTheirs() throws CommitFailedException {
+        theirRoot.getTree("/").removeProperty("a");
+        ourRoot.getTree("/").setProperty("a", ourValue);
+
+        theirRoot.commit(DefaultConflictHandler.THEIRS);
+        ourRoot.commit(DefaultConflictHandler.THEIRS);
+
+        PropertyState p = ourRoot.getTree("/").getProperty("a");
+        assertNull(p);
+    }
+
+    @Test
+    public void testChangeChangedPropertyTheirs() throws CommitFailedException {
+        theirRoot.getTree("/").setProperty("a", theirValue);
+        ourRoot.getTree("/").setProperty("a", ourValue);
+
+        theirRoot.commit(DefaultConflictHandler.THEIRS);
+        ourRoot.commit(DefaultConflictHandler.THEIRS);
+
+        PropertyState p = ourRoot.getTree("/").getProperty("a");
+        assertNotNull(p);
+        assertEquals(theirValue, p.getValue());
+    }
+
+    @Test
+    public void testDeleteChangedPropertyTheirs() throws CommitFailedException {
+        theirRoot.getTree("/").setProperty("a", theirValue);
+        ourRoot.getTree("/").removeProperty("a");
+
+        theirRoot.commit(DefaultConflictHandler.THEIRS);
+        ourRoot.commit(DefaultConflictHandler.THEIRS);
+
+        PropertyState p = ourRoot.getTree("/").getProperty("a");
+        assertNotNull(p);
+        assertEquals(theirValue, p.getValue());
+    }
+
+    @Test
+    public void testAddExistingNodeTheirs() throws CommitFailedException {
+        theirRoot.getTree("/").addChild("n").setProperty("p", theirValue);
+        ourRoot.getTree("/").addChild("n").setProperty("p", ourValue);
+
+        theirRoot.commit(DefaultConflictHandler.THEIRS);
+        ourRoot.commit(DefaultConflictHandler.THEIRS);
+
+        Tree n = ourRoot.getTree("/n");
+        assertNotNull(n);
+        assertEquals(theirValue, n.getProperty("p").getValue());
+    }
+
+    @Test
+    public void testChangeDeletedNodeTheirs() throws CommitFailedException {
+        theirRoot.getTree("/").removeChild("x");
+        ourRoot.getTree("/x").setProperty("p", ourValue);
+
+        theirRoot.commit(DefaultConflictHandler.THEIRS);
+        ourRoot.commit(DefaultConflictHandler.THEIRS);
+
+        Tree n = ourRoot.getTree("/x");
+        assertNull(n);
+    }
+
+    @Test
+    public void testDeleteChangedNodeTheirs() throws CommitFailedException {
+        theirRoot.getTree("/x").setProperty("p", theirValue);
+        ourRoot.getTree("/").removeChild("x");
+
+        theirRoot.commit(DefaultConflictHandler.THEIRS);
+        ourRoot.commit(DefaultConflictHandler.THEIRS);
+
+        Tree n = ourRoot.getTree("/x");
+        assertNotNull(n);
+        assertEquals(theirValue, n.getProperty("p").getValue());
+    }
+
+}



Mime
View raw message