Author: jukka
Date: Wed Feb 19 11:08:59 2014
New Revision: 1569684
URL: http://svn.apache.org/r1569684
Log:
OAK-1434: Cleanup dependencies of oak-core
Use MemoryNodeStore/State instead of MicroKernelImpl for simple tests
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java?rev=1569684&r1=1569683&r2=1569684&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java
Wed Feb 19 11:08:59 2014
@@ -29,15 +29,13 @@ import java.util.Set;
import com.google.common.collect.Sets;
import org.apache.jackrabbit.JcrConstants;
-import org.apache.jackrabbit.mk.api.MicroKernel;
-import org.apache.jackrabbit.mk.core.MicroKernelImpl;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
import org.apache.jackrabbit.oak.plugins.index.CompositeIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.IndexUpdateProvider;
import
org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider;
+import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.query.ast.SelectorImpl;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
@@ -48,6 +46,7 @@ import org.apache.jackrabbit.oak.spi.que
import org.apache.jackrabbit.oak.spi.query.Cursors;
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;
@@ -56,12 +55,10 @@ import org.junit.Test;
*/
public class NodeTypeIndexTest {
- private KernelNodeStore store;
+ private NodeStore store = new MemoryNodeStore();
@Before
public void setup() {
- MicroKernel mk = new MicroKernelImpl();
- store = new KernelNodeStore(mk);
// initialize node types & index definitions
OakInitializer.initialize(store, new InitialContent(),
CompositeIndexEditorProvider
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexTest.java?rev=1569684&r1=1569683&r2=1569684&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/index/TraversingIndexTest.java
Wed Feb 19 11:08:59 2014
@@ -18,6 +18,7 @@
*/
package org.apache.jackrabbit.oak.query.index;
+import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -26,56 +27,42 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import org.apache.jackrabbit.mk.api.MicroKernel;
-import org.apache.jackrabbit.mk.core.MicroKernelImpl;
-import org.apache.jackrabbit.oak.kernel.KernelNodeState;
-import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
import org.apache.jackrabbit.oak.spi.query.Cursor;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.junit.Test;
/**
* Tests the TraversingCursor.
*/
public class TraversingIndexTest {
- private final MicroKernel mk = new MicroKernelImpl();
- private final KernelNodeStore store = new KernelNodeStore(mk);
-
- private final LoadingCache<String, KernelNodeState> cache =
- CacheBuilder.newBuilder().build(new CacheLoader<String,
KernelNodeState>() {
- @Override
- public KernelNodeState load(String key) throws Exception {
- int slash = key.indexOf('/');
- String revision = key.substring(0, slash);
- String path = key.substring(slash);
- // this method is strictly called _after_ the cache is
initialized,
- // when the fields are set
- return new KernelNodeState(store, path, revision,
getCache());
- }
- });
-
- LoadingCache<String, KernelNodeState> getCache() {
- return cache;
- }
@Test
public void traverse() throws Exception {
+ NodeBuilder builder = EMPTY_NODE.builder();
+ NodeBuilder parents = builder.child("parents");
+ parents.child("p0").setProperty("id", 0);
+ parents.child("p1").setProperty("id", 1);
+ parents.child("p2").setProperty("id", 2);
+ NodeBuilder children = builder.child("children");
+ children.child("c1").setProperty("p", "1");
+ children.child("c2").setProperty("p", "1");
+ children.child("c3").setProperty("p", "2");
+ children.child("c4").setProperty("p", "3");
+ NodeState root = builder.getNodeState();
+
TraversingIndex t = new TraversingIndex();
- String head = mk.getHeadRevision();
- head = mk.commit("/", "+ \"parents\": { \"p0\": {\"id\": \"0\"},
\"p1\": {\"id\": \"1\"}, \"p2\": {\"id\": \"2\"}}", head, "");
- head = mk.commit("/", "+ \"children\": { \"c1\": {\"p\": \"1\"},
\"c2\": {\"p\": \"1\"}, \"c3\": {\"p\": \"2\"}, \"c4\": {\"p\": \"3\"}}", head,
"");
FilterImpl f = new FilterImpl();
f.setPath("/");
+ Cursor c = t.query(f, root);
List<String> paths = new ArrayList<String>();
- Cursor c = t.query(f, new KernelNodeState(store, "/", head, cache));
while (c.hasNext()) {
paths.add(c.next().getPath());
}
Collections.sort(paths);
+
assertEquals(Arrays.asList(
"/", "/children", "/children/c1", "/children/c2",
"/children/c3", "/children/c4", "/parents",
@@ -86,7 +73,7 @@ public class TraversingIndexTest {
assertFalse(c.hasNext());
f.setPath("/nowhere");
- c = t.query(f, new KernelNodeState(store, "/", head, cache));
+ c = t.query(f, root);
assertFalse(c.hasNext());
// endure it stays false
assertFalse(c.hasNext());
