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 ju...@apache.org on 2013/06/11 15:00:06 UTC
svn commit: r1491780 [3/3] - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/
oak-core/src/main/java/org/apache/jackrabbit/oak/osgi/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/
oak-core/src/main/java/org/a...
Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryEngineIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryEngineIT.java?rev=1491780&r1=1491779&r2=1491780&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryEngineIT.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryEngineIT.java Tue Jun 11 13:00:04 2013
@@ -21,24 +21,15 @@ import static junit.framework.Assert.ass
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertTrue;
-import javax.security.auth.Subject;
-
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
-import org.apache.jackrabbit.oak.core.RootImpl;
-import org.apache.jackrabbit.oak.plugins.index.IndexDefinition;
-import org.apache.jackrabbit.oak.plugins.index.IndexDefinitionImpl;
import org.apache.jackrabbit.oak.plugins.index.solr.SolrBaseTest;
-import org.apache.jackrabbit.oak.plugins.index.solr.index.SolrCommitHook;
-import org.apache.jackrabbit.oak.spi.commit.PostCommitHook;
import org.apache.jackrabbit.oak.query.ast.Operator;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
-import org.apache.jackrabbit.oak.spi.query.CompositeQueryIndexProvider;
import org.apache.jackrabbit.oak.spi.query.Cursor;
import org.apache.jackrabbit.oak.spi.query.Filter;
import org.apache.jackrabbit.oak.spi.query.PropertyValues;
import org.apache.jackrabbit.oak.spi.query.QueryIndex;
-import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.junit.Test;
/**
@@ -47,30 +38,21 @@ import org.junit.Test;
*/
public class SolrQueryEngineIT extends SolrBaseTest {
- @Override
- protected RootImpl createRootImpl() {
- return new RootImpl(store, new SolrCommitHook(server), PostCommitHook.EMPTY, "solr-query-engine-it", new Subject(),
- new OpenSecurityProvider(), new CompositeQueryIndexProvider());
- }
-
@Test
public void testSolrQueryEngine() throws Exception {
- IndexDefinition testID = new IndexDefinitionImpl("solr-test",
- "solr", "/");
Root root = createRootImpl();
Tree tree = root.getTree("/");
-
tree.addChild("somenode").setProperty("foo", "bar");
root.commit();
- QueryIndex index = new SolrQueryIndex(testID, server, configuration);
+ QueryIndex index = new SolrQueryIndex("solr", server, configuration);
FilterImpl filter = new FilterImpl(null, null);
- filter.restrictPath("somenode", Filter.PathRestriction.EXACT);
+ filter.restrictPath("/somenode", Filter.PathRestriction.EXACT);
filter.restrictProperty("foo", Operator.EQUAL, PropertyValues.newString("bar"));
Cursor cursor = index.query(filter, store.getRoot());
assertNotNull(cursor);
assertTrue(cursor.hasNext());
- assertEquals("somenode", cursor.next().getPath());
+ assertEquals("/somenode", cursor.next().getPath());
assertFalse(cursor.hasNext());
}