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/12/17 15:33:39 UTC
svn commit: r1646266 -
/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/
Author: mduerig
Date: Wed Dec 17 14:33:38 2014
New Revision: 1646266
URL: http://svn.apache.org/r1646266
Log:
OAK-2365: Refactor node store tests
Refactor tests to use common functionality provided by OakBaseTest
Removed:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/AbstractKernelTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/LargeNodeStateTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeBuilderTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStateTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreCacheTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java?rev=1646266&r1=1646265&r2=1646266&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java Wed Dec 17 14:33:38 2014
@@ -23,43 +23,25 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.runners.Parameterized.Parameters;
-
-import java.util.Arrays;
-import java.util.Collection;
+import static org.junit.Assume.assumeTrue;
import com.google.common.collect.ImmutableMap;
import org.apache.jackrabbit.oak.NodeStoreFixture;
+import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(value = Parameterized.class)
-public class CheckpointTest {
-
- @Parameters
- public static Collection<Object[]> fixtures() {
- Object[][] fixtures = new Object[][] {
- {NodeStoreFixture.MONGO_NS},
- {NodeStoreFixture.SEGMENT_MK},
- {NodeStoreFixture.MEMORY_NS},
- };
- return Arrays.asList(fixtures);
- }
-
- private final NodeStoreFixture fixture;
+public class CheckpointTest extends OakBaseTest {
private NodeStore store;
-
private NodeState root;
public CheckpointTest(NodeStoreFixture fixture) {
- this.fixture = fixture;
+ super(fixture);
+ assumeTrue(fixture != NodeStoreFixture.MONGO_MK); // FIXME test fail on MONGO_MK fixture
}
@Before
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/LargeNodeStateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/LargeNodeStateTest.java?rev=1646266&r1=1646265&r2=1646266&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/LargeNodeStateTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/LargeNodeStateTest.java Wed Dec 17 14:33:38 2014
@@ -22,6 +22,8 @@ import static junit.framework.Assert.ass
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
+import org.apache.jackrabbit.oak.NodeStoreFixture;
+import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.kernel.KernelNodeState;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
@@ -30,16 +32,17 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-public class LargeNodeStateTest extends AbstractKernelTest {
-
+public class LargeNodeStateTest extends OakBaseTest {
private static final int N = KernelNodeState.MAX_CHILD_NAMES;
private NodeState state;
+ public LargeNodeStateTest(NodeStoreFixture fixture) {
+ super(fixture);
+ }
+
@Before
public void setUp() throws CommitFailedException {
- NodeStore store = createNodeStore();
-
NodeBuilder builder = store.getRoot().builder();
builder.setProperty("a", 1);
for (int i = 0; i <= N; i++) {
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeBuilderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeBuilderTest.java?rev=1646266&r1=1646265&r2=1646266&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeBuilderTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeBuilderTest.java Wed Dec 17 14:33:38 2014
@@ -23,17 +23,22 @@ import static junit.framework.Assert.ass
import static junit.framework.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
+import org.apache.jackrabbit.oak.NodeStoreFixture;
+import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.junit.Test;
-public class NodeBuilderTest extends AbstractKernelTest {
+public class NodeBuilderTest extends OakBaseTest {
+
+ public NodeBuilderTest(NodeStoreFixture fixture) {
+ super(fixture);
+ }
@Test
public void deletesKernelNodeStore() throws CommitFailedException {
- NodeStore store = createNodeStore();
init(store);
run(store);
}
@@ -47,7 +52,6 @@ public class NodeBuilderTest extends Abs
@Test
public void rebasePreservesNew() {
- NodeStore store = createNodeStore();
NodeBuilder root = store.getRoot().builder();
NodeBuilder added = root.setChildNode("added");
assertTrue(root.hasChildNode("added"));
@@ -60,7 +64,6 @@ public class NodeBuilderTest extends Abs
@Test
public void rebaseInvariant() {
- NodeStore store = createNodeStore();
NodeBuilder root = store.getRoot().builder();
NodeBuilder added = root.setChildNode("added");
NodeState base = root.getBaseState();
@@ -70,7 +73,6 @@ public class NodeBuilderTest extends Abs
@Test
public void rebase() throws CommitFailedException {
- NodeStore store = createNodeStore();
NodeBuilder root = store.getRoot().builder();
modify(store);
store.rebase(root);
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStateTest.java?rev=1646266&r1=1646265&r2=1646266&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStateTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStateTest.java Wed Dec 17 14:33:38 2014
@@ -29,6 +29,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import org.apache.jackrabbit.oak.NodeStoreFixture;
+import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
@@ -37,13 +39,15 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-public class NodeStateTest extends AbstractKernelTest {
-
+public class NodeStateTest extends OakBaseTest {
private NodeState state;
+ public NodeStateTest(NodeStoreFixture fixture) {
+ super(fixture);
+ }
+
@Before
public void setUp() throws CommitFailedException {
- NodeStore store = createNodeStore();
NodeBuilder builder = store.getRoot().builder();
builder.setProperty("a", 1);
builder.setProperty("b", 2);
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreCacheTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreCacheTest.java?rev=1646266&r1=1646265&r2=1646266&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreCacheTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreCacheTest.java Wed Dec 17 14:33:38 2014
@@ -27,7 +27,8 @@ import javax.annotation.Nonnull;
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.mk.api.MicroKernelException;
-import org.apache.jackrabbit.oak.kernel.KernelNodeState;
+import org.apache.jackrabbit.oak.NodeStoreFixture;
+import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK.Builder;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
@@ -39,16 +40,17 @@ import org.junit.Test;
* Tests if cache is used for repeated reads on unmodified subtree.
* See also OAK-591.
*/
-public class NodeStoreCacheTest extends AbstractKernelTest {
-
+public class NodeStoreCacheTest extends OakBaseTest {
private static final String PROP_FILTER = "{\"properties\":[\"*\"]}";
private static final String PROP_FILTER_WITH_HASH = "{\"properties\":[\"*\",\":hash\"]}";
private static final String PROP_FILTER_WITH_ID = "{\"properties\":[\"*\",\":id\"]}";
- private KernelNodeStore store;
-
private MicroKernelWrapper wrapper;
+ public NodeStoreCacheTest(NodeStoreFixture fixture) {
+ super(fixture);
+ }
+
@Before
public void setUp() throws Exception {
wrapper = new MicroKernelWrapper(new Builder().open());
@@ -132,7 +134,7 @@ public class NodeStoreCacheTest extends
private int readTreeWithCleanedCache() {
// start with virgin store / empty cache
store = new KernelNodeStore(wrapper);
- KernelNodeState root = store.getRoot();
+ NodeState root = store.getRoot();
int uncachedReads = wrapper.numGetNodes;
readTree(root);
return wrapper.numGetNodes - uncachedReads;
@@ -144,7 +146,7 @@ public class NodeStoreCacheTest extends
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
}
- private void readTree(NodeState root) {
+ private static void readTree(NodeState root) {
for (ChildNodeEntry cne : root.getChildNodeEntries()) {
readTree(cne.getNodeState());
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java?rev=1646266&r1=1646265&r2=1646266&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java Wed Dec 17 14:33:38 2014
@@ -26,11 +26,9 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeTrue;
-import static org.junit.runners.Parameterized.Parameters;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -40,6 +38,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.apache.jackrabbit.oak.NodeStoreFixture;
+import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.kernel.KernelNodeState;
@@ -57,31 +56,13 @@ import org.apache.jackrabbit.oak.spi.com
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(value = Parameterized.class)
-public class NodeStoreTest {
-
- @Parameters
- public static Collection<Object[]> fixtures() {
- Object[][] fixtures = new Object[][] {
- {NodeStoreFixture.MONGO_MK},
- {NodeStoreFixture.MONGO_NS},
- {NodeStoreFixture.SEGMENT_MK},
- {NodeStoreFixture.MEMORY_NS},
- };
- return Arrays.asList(fixtures);
- }
+public class NodeStoreTest extends OakBaseTest {
private NodeStore store;
-
private NodeState root;
- private NodeStoreFixture fixture;
-
public NodeStoreTest(NodeStoreFixture fixture) {
- this.fixture = fixture;
+ super(fixture);
}
@Before