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 ju...@apache.org on 2014/03/25 04:27:54 UTC
svn commit: r1581210 - in
/jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk:
MicroKernelImplTest.java store/DefaultRevisionStoreTest.java
Author: jukka
Date: Tue Mar 25 03:27:54 2014
New Revision: 1581210
URL: http://svn.apache.org/r1581210
Log:
OAK-1594: Build fails on Java 8
Fix broken test assumptions in oak-mk
Modified:
jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/MicroKernelImplTest.java
jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/store/DefaultRevisionStoreTest.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=1581210&r1=1581209&r2=1581210&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 Tue Mar 25 03:27:54 2014
@@ -259,9 +259,9 @@ public class MicroKernelImplTest {
String branchNode = mk.getNodes("/x/y", branch, 0, 0, -1, null);
assertTrue(branchNode.contains("\"p\":99"));
String conflict = mk.getNodes("/x/y/:conflict", branch, 100, 0, -1, null);
- assertEquals(
- "{\":childNodeCount\":1,\"addExistingProperty\":{\"q\":42,\"p\":42,\":childNodeCount\":0}}",
- conflict);
+ assertTrue(conflict,
+ conflict.equals("{\":childNodeCount\":1,\"addExistingProperty\":{\"q\":42,\"p\":42,\":childNodeCount\":0}}") ||
+ conflict.equals("{\":childNodeCount\":1,\"addExistingProperty\":{\"p\":42,\"q\":42,\":childNodeCount\":0}}"));
}
@Test
Modified: jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/store/DefaultRevisionStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/store/DefaultRevisionStoreTest.java?rev=1581210&r1=1581209&r2=1581210&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/store/DefaultRevisionStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/store/DefaultRevisionStoreTest.java Tue Mar 25 03:27:54 2014
@@ -88,7 +88,7 @@ public class DefaultRevisionStoreTest {
*/
@Test
public void testRevisionHistory() {
- mk.commit("/", "+\"a\" : { \"c\":{}, \"d\":{} }", mk.getHeadRevision(), null);
+ mk.commit("/", "+\"a\" : { \"c\":{ \"d\":{} }}", mk.getHeadRevision(), null);
mk.commit("/", "+\"b\" : {}", mk.getHeadRevision(), null);
mk.commit("/b", "+\"e\" : {}", mk.getHeadRevision(), null);
mk.commit("/a/c", "+\"f\" : {}", mk.getHeadRevision(), null);