Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
Reply-To: oak-dev@jackrabbit.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1470901 -
 /jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKBranchMergeTest.java
Date: Tue, 23 Apr 2013 11:38:08 -0000
To: oak-commits@jackrabbit.apache.org
From: mreutegg@apache.org
Message-Id: <20130423113808.1AE0623888E7@eris.apache.org>

Author: mreutegg
Date: Tue Apr 23 11:38:06 2013
New Revision: 1470901

URL: http://svn.apache.org/r1470901
Log:
OAK-619 Lock-free MongoMK implementation
- Enable more tests

Modified:
    jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKBranchMergeTest.java

Modified: jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKBranchMergeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKBranchMergeTest.java?rev=1470901&r1=1470900&r2=1470901&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKBranchMergeTest.java (original)
+++ jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/MongoMKBranchMergeTest.java Tue Apr 23 11:38:06 2013
@@ -25,8 +25,6 @@ import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 /**
@@ -302,14 +300,13 @@ public class MongoMKBranchMergeTest exte
     }
 
     @Test
-    @Ignore
     public void addExistingRootInBranch() {
         addNodes(null, "/root");
         assertNodesExist(null, "/root");
 
         String branchRev = mk.branch(null);
         try {
-            branchRev = addNodes(branchRev, "/root");
+            addNodes(branchRev, "/root");
             fail("Should not be able to add the same root node twice");
         } catch (Exception expected) {
             // expected
@@ -317,7 +314,6 @@ public class MongoMKBranchMergeTest exte
     }
 
     @Test
-    @Ignore
     public void addExistingChildInBranch() {
         addNodes(null, "/root", "/root/child1");
         assertNodesExist(null, "/root", "/root/child1");
@@ -327,7 +323,7 @@ public class MongoMKBranchMergeTest exte
         assertNodesExist(branchRev, "/root/child1", "/root/child2");
 
         try {
-            branchRev = addNodes(branchRev, "/root/child1");
+            addNodes(branchRev, "/root/child1");
             fail("Should not be able to add the same root node twice");
         } catch (Exception expected) {
             // expected
@@ -335,22 +331,6 @@ public class MongoMKBranchMergeTest exte
     }
 
     @Test
-    @Ignore("Implementation specific behavior")
-    public void emptyMergeCausesNoChange() {
-        String rev1 = mk.commit("", "+\"/child1\":{}", null, "");
-
-        String branchRev = mk.branch(null);
-        branchRev = mk.commit("", "+\"/child2\":{}", branchRev, "");
-        branchRev = mk.commit("", "-\"/child2\"", branchRev, "");
-
-        String rev2 = mk.merge(branchRev, "");
-
-        assertTrue(mk.nodeExists("/child1", null));
-        assertFalse(mk.nodeExists("/child2", null));
-        assertEquals(rev1, rev2);
-    }
-
-    @Test
     public void trunkMergeNotAllowed() {
         String rev = mk.commit("", "+\"/child1\":{}", null, "");
         try {