svn commit: r1844625 - /jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java

[mr...@apache.org]

Author: mreutegg
Date: Tue Oct 23 08:52:47 2018
New Revision: 1844625

URL: http://svn.apache.org/viewvc?rev=1844625&view=rev
Log:
OAK-7855: Invalid SplitDocType

Add ignored test

Modified:
    jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java

Modified: jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java?rev=1844625&r1=1844624&r2=1844625&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreSchemaUpgradeTest.java Tue Oct 23 08:52:47 2018
@@ -40,6 +40,7 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore.RDBTableMetaData;
 import org.apache.jackrabbit.oak.plugins.document.util.Utils;
 import org.junit.Assume;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -258,6 +259,45 @@ public class RDBDocumentStoreSchemaUpgra
             logCustomizer.finished();
             if (rdb != null) {
                 rdb.dispose();
+            }
+        }
+    }
+
+    @Ignore("OAK-7855")
+    @Test
+    public void init12fail() {
+        LogCustomizer logCustomizer = LogCustomizer.forLogger(RDBDocumentStore.class.getName()).enable(Level.INFO)
+                .contains("Attempted to upgrade").create();
+        logCustomizer.starting();
+
+        Assume.assumeTrue(ds instanceof RDBDataSourceWrapper);
+        RDBDataSourceWrapper wds = (RDBDataSourceWrapper)ds;
+        wds.setFailAlterTableAddColumnStatements(true);
+
+        RDBOptions op = new RDBOptions().tablePrefix("T12F").initialSchema(1).upgradeToSchema(2).dropTablesOnClose(true);
+        RDBDocumentStore rdb = null;
+        try {
+            rdb = new RDBDocumentStore(this.ds, new DocumentMK.Builder(), op);
+            RDBTableMetaData meta = rdb.getTable(Collection.NODES);
+            assertEquals(op.getTablePrefix() + "_NODES", meta.getName());
+            assertTrue(meta.hasVersion());
+            assertEquals("unexpected # of log entries: " + logCustomizer.getLogs(), RDBDocumentStore.getTableNames().size() * 4,
+                    logCustomizer.getLogs().size());
+            String id = Utils.getIdFromPath("/foo");
+            UpdateOp testInsert = new UpdateOp(id, true);
+            assertTrue(rdb.create(Collection.NODES, Collections.singletonList(testInsert)));
+            UpdateOp testUpdate = new UpdateOp(id, false);
+            testUpdate.set("p", 42);
+            assertNotNull(rdb.findAndUpdate(Collection.NODES, testUpdate));
+            rdb.getNodeDocumentCache().invalidate(id);
+            NodeDocument doc = rdb.find(Collection.NODES, id);
+            assertNotNull(doc);
+            assertEquals(SplitDocType.NONE, doc.getSplitDocType());
+        } finally {
+            wds.setFailAlterTableAddColumnStatements(false);
+            logCustomizer.finished();
+            if (rdb != null) {
+                rdb.dispose();
             }
         }
     }