You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by md...@apache.org on 2011/11/25 15:46:33 UTC
svn commit: r1206198 -
/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/MicrokernelTest.java
Author: mduerig
Date: Fri Nov 25 14:46:32 2011
New Revision: 1206198
URL: http://svn.apache.org/viewvc?rev=1206198&view=rev
Log:
Microkernel based Jackrabbit prototype (WIP)
- un-ignore tests which work with latest microkernel
Modified:
jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/MicrokernelTest.java
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/MicrokernelTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/MicrokernelTest.java?rev=1206198&r1=1206197&r2=1206198&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/MicrokernelTest.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/MicrokernelTest.java Fri Nov 25 14:46:32 2011
@@ -191,8 +191,6 @@ public class MicrokernelTest {
}
@Test
- @Ignore
- // todo fix microkernel
public void conflictingMove() {
MicroKernel mk = getMicroKernel();
String head = mk.getHeadRevision();
@@ -204,16 +202,15 @@ public class MicrokernelTest {
assertTrue(mk.nodeExists("/b", r1));
assertTrue(mk.nodeExists("/b/a", r1));
- String r2 = mk.commit("/", ">\"b\" : \"a/b\"", head, "");
- // todo not really sure what the result should be. Currently this throws a NPE...
-// assertFalse(mk.nodeExists("/b", r2));
-// assertTrue(mk.nodeExists("/a", r2));
-// assertTrue(mk.nodeExists("/a/b", r2));
+ try {
+ mk.commit("/", ">\"b\" : \"a/b\"", head, "");
+ }
+ catch (MicroKernelException e) {
+ // expected
+ }
}
@Test
- @Ignore
- // todo fix microkernel
public void conflictingAddDelete() {
MicroKernel mk = getMicroKernel();
String head = mk.getHeadRevision();
@@ -225,11 +222,12 @@ public class MicrokernelTest {
assertTrue(mk.nodeExists("/a", r1));
assertTrue(mk.nodeExists("/a/x", r1));
- String r2 = mk.commit("/", "-\"a\" \r +\"b/x\" : {}", head, "");
- // todo not really sure what the result should be. Currently this throws a NPE...
-// assertFalse(mk.nodeExists("/a", r2));
-// assertTrue(mk.nodeExists("/b", r2));
-// assertTrue(mk.nodeExists("/b/x", r2));
+ try {
+ mk.commit("/", "-\"a\" \r +\"b/x\" : {}", head, "");
+ }
+ catch (MicroKernelException e) {
+ // expected
+ }
}
@Test