svn commit: r1747557 - /jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/MissingBlobStoreTest.java

[al...@apache.org]

Author: alexparvulescu
Date: Thu Jun  9 14:33:00 2016
New Revision: 1747557

URL: http://svn.apache.org/viewvc?rev=1747557&view=rev
Log:
OAK-4447 RepositorySidegrade: oak-segment to oak-segment-tar migrate without external datastore
 - skip mongo tests if mongo is not available

Modified:
    jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/MissingBlobStoreTest.java

Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/MissingBlobStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/MissingBlobStoreTest.java?rev=1747557&r1=1747556&r2=1747557&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/MissingBlobStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/MissingBlobStoreTest.java Thu Jun  9 14:33:00 2016
@@ -16,6 +16,13 @@
  */
 package org.apache.jackrabbit.oak.upgrade.cli.blob;
 
+import static org.apache.jackrabbit.oak.upgrade.cli.container.MongoNodeStoreContainer.isMongoAvailable;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 import org.apache.jackrabbit.oak.upgrade.cli.AbstractOak2OakTest;
 import org.apache.jackrabbit.oak.upgrade.cli.container.BlobStoreContainer;
 import org.apache.jackrabbit.oak.upgrade.cli.container.FileDataStoreContainer;
@@ -28,11 +35,6 @@ import org.junit.runners.Parameterized;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 @RunWith(Parameterized.class)
 public class MissingBlobStoreTest extends AbstractOak2OakTest {
 
@@ -49,10 +51,20 @@ public class MissingBlobStoreTest extend
         params.add(new Object[] { "SegmentTar -> Segment (FDS)", new SegmentTarNodeStoreContainer(blob), new SegmentNodeStoreContainer(blob), true });
         params.add(new Object[] { "SegmentTar -> SegmentTar (FDS)", new SegmentTarNodeStoreContainer(blob), new SegmentTarNodeStoreContainer(blob), true });
         try {
-            params.add(new Object[] { "Mongo -> Mongo (FDS)", new MongoNodeStoreContainer(blob), new MongoNodeStoreContainer(blob), false });
-            // params.add(new Object[] { "Segment -> Mongo (FDS)", new SegmentNodeStoreContainer(blob), new MongoNodeStoreContainer(blob), false });
-            // params.add(new Object[] { "SegmentTar -> Mongo (FDS)", new SegmentTarNodeStoreContainer(blob), new MongoNodeStoreContainer(blob), false });
-            params.add(new Object[] { "Mongo -> Segment (FDS)", new MongoNodeStoreContainer(blob), new SegmentNodeStoreContainer(blob), false });
+            if (isMongoAvailable()) {
+                params.add(new Object[] { "Mongo -> Mongo (FDS)",
+                        new MongoNodeStoreContainer(blob),
+                        new MongoNodeStoreContainer(blob), false });
+                // params.add(new Object[] { "Segment -> Mongo (FDS)", new
+                // SegmentNodeStoreContainer(blob), new
+                // MongoNodeStoreContainer(blob), false });
+                // params.add(new Object[] { "SegmentTar -> Mongo (FDS)", new
+                // SegmentTarNodeStoreContainer(blob), new
+                // MongoNodeStoreContainer(blob), false });
+                params.add(new Object[] { "Mongo -> Segment (FDS)",
+                        new MongoNodeStoreContainer(blob),
+                        new SegmentNodeStoreContainer(blob), false });
+            }
         } catch (IOException e) {
             log.error("Can't create Mongo -> Mongo case", e);
         }