Author: tomekr
Date: Mon Aug 29 16:10:07 2016
New Revision: 1758253
URL: http://svn.apache.org/viewvc?rev=1758253&view=rev
Log:
OAK-4718: Tests in oak-upgrade depend on an archived repository
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/resources/segmentstore.zip
Modified:
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java?rev=1758253&r1=1758252&r2=1758253&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java
(original)
+++
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java
Mon Aug 29 16:10:07 2016
@@ -54,6 +54,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.upgrade.RepositorySidegrade;
import org.apache.jackrabbit.oak.upgrade.cli.container.NodeStoreContainer;
+import
org.apache.jackrabbit.oak.upgrade.cli.container.SegmentNodeStoreContainer;
import
org.apache.jackrabbit.oak.upgrade.cli.container.SegmentTarNodeStoreContainer;
import org.junit.After;
import org.junit.Before;
@@ -68,7 +69,7 @@ public abstract class AbstractOak2OakTes
private static final Logger log =
LoggerFactory.getLogger(AbstractOak2OakTest.class);
- protected static SegmentTarNodeStoreContainer testContent;
+ protected static SegmentNodeStoreContainer testContent;
private NodeStore destination;
@@ -90,7 +91,7 @@ public abstract class AbstractOak2OakTes
if (!tempDir.isDirectory()) {
Util.unzip(AbstractOak2OakTest.class.getResourceAsStream("/segmentstore.zip"),
tempDir);
}
- testContent = new SegmentTarNodeStoreContainer(tempDir);
+ testContent = new SegmentNodeStoreContainer(tempDir);
}
@Before
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/resources/segmentstore.zip
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/resources/segmentstore.zip?rev=1758253&r1=1758252&r2=1758253&view=diff
==============================================================================
Binary files - no diff available.
