Author: mduerig
Date: Mon Jun 30 11:58:56 2014
New Revision: 1606701
URL: http://svn.apache.org/r1606701
Log:
OAK-1928: Cleanup test and execution fixtures
- Remove duplicate fixture from scalability and benchmark runner
- Run tests against DocumentMK
Modified:
jackrabbit/oak/trunk/oak-core/pom.xml
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreCacheTest.java
jackrabbit/oak/trunk/oak-jcr/pom.xml
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/SameNamePropertyNodeTest.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java
Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1606701&r1=1606700&r2=1606701&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Mon Jun 30 11:58:56 2014
@@ -332,12 +332,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-mk</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2.version}</version>
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreCacheTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreCacheTest.java?rev=1606701&r1=1606700&r2=1606701&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreCacheTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreCacheTest.java
Mon Jun 30 11:58:56 2014
@@ -27,7 +27,7 @@ import javax.annotation.Nonnull;
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.plugins.document.DocumentMK.Builder;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
@@ -52,7 +52,7 @@ public class KernelNodeStoreCacheTest ex
@Before
public void setUp() throws Exception {
- wrapper = new MicroKernelWrapper(new MicroKernelImpl());
+ wrapper = new MicroKernelWrapper(new Builder().open());
store = new KernelNodeStore(wrapper);
NodeBuilder builder = store.getRoot().builder();
Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1606701&r1=1606700&r2=1606701&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Mon Jun 30 11:58:56 2014
@@ -337,12 +337,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-mk</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/SameNamePropertyNodeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/SameNamePropertyNodeTest.java?rev=1606701&r1=1606700&r2=1606701&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/SameNamePropertyNodeTest.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/SameNamePropertyNodeTest.java
Mon Jun 30 11:58:56 2014
@@ -22,8 +22,6 @@ import javax.jcr.Property;
import javax.jcr.Repository;
import org.apache.jackrabbit.api.JackrabbitRepository;
-import org.apache.jackrabbit.mk.core.MicroKernelImpl;
-import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.test.AbstractJCRTest;
import org.apache.jackrabbit.test.NotExecutableException;
@@ -118,7 +116,7 @@ public class SameNamePropertyNodeTest ex
*/
@Test
public void testMicroKernelSupport() throws Exception {
- NodeStore nodeStore = new KernelNodeStore(new MicroKernelImpl());
+ NodeStore nodeStore = NodeStoreFixture.DOCUMENT_MK.createNodeStore();
JackrabbitRepository repository = (JackrabbitRepository) new
Jcr(nodeStore).createRepository();
try {
assertFalse(repository.getDescriptorValue(Repository.OPTION_NODE_AND_PROPERTY_WITH_SAME_NAME_SUPPORTED).getBoolean());
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java?rev=1606701&r1=1606700&r2=1606701&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
Mon Jun 30 11:58:56 2014
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.oak.benchmark;
+import static java.util.Arrays.asList;
+
import java.io.File;
import java.io.PrintStream;
import java.util.ArrayList;
@@ -26,19 +28,15 @@ import java.util.Set;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-
import joptsimple.OptionParser;
import joptsimple.OptionSet;
import joptsimple.OptionSpec;
-
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.benchmark.wikipedia.WikipediaImport;
import org.apache.jackrabbit.oak.fixture.JackrabbitRepositoryFixture;
import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture;
import org.apache.jackrabbit.oak.fixture.RepositoryFixture;
-import static java.util.Arrays.asList;
-
public class BenchmarkRunner {
private static final int MB = 1024 * 1024;
@@ -111,7 +109,6 @@ public class BenchmarkRunner {
int cacheSize = cache.value(options);
RepositoryFixture[] allFixtures = new RepositoryFixture[] {
new JackrabbitRepositoryFixture(base.value(options),
cacheSize),
- OakRepositoryFixture.getMemory(cacheSize * MB),
OakRepositoryFixture.getMemoryNS(cacheSize * MB),
OakRepositoryFixture.getMemoryMK(cacheSize * MB),
OakRepositoryFixture.getH2MK(base.value(options), cacheSize *
MB),
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java?rev=1606701&r1=1606700&r2=1606701&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
Mon Jun 30 11:58:56 2014
@@ -25,10 +25,6 @@ import org.apache.jackrabbit.oak.jcr.Jcr
public class OakRepositoryFixture implements RepositoryFixture {
- public static RepositoryFixture getMemory(long cacheSize) {
- return getMemory(OakFixture.OAK_MEMORY, false, cacheSize);
- }
-
public static RepositoryFixture getMemoryNS(long cacheSize) {
return getMemory(OakFixture.OAK_MEMORY_NS, false, cacheSize);
}
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java?rev=1606701&r1=1606700&r2=1606701&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java
(original)
+++
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/scalability/ScalabilityRunner.java
Mon Jun 30 11:58:56 2014
@@ -18,16 +18,21 @@
*/
package org.apache.jackrabbit.oak.scalability;
+import static java.util.Arrays.asList;
+
import java.io.File;
import java.io.PrintStream;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
import joptsimple.OptionSpec;
-
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.benchmark.CSVResultGenerator;
import org.apache.jackrabbit.oak.benchmark.util.Date;
@@ -35,13 +40,6 @@ import org.apache.jackrabbit.oak.fixture
import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture;
import org.apache.jackrabbit.oak.fixture.RepositoryFixture;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-
-import static java.util.Arrays.asList;
-
/**
* Main class for running scalability/longevity tests.
*
@@ -94,7 +92,6 @@ public class ScalabilityRunner {
int cacheSize = cache.value(options);
RepositoryFixture[] allFixtures = new RepositoryFixture[] {
new JackrabbitRepositoryFixture(base.value(options),
cacheSize),
- OakRepositoryFixture.getMemory(cacheSize * MB),
OakRepositoryFixture.getMemoryNS(cacheSize * MB),
OakRepositoryFixture.getMemoryMK(cacheSize * MB),
OakRepositoryFixture.getH2MK(base.value(options), cacheSize *
MB),
