jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1349880 - in /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core: ConflictHandlerTest.java DefaultConflictHandlerTest.java
Date Wed, 13 Jun 2012 14:41:05 GMT
Author: mduerig
Date: Wed Jun 13 14:41:05 2012
New Revision: 1349880

URL: http://svn.apache.org/viewvc?rev=1349880&view=rev
Log:
OAK-133: Session.refresh(true) should allow for manual conflict reconciliation
rename test case to better match classes under test

Added:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerTest.java
      - copied, changed from r1349877, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ConflictHandlerTest.java
Removed:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ConflictHandlerTest.java

Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerTest.java
(from r1349877, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ConflictHandlerTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ConflictHandlerTest.java&r1=1349877&r2=1349880&rev=1349880&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ConflictHandlerTest.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultConflictHandlerTest.java
Wed Jun 13 14:41:05 2012
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
-public class ConflictHandlerTest extends AbstractOakTest {
+public class DefaultConflictHandlerTest extends AbstractOakTest {
     private Root ourRoot;
     private Root theirRoot;
     private CoreValue ourValue;



Mime
View raw message