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 mr...@apache.org on 2016/01/18 10:01:17 UTC

svn commit: r1725193 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKResetTest.java

Author: mreutegg
Date: Mon Jan 18 09:01:17 2016
New Revision: 1725193

URL: http://svn.apache.org/viewvc?rev=1725193&view=rev
Log:
OAK-98 Source code formatting, code conventions, Javadocs

Enable test

Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKResetTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKResetTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKResetTest.java?rev=1725193&r1=1725192&r2=1725193&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKResetTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKResetTest.java Mon Jan 18 09:01:17 2016
@@ -16,7 +16,6 @@
  */
 package org.apache.jackrabbit.oak.plugins.document;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
@@ -103,7 +102,6 @@ public class DocumentMKResetTest extends
         assertNodesNotExist(rev, "/foo", "/bar");
     }
 
-    @Ignore
     @Test
     public void resetConflictAddExistingProperty() {
         addNodes(null, "/foo");