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 2017/02/20 09:59:16 UTC

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

Author: mreutegg
Date: Mon Feb 20 09:59:16 2017
New Revision: 1783733

URL: http://svn.apache.org/viewvc?rev=1783733&view=rev
Log:
OAK-5651: java.lang.IllegalStateException logged when migrating Segment to Document

Add ignored test

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

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalEntryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalEntryTest.java?rev=1783733&r1=1783732&r2=1783733&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalEntryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalEntryTest.java Mon Feb 20 09:59:16 2017
@@ -32,6 +32,7 @@ import org.apache.jackrabbit.oak.commons
 import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
 import org.apache.jackrabbit.oak.commons.sort.StringSort;
 import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.apache.jackrabbit.oak.plugins.document.Collection.JOURNAL;
@@ -356,6 +357,16 @@ public class JournalEntryTest {
         assertTrue("Incorrect hasChanges", entry.hasChanges());
     }
 
+    @Ignore("OAK-5651")
+    @Test
+    public void emptyBranchCommit() {
+        DocumentStore store = new MemoryDocumentStore();
+        JournalEntry entry = JOURNAL.newDocument(store);
+
+        entry.branchCommit(Collections.<Revision>emptyList());
+        assertFalse(entry.getBranchCommits().iterator().hasNext());
+    }
+
     private static void addRandomPaths(java.util.Collection<String> paths) throws IOException {
         paths.add("/");
         Random random = new Random(42);