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/26 15:55:34 UTC
svn commit: r1597586 - in /jackrabbit/oak/trunk:
oak-core/src/test/java/org/apache/jackrabbit/oak/
oak-core/src/test/java/org/apache/jackrabbit/oak/core/
oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/
oak-it/mk/src/test/java/org/apache/jackra...
Author: mduerig
Date: Mon May 26 13:55:33 2014
New Revision: 1597586
URL: http://svn.apache.org/r1597586
Log:
OAK-1855: Travis builds time out
Remove MicroKernelImpl test fixture
Removed:
jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MicroKernelImplFixture.java
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/OakBaseTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreCacheTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/NodeStoreTest.java
jackrabbit/oak/trunk/oak-it/mk/src/test/resources/META-INF/services/org.apache.jackrabbit.mk.test.MicroKernelFixture
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/SameNamePropertyNodeTest.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=1597586&r1=1597585&r2=1597586&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 Mon May 26 13:55:33 2014
@@ -21,8 +21,6 @@ package org.apache.jackrabbit.oak;
import java.io.Closeable;
import java.io.IOException;
-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.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
@@ -30,8 +28,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
-import static org.apache.jackrabbit.oak.kernel.KernelNodeStore.DEFAULT_CACHE_SIZE;
-
/**
* NodeStore fixture for parametrized tests.
*/
@@ -95,26 +91,6 @@ public abstract class NodeStoreFixture {
}
};
- public static final NodeStoreFixture MK_IMPL = new NodeStoreFixture() {
- @Override
- public String toString() {
- return "MKImpl Fixture";
- }
-
- @Override
- public NodeStore createNodeStore() {
- return new KernelNodeStore(createMicroKernel(), DEFAULT_CACHE_SIZE);
- }
-
- @Override
- public void dispose(NodeStore nodeStore) {
- }
- };
-
- public static final MicroKernel createMicroKernel() {
- return new MicroKernelImpl();
- }
-
public abstract NodeStore createNodeStore();
public abstract void dispose(NodeStore nodeStore);
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java?rev=1597586&r1=1597585&r2=1597586&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/OakBaseTest.java Mon May 26 13:55:33 2014
@@ -34,7 +34,6 @@ public abstract class OakBaseTest {
@Parameterized.Parameters
public static Collection<Object[]> fixtures() {
Object[][] fixtures = new Object[][] {
- {NodeStoreFixture.MK_IMPL},
{NodeStoreFixture.MONGO_MK},
{NodeStoreFixture.MONGO_NS},
{NodeStoreFixture.SEGMENT_MK},
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java?rev=1597586&r1=1597585&r2=1597586&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootFuzzIT.java Mon May 26 13:55:33 2014
@@ -18,6 +18,14 @@
*/
package org.apache.jackrabbit.oak.core;
+import static org.apache.jackrabbit.oak.core.RootFuzzIT.Operation.AddNode;
+import static org.apache.jackrabbit.oak.core.RootFuzzIT.Operation.MoveNode;
+import static org.apache.jackrabbit.oak.core.RootFuzzIT.Operation.RemoveNode;
+import static org.apache.jackrabbit.oak.core.RootFuzzIT.Operation.RemoveProperty;
+import static org.apache.jackrabbit.oak.core.RootFuzzIT.Operation.Save;
+import static org.apache.jackrabbit.oak.core.RootFuzzIT.Operation.SetProperty;
+import static org.junit.Assert.assertEquals;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
@@ -40,14 +48,6 @@ import org.junit.runners.Parameterized.P
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.oak.core.RootFuzzIT.Operation.AddNode;
-import static org.apache.jackrabbit.oak.core.RootFuzzIT.Operation.MoveNode;
-import static org.apache.jackrabbit.oak.core.RootFuzzIT.Operation.RemoveNode;
-import static org.apache.jackrabbit.oak.core.RootFuzzIT.Operation.RemoveProperty;
-import static org.apache.jackrabbit.oak.core.RootFuzzIT.Operation.Save;
-import static org.apache.jackrabbit.oak.core.RootFuzzIT.Operation.SetProperty;
-import static org.junit.Assert.assertEquals;
-
/**
* Fuzz test running random sequences of operations on {@link Tree}.
* Run with -DRootFuzzIT-seed=42 to set a specific seed (i.e. 42);
@@ -59,7 +59,6 @@ public class RootFuzzIT {
@Parameters
public static Collection<Object[]> fixtures() {
Object[][] fixtures = new Object[][] {
- {NodeStoreFixture.MK_IMPL},
{NodeStoreFixture.MONGO_MK},
{NodeStoreFixture.MONGO_NS},
{NodeStoreFixture.SEGMENT_MK},
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=1597586&r1=1597585&r2=1597586&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 May 26 13:55:33 2014
@@ -18,12 +18,16 @@
*/
package org.apache.jackrabbit.oak.kernel;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.io.InputStream;
+
import javax.annotation.Nonnull;
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.mk.api.MicroKernelException;
-import org.apache.jackrabbit.oak.NodeStoreFixture;
+import org.apache.jackrabbit.mk.core.MicroKernelImpl;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
@@ -32,9 +36,6 @@ import org.apache.jackrabbit.oak.spi.sta
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
/**
* Tests if cache is used for repeated reads on unmodified subtree.
* See also OAK-591.
@@ -51,7 +52,7 @@ public class KernelNodeStoreCacheTest ex
@Before
public void setUp() throws Exception {
- wrapper = new MicroKernelWrapper(NodeStoreFixture.createMicroKernel());
+ wrapper = new MicroKernelWrapper(new MicroKernelImpl());
store = new KernelNodeStore(wrapper);
NodeBuilder builder = store.getRoot().builder();
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/NodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/NodeStoreTest.java?rev=1597586&r1=1597585&r2=1597586&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/NodeStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/kernel/NodeStoreTest.java Mon May 26 13:55:33 2014
@@ -69,7 +69,6 @@ public class NodeStoreTest {
@Parameters
public static Collection<Object[]> fixtures() {
Object[][] fixtures = new Object[][] {
- {NodeStoreFixture.MK_IMPL},
{NodeStoreFixture.MONGO_MK},
{NodeStoreFixture.MONGO_NS},
{NodeStoreFixture.SEGMENT_MK},
Modified: jackrabbit/oak/trunk/oak-it/mk/src/test/resources/META-INF/services/org.apache.jackrabbit.mk.test.MicroKernelFixture
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/test/resources/META-INF/services/org.apache.jackrabbit.mk.test.MicroKernelFixture?rev=1597586&r1=1597585&r2=1597586&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/mk/src/test/resources/META-INF/services/org.apache.jackrabbit.mk.test.MicroKernelFixture (original)
+++ jackrabbit/oak/trunk/oak-it/mk/src/test/resources/META-INF/services/org.apache.jackrabbit.mk.test.MicroKernelFixture Mon May 26 13:55:33 2014
@@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.jackrabbit.mk.test.MicroKernelImplFixture
#org.apache.jackrabbit.mk.test.ClientServerFixture
#org.apache.jackrabbit.mk.test.MongoMicroKernelFixture
#org.apache.jackrabbit.mk.test.MongoGridFSMicroKernelFixture
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java?rev=1597586&r1=1597585&r2=1597586&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java Mon May 26 13:55:33 2014
@@ -81,9 +81,6 @@ public abstract class AbstractRepository
@Parameterized.Parameters
public static Collection<Object[]> fixtures() {
Collection<Object[]> result = new ArrayList<Object[]>();
- if (FIXTURES.isEmpty() || FIXTURES.contains("MK_IMPL")) {
- result.add(new Object[] { NodeStoreFixture.MK_IMPL });
- }
if (FIXTURES.isEmpty() || FIXTURES.contains("DOCUMENT_MK")) {
result.add(new Object[] { NodeStoreFixture.DOCUMENT_MK });
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java?rev=1597586&r1=1597585&r2=1597586&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/NodeStoreFixture.java Mon May 26 13:55:33 2014
@@ -24,7 +24,7 @@ import java.util.UUID;
import javax.sql.DataSource;
-import org.apache.jackrabbit.mk.core.MicroKernelImpl;
+import com.mongodb.DB;
import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
import org.apache.jackrabbit.oak.plugins.document.DocumentMK;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
@@ -36,8 +36,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
-import com.mongodb.DB;
-
/**
* NodeStore fixture for parametrized tests.
*/
@@ -115,17 +113,6 @@ public abstract class NodeStoreFixture {
}
};
- public static final NodeStoreFixture MK_IMPL = new NodeStoreFixture() {
- @Override
- public NodeStore createNodeStore() {
- return new KernelNodeStore(new MicroKernelImpl());
- }
-
- @Override
- public void dispose(NodeStore nodeStore) {
- }
- };
-
public static NodeStoreFixture createDocumentFixture(final String uri) {
return new DocumentFixture(uri);
}
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=1597586&r1=1597585&r2=1597586&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 May 26 13:55:33 2014
@@ -22,6 +22,8 @@ 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;
@@ -116,7 +118,7 @@ public class SameNamePropertyNodeTest ex
*/
@Test
public void testMicroKernelSupport() throws Exception {
- NodeStore nodeStore = NodeStoreFixture.MK_IMPL.createNodeStore();
+ NodeStore nodeStore = new KernelNodeStore(new MicroKernelImpl());
JackrabbitRepository repository = (JackrabbitRepository) new Jcr(nodeStore).createRepository();
try {
assertFalse(repository.getDescriptorValue(Repository.OPTION_NODE_AND_PROPERTY_WITH_SAME_NAME_SUPPORTED).getBoolean());