jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1518105 - /jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/MicroKernelImplTest.java
Date Wed, 28 Aug 2013 08:45:58 GMT
Author: mduerig
Date: Wed Aug 28 08:45:58 2013
New Revision: 1518105

URL: http://svn.apache.org/r1518105
Log:
OAK-979: MicroKernel.diff() returns incomplete JSON when moves are involved (H2)
Test case (@Ignored)

Modified:
    jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/MicroKernelImplTest.java

Modified: jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/MicroKernelImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/MicroKernelImplTest.java?rev=1518105&r1=1518104&r2=1518105&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/MicroKernelImplTest.java
(original)
+++ jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/MicroKernelImplTest.java
Wed Aug 28 08:45:58 2013
@@ -16,19 +16,20 @@
  */
 package org.apache.jackrabbit.mk;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.jackrabbit.mk.core.MicroKernelImpl;
 import org.junit.After;
 import org.junit.Before;
+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.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 public class MicroKernelImplTest {
     
     private File homeDir;
@@ -49,6 +50,17 @@ public class MicroKernelImplTest {
             mk.dispose();
         }
     }
+
+    @Test
+    @Ignore("OAK-979")  // FIXME OAK-979
+    public void diffWithMove() {
+        String base = mk.commit("", "+\"/a\":{\"b\":{}}", mk.getHeadRevision(), null);
+        String head = mk.commit("", "+\"/a/c\":{}+\"/a/d\":{}-\"/a/b\"", base, null);
+        String diff = mk.diff(base, head, "/a", 0);
+        System.out.println(diff);
+        assertTrue(diff.contains("c"));
+        assertTrue(diff.contains("d"));
+    }
     
     /**
      * OAK-276: potential clash of commit id's after restart.



Mime
View raw message