jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1430907 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerTest.java
Date Wed, 09 Jan 2013 15:46:34 GMT
Author: mduerig
Date: Wed Jan  9 15:46:33 2013
New Revision: 1430907

URL: http://svn.apache.org/viewvc?rev=1430907&view=rev
Log:
fix test case

Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerTest.java?rev=1430907&r1=1430906&r2=1430907&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerTest.java
Wed Jan  9 15:46:33 2013
@@ -18,11 +18,6 @@
  */
 package org.apache.jackrabbit.oak.core;
 
-import static org.apache.jackrabbit.oak.api.Type.STRING;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
 import org.apache.jackrabbit.oak.Oak;
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.api.ContentSession;
@@ -34,6 +29,11 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.apache.jackrabbit.oak.api.Type.STRING;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
 public class DefaultConflictHandlerTest {
 
     private static final String OUR_VALUE = "foo";
@@ -241,9 +241,10 @@ public class DefaultConflictHandlerTest 
     @Test
     public void testDeleteChangedNodeTheirs() throws CommitFailedException {
         theirRoot.getTree("/x").setProperty("p", THEIR_VALUE);
-        ourRoot.getTree("/").remove();
+        ourRoot.getTree("/x").remove();
 
         theirRoot.commit();
+        ourRoot.setConflictHandler(DefaultConflictHandler.THEIRS);
         ourRoot.commit();
 
         Tree n = ourRoot.getTree("/x");



Mime
View raw message