You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by st...@apache.org on 2011/12/15 11:09:11 UTC
svn commit: r1214681 -
/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java
Author: stefan
Date: Thu Dec 15 10:09:11 2011
New Revision: 1214681
URL: http://svn.apache.org/viewvc?rev=1214681&view=rev
Log:
c&p error: replace \r with \n
Modified:
jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java
Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java?rev=1214681&r1=1214680&r2=1214681&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java (original)
+++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/api/MicroKernelTest.java Thu Dec 15 10:09:11 2011
@@ -105,7 +105,7 @@ public class MicroKernelTest extends Mul
long millis = System.currentTimeMillis();
String node1 = "n1_" + millis;
String node2 = "n2_" + millis;
- head = mk.commit("/", "+\"" + node1 + "\" : {} \r+\"" + node2 + "\" : {}\n", head, "");
+ head = mk.commit("/", "+\"" + node1 + "\" : {} \n+\"" + node2 + "\" : {}\n", head, "");
assertTrue(mk.nodeExists('/' + node1, head));
assertTrue(mk.nodeExists('/' + node2, head));
}
@@ -115,10 +115,10 @@ public class MicroKernelTest extends Mul
String head = mk.getHeadRevision();
head = mk.commit("/",
- "+\"a\" : {} \r" +
- "+\"a/b\" : {} \r" +
- "+\"a/b/c\" : {} \r" +
- "+\"a/b/c/d\" : {} \r",
+ "+\"a\" : {} \n" +
+ "+\"a/b\" : {} \n" +
+ "+\"a/b/c\" : {} \n" +
+ "+\"a/b/c/d\" : {} \n",
head, "");
assertTrue(mk.nodeExists("/a", head));
@@ -138,12 +138,12 @@ public class MicroKernelTest extends Mul
String node = "n_" + System.currentTimeMillis();
head = mk.commit("/",
- "+\"" + node + "\" : {} \r" +
- "+\"" + node + "/child1\" : {} \r" +
- "+\"" + node + "/child2\" : {} \r" +
- "+\"" + node + "/child1/grandchild11\" : {} \r" +
- "^\"" + node + "/prop1\" : 41\r" +
- "^\"" + node + "/child1/prop2\" : 42\r" +
+ "+\"" + node + "\" : {} \n" +
+ "+\"" + node + "/child1\" : {} \n" +
+ "+\"" + node + "/child2\" : {} \n" +
+ "+\"" + node + "/child1/grandchild11\" : {} \n" +
+ "^\"" + node + "/prop1\" : 41\n" +
+ "^\"" + node + "/child1/prop2\" : 42\n" +
"^\"" + node + "/child1/grandchild11/prop3\" : 43",
head, "");
@@ -182,7 +182,7 @@ public class MicroKernelTest extends Mul
public void overwritingMove() {
String head = mk.getHeadRevision();
- head = mk.commit("/", "+\"a\" : {} \r+\"b\" : {} \r", head, "");
+ head = mk.commit("/", "+\"a\" : {} \n+\"b\" : {} \n", head, "");
try {
mk.commit("/", ">\"a\" : \"b\" ", head, "");
}
@@ -195,7 +195,7 @@ public class MicroKernelTest extends Mul
public void conflictingMove() {
String head = mk.getHeadRevision();
- head = mk.commit("/", "+\"a\" : {} \r+\"b\" : {}\n", head, "");
+ head = mk.commit("/", "+\"a\" : {} \n+\"b\" : {}\n", head, "");
String r1 = mk.commit("/", ">\"a\" : \"b/a\"", head, "");
assertFalse(mk.nodeExists("/a", r1));
@@ -214,15 +214,15 @@ public class MicroKernelTest extends Mul
public void conflictingAddDelete() {
String head = mk.getHeadRevision();
- head = mk.commit("/", "+\"a\" : {} \r+\"b\" : {}\n", head, "");
+ head = mk.commit("/", "+\"a\" : {} \n+\"b\" : {}\n", head, "");
- String r1 = mk.commit("/", "-\"b\" \r +\"a/x\" : {}", head, "");
+ String r1 = mk.commit("/", "-\"b\" \n +\"a/x\" : {}", head, "");
assertFalse(mk.nodeExists("/b", r1));
assertTrue(mk.nodeExists("/a", r1));
assertTrue(mk.nodeExists("/a/x", r1));
try {
- mk.commit("/", "-\"a\" \r +\"b/x\" : {}", head, "");
+ mk.commit("/", "-\"a\" \n +\"b/x\" : {}", head, "");
}
catch (MicroKernelException e) {
// expected