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 st...@apache.org on 2013/09/02 11:06:23 UTC
svn commit: r1519368 - in /jackrabbit/oak/trunk:
oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java
oak-mk/src/test/java/org/apache/jackrabbit/mk/MicroKernelImplTest.java
Author: stefan
Date: Mon Sep 2 09:06:23 2013
New Revision: 1519368
URL: http://svn.apache.org/r1519368
Log:
OAK-979: MicroKernel.diff() returns incomplete JSON when moves are involved (H2)
Modified:
jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java
jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/MicroKernelImplTest.java
Modified: jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java?rev=1519368&r1=1519367&r2=1519368&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java (original)
+++ jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java Mon Sep 2 09:06:23 2013
@@ -296,6 +296,15 @@ public class MicroKernelIT extends Abstr
}
@Test
+ 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);
+ assertTrue(diff.contains("c"));
+ assertTrue(diff.contains("d"));
+ }
+
+ @Test
public void snapshotIsolation() {
final int NUM_COMMITS = 100;
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=1519368&r1=1519367&r2=1519368&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 Mon Sep 2 09:06:23 2013
@@ -51,16 +51,6 @@ public class MicroKernelImplTest {
}
}
- @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);
- assertTrue(diff.contains("c"));
- assertTrue(diff.contains("d"));
- }
-
/**
* OAK-276: potential clash of commit id's after restart.
*/