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 16:20:39 UTC
svn commit: r1646278 - in
/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak:
NodeStoreFixture.java spi/state/CheckpointTest.java
Author: mduerig
Date: Wed Dec 17 15:20:38 2014
New Revision: 1646278
URL: http://svn.apache.org/r1646278
Log:
OAK-2365: Refactor node store tests
Simplify MongoMK fixture
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixture.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixture.java?rev=1646278&r1=1646277&r2=1646278&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixture.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/NodeStoreFixture.java Wed Dec 17 15:20:38 2014
@@ -18,10 +18,6 @@
*/
package org.apache.jackrabbit.oak;
-import java.io.Closeable;
-import java.io.IOException;
-
-import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
@@ -57,18 +53,14 @@ public abstract class NodeStoreFixture {
}
@Override
- public NodeStore createNodeStore() {
- return new CloseableNodeStore(new DocumentMK.Builder().open());
+ public DocumentNodeStore createNodeStore() {
+ return new DocumentMK.Builder().getNodeStore();
}
@Override
public void dispose(NodeStore nodeStore) {
- if (nodeStore instanceof Closeable) {
- try {
- ((Closeable) nodeStore).close();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ if (nodeStore instanceof DocumentNodeStore) {
+ ((DocumentNodeStore) nodeStore).dispose();
}
}
};
@@ -106,19 +98,4 @@ public abstract class NodeStoreFixture {
public abstract void dispose(NodeStore nodeStore);
- private static class CloseableNodeStore
- extends KernelNodeStore implements Closeable {
-
- private final DocumentMK kernel;
-
- public CloseableNodeStore(DocumentMK kernel) {
- super(kernel, DEFAULT_CACHE_SIZE);
- this.kernel = kernel;
- }
-
- @Override
- public void close() throws IOException {
- kernel.dispose();
- }
- }
}
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=1646278&r1=1646277&r2=1646278&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 15:20:38 2014
@@ -23,7 +23,6 @@ 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.Assume.assumeTrue;
import com.google.common.collect.ImmutableMap;
import org.apache.jackrabbit.oak.NodeStoreFixture;
@@ -40,7 +39,6 @@ public class CheckpointTest extends OakB
public CheckpointTest(NodeStoreFixture fixture) {
super(fixture);
- assumeTrue(fixture != NodeStoreFixture.MONGO_MK); // FIXME test fail on MONGO_MK fixture
}
@Before