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 md...@apache.org on 2014/05/21 16:46:29 UTC
svn commit: r1596589 - in /jackrabbit/oak/trunk:
oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/
oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/
oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/c...
Author: mduerig
Date: Wed May 21 14:46:28 2014
New Revision: 1596589
URL: http://svn.apache.org/r1596589
Log:
OAK-1847: Use SegmentMK for testing where possible
Modified:
jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/ClientServerFixture.java
jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/RandomizedTest.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/FixedNodeStateConfigurationTest.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/UpToDateNodeStateConfigurationTest.java
jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/AbstractRepositoryUpgradeTest.java
Modified: jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/ClientServerFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/ClientServerFixture.java?rev=1596589&r1=1596588&r2=1596589&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/ClientServerFixture.java (original)
+++ jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/ClientServerFixture.java Wed May 21 14:46:28 2014
@@ -20,12 +20,11 @@ import java.net.InetSocketAddress;
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.mk.client.Client;
-import org.apache.jackrabbit.mk.core.MicroKernelImpl;
import org.apache.jackrabbit.mk.server.Server;
+import org.apache.jackrabbit.oak.kernel.NodeStoreKernel;
+import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
public class ClientServerFixture implements MicroKernelFixture {
-
- private MicroKernelImpl mk;
private Server server;
@Override
@@ -35,8 +34,7 @@ public class ClientServerFixture impleme
@Override
public void setUpCluster(MicroKernel[] cluster) throws Exception {
- mk = new MicroKernelImpl();
- server = new Server(mk);
+ server = new Server(new NodeStoreKernel(new SegmentNodeStore()));
server.start();
InetSocketAddress address = server.getAddress();
@@ -53,6 +51,5 @@ public class ClientServerFixture impleme
@Override
public void tearDownCluster(MicroKernel[] cluster) {
server.stop();
- mk.dispose();
}
}
Modified: jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/RandomizedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/RandomizedTest.java?rev=1596589&r1=1596588&r2=1596589&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/RandomizedTest.java (original)
+++ jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/RandomizedTest.java Wed May 21 14:46:28 2014
@@ -24,16 +24,18 @@ import static org.junit.Assert.fail;
import java.util.HashMap;
import java.util.Random;
+import com.mongodb.DB;
+import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.mk.api.MicroKernelException;
-import org.apache.jackrabbit.mk.core.MicroKernelImpl;
import org.apache.jackrabbit.oak.commons.json.JsonObject;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
+import org.apache.jackrabbit.oak.kernel.NodeStoreKernel;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
+import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
+import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.junit.Test;
-import com.mongodb.DB;
-
/**
* A simple randomized single-instance test.
*/
@@ -41,9 +43,10 @@ public class RandomizedTest {
private static final boolean MONGO_DB = false;
// private static final boolean MONGO_DB = true;
-
- private DocumentMK mk;
- private MicroKernelImpl mkGold;
+
+ private DocumentNodeStore ns;
+ private MicroKernel mk;
+ private MicroKernel mkGold;
private String commitRev;
private String commitRevGold;
@@ -61,8 +64,9 @@ public class RandomizedTest {
}
private void addRemoveSetMoveCopy(boolean branchMerge) throws Exception {
- mk = createMK();
- mkGold = new MicroKernelImpl();
+ ns = createNodeStore();
+ mk = new NodeStoreKernel(ns);
+ mkGold = new NodeStoreKernel(new SegmentNodeStore());
HashMap<Integer, String> revsGold = new HashMap<Integer, String>();
HashMap<Integer, String> revs = new HashMap<Integer, String>();
Random r = new Random(1);
@@ -173,8 +177,7 @@ public class RandomizedTest {
} catch (Exception e) {
throw new Exception("log: " + log, e);
}
- mk.dispose();
- mkGold.dispose();
+ ns.dispose();
// System.out.println(log);
// System.out.println();
}
@@ -237,14 +240,14 @@ public class RandomizedTest {
return ok;
}
- private static DocumentMK createMK() {
+ private static DocumentNodeStore createNodeStore() {
DocumentMK.Builder builder = new DocumentMK.Builder();
if (MONGO_DB) {
DB db = MongoUtils.getConnection().getDB();
MongoUtils.dropCollections(db);
builder.setMongoDB(db);
}
- return builder.open();
+ return builder.getNodeStore();
}
}
Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java?rev=1596589&r1=1596588&r2=1596589&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/SolrBaseTest.java Wed May 21 14:46:28 2014
@@ -19,20 +19,19 @@ package org.apache.jackrabbit.oak.plugin
import javax.jcr.NoSuchWorkspaceException;
import javax.security.auth.login.LoginException;
-import org.apache.jackrabbit.mk.api.MicroKernel;
-import org.apache.jackrabbit.mk.core.MicroKernelImpl;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.api.Root;
-import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
import org.apache.jackrabbit.oak.plugins.index.IndexUpdateProvider;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration;
import org.apache.jackrabbit.oak.plugins.index.solr.index.SolrIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.solr.query.SolrQueryIndexProvider;
import org.apache.jackrabbit.oak.plugins.index.solr.util.SolrIndexInitializer;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
+import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.spi.commit.EditorHook;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
+import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.solr.client.solrj.SolrServer;
import org.junit.After;
import org.junit.Before;
@@ -42,7 +41,7 @@ import org.junit.Before;
*/
public abstract class SolrBaseTest {
- protected KernelNodeStore store;
+ protected NodeStore store;
protected TestUtils provider;
protected SolrServer server;
protected OakSolrConfiguration configuration;
@@ -51,8 +50,7 @@ public abstract class SolrBaseTest {
@Before
public void setUp() throws Exception {
- MicroKernel microKernel = new MicroKernelImpl();
- store = new KernelNodeStore(microKernel);
+ store = new SegmentNodeStore();
provider = new TestUtils();
server = provider.getSolrServer();
configuration = provider.getConfiguration();
Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/FixedNodeStateConfigurationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/FixedNodeStateConfigurationTest.java?rev=1596589&r1=1596588&r2=1596589&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/FixedNodeStateConfigurationTest.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/FixedNodeStateConfigurationTest.java Wed May 21 14:46:28 2014
@@ -16,18 +16,19 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.configuration;
-import org.apache.jackrabbit.mk.api.MicroKernel;
-import org.apache.jackrabbit.mk.core.MicroKernelImpl;
-import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
+import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
+import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
/**
* Testcase for {@link org.apache.jackrabbit.oak.plugins.index.solr.configuration.FixedNodeStateConfiguration}
*/
@@ -37,11 +38,22 @@ public class FixedNodeStateConfiguration
@Before
public void setUp() throws Exception {
- MicroKernel microKernel = new MicroKernelImpl();
- String jsop = "^\"a\":1 ^\"b\":2 ^\"c\":3 +\"x\":{} +\"y\":{} +\"z\":{} " +
- "+\"oak:index\":{\"solrIdx\":{\"coreName\":\"cn\", \"solrHomePath\":\"sh\", \"solrConfigPath\":\"sc\"}} ";
- microKernel.commit("/", jsop, microKernel.getHeadRevision(), "test data");
- store = new KernelNodeStore(microKernel);
+ store = new SegmentNodeStore();
+ NodeBuilder builder = store.getRoot().builder();
+ builder.setProperty("a", 1)
+ .setProperty("b", 2)
+ .setProperty("c", 3);
+
+ builder.setChildNode("x");
+ builder.setChildNode("y");
+ builder.setChildNode("z");
+
+ builder.setChildNode("oak:index").setChildNode("solrIdx")
+ .setProperty("coreName", "cn")
+ .setProperty("solrHomePath", "sh")
+ .setProperty("solrConfigPath", "sc");
+
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
}
@Test
Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/UpToDateNodeStateConfigurationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/UpToDateNodeStateConfigurationTest.java?rev=1596589&r1=1596588&r2=1596589&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/UpToDateNodeStateConfigurationTest.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/UpToDateNodeStateConfigurationTest.java Wed May 21 14:46:28 2014
@@ -16,17 +16,18 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.configuration;
-import org.apache.jackrabbit.mk.api.MicroKernel;
-import org.apache.jackrabbit.mk.core.MicroKernelImpl;
-import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
-import org.apache.jackrabbit.oak.spi.state.NodeStore;
-import org.junit.Before;
-import org.junit.Test;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
+import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.junit.Before;
+import org.junit.Test;
+
/**
* Testcase for {@link org.apache.jackrabbit.oak.plugins.index.solr.configuration.UpToDateNodeStateConfiguration}
*/
@@ -36,11 +37,22 @@ public class UpToDateNodeStateConfigurat
@Before
public void setUp() throws Exception {
- MicroKernel microKernel = new MicroKernelImpl();
- String jsop = "^\"a\":1 ^\"b\":2 ^\"c\":3 +\"x\":{} +\"y\":{} +\"z\":{} " +
- "+\"oak:index\":{\"solrIdx\":{\"coreName\":\"cn\", \"solrHomePath\":\"sh\", \"solrConfigPath\":\"sc\"}} ";
- microKernel.commit("/", jsop, microKernel.getHeadRevision(), "test data");
- store = new KernelNodeStore(microKernel);
+ store = new SegmentNodeStore();
+ NodeBuilder builder = store.getRoot().builder();
+ builder.setProperty("a", 1)
+ .setProperty("b", 2)
+ .setProperty("c", 3);
+
+ builder.setChildNode("x");
+ builder.setChildNode("y");
+ builder.setChildNode("z");
+
+ builder.setChildNode("oak:index").setChildNode("solrIdx")
+ .setProperty("coreName", "cn")
+ .setProperty("solrHomePath", "sh")
+ .setProperty("solrConfigPath", "sc");
+
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
}
@Test
Modified: jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/AbstractRepositoryUpgradeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/AbstractRepositoryUpgradeTest.java?rev=1596589&r1=1596588&r2=1596589&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/AbstractRepositoryUpgradeTest.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/AbstractRepositoryUpgradeTest.java Wed May 21 14:46:28 2014
@@ -25,7 +25,6 @@ import java.io.OutputStream;
import javax.jcr.Credentials;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
-import javax.jcr.Session;
import javax.jcr.SimpleCredentials;
import org.apache.commons.io.FileUtils;
@@ -33,10 +32,9 @@ import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.core.RepositoryImpl;
import org.apache.jackrabbit.core.config.RepositoryConfig;
-import org.apache.jackrabbit.mk.core.MicroKernelImpl;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.jcr.Jcr;
-import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
+import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.stats.Clock;
import org.junit.Before;
@@ -81,7 +79,7 @@ public abstract class AbstractRepository
} finally {
repository.shutdown();
}
- NodeStore target = new KernelNodeStore(new MicroKernelImpl());
+ NodeStore target = new SegmentNodeStore();
RepositoryUpgrade.copy(source, target);
targetRepository = new Jcr(new Oak(target)).createRepository();
}