Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexHookIT.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexHookIT.java?rev=1581799&r1=1581798&r2=1581799&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexHookIT.java (original) +++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexHookIT.java Wed Mar 26 12:06:28 2014 @@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.plugin import java.util.Set; import org.apache.jackrabbit.oak.plugins.index.solr.SolrBaseTest; import org.apache.jackrabbit.oak.plugins.index.solr.query.SolrQueryIndex; +import org.apache.jackrabbit.oak.query.QueryEngineSettings; import org.apache.jackrabbit.oak.query.ast.Operator; import org.apache.jackrabbit.oak.query.ast.SelectorImpl; import org.apache.jackrabbit.oak.query.index.FilterImpl; @@ -59,7 +60,7 @@ public class SolrIndexHookIT extends Sol NodeState indexed = hook.processCommit(before, after, CommitInfo.EMPTY); QueryIndex queryIndex = new SolrQueryIndex("solr", server, configuration); - FilterImpl filter = new FilterImpl(mock(SelectorImpl.class), ""); + FilterImpl filter = new FilterImpl(mock(SelectorImpl.class), "", new QueryEngineSettings()); filter.restrictPath("/newnode", Filter.PathRestriction.EXACT); filter.restrictProperty("prop", Operator.EQUAL, PropertyValues.newString("val")); @@ -88,7 +89,7 @@ public class SolrIndexHookIT extends Sol NodeState indexed = hook.processCommit(before, after, CommitInfo.EMPTY); QueryIndex queryIndex = new SolrQueryIndex("solr", server, configuration); - FilterImpl filter = new FilterImpl(mock(SelectorImpl.class), ""); + FilterImpl filter = new FilterImpl(mock(SelectorImpl.class), "", new QueryEngineSettings()); filter.restrictProperty("foo", Operator.EQUAL, PropertyValues.newString("bar")); Cursor cursor = queryIndex.query(filter, indexed); @@ -122,7 +123,7 @@ public class SolrIndexHookIT extends Sol NodeState indexed = hook.processCommit(before, after, CommitInfo.EMPTY); QueryIndex queryIndex = new SolrQueryIndex("solr", server, configuration); - FilterImpl filter = new FilterImpl(mock(SelectorImpl.class), ""); + FilterImpl filter = new FilterImpl(mock(SelectorImpl.class), "", new QueryEngineSettings()); filter.restrictProperty("foo", Operator.EQUAL, PropertyValues.newString("bar")); filter.restrictFulltextCondition("bar");
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=1581799&r1=1581798&r2=1581799&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 Wed Mar 26 12:06:28 2014 @@ -22,6 +22,7 @@ import java.util.Set; import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.plugins.index.solr.SolrBaseTest; +import org.apache.jackrabbit.oak.query.QueryEngineSettings; import org.apache.jackrabbit.oak.query.ast.Operator; import org.apache.jackrabbit.oak.query.ast.SelectorImpl; import org.apache.jackrabbit.oak.query.index.FilterImpl; @@ -53,7 +54,7 @@ public class SolrQueryEngineIT extends S root.commit(); QueryIndex index = new SolrQueryIndex("solr", server, configuration); - FilterImpl filter = new FilterImpl(mock(SelectorImpl.class), ""); + FilterImpl filter = new FilterImpl(mock(SelectorImpl.class), "", new QueryEngineSettings()); filter.restrictPath("/somenode", Filter.PathRestriction.EXACT); Cursor cursor = index.query(filter, store.getRoot()); assertCursor(cursor, "/somenode"); @@ -72,7 +73,7 @@ public class SolrQueryEngineIT extends S root.commit(); QueryIndex index = new SolrQueryIndex("solr", server, configuration); - FilterImpl filter = new FilterImpl(mock(SelectorImpl.class), ""); + FilterImpl filter = new FilterImpl(mock(SelectorImpl.class), "", new QueryEngineSettings()); filter.restrictPath("/somenode", Filter.PathRestriction.DIRECT_CHILDREN); Cursor cursor = index.query(filter, store.getRoot()); assertCursor(cursor, "/somenode/child1", "/somenode/child2"); @@ -91,7 +92,7 @@ public class SolrQueryEngineIT extends S root.commit(); QueryIndex index = new SolrQueryIndex("solr", server, configuration); - FilterImpl filter = new FilterImpl(mock(SelectorImpl.class), ""); + FilterImpl filter = new FilterImpl(mock(SelectorImpl.class), "", new QueryEngineSettings()); filter.restrictPath("/somenode", Filter.PathRestriction.ALL_CHILDREN); Cursor cursor = index.query(filter, store.getRoot()); assertCursor( @@ -109,7 +110,7 @@ public class SolrQueryEngineIT extends S root.commit(); QueryIndex index = new SolrQueryIndex("solr", server, configuration); - FilterImpl filter = new FilterImpl(mock(SelectorImpl.class), ""); + FilterImpl filter = new FilterImpl(mock(SelectorImpl.class), "", new QueryEngineSettings()); filter.restrictProperty("foo", Operator.EQUAL, PropertyValues.newString("bar")); Cursor cursor = index.query(filter, store.getRoot()); assertCursor(cursor, "/somenode", "/anotherone"); @@ -129,7 +130,7 @@ public class SolrQueryEngineIT extends S Set<String> primaryTypes = new HashSet<String>(); primaryTypes.add("nt:folder"); when(selector.getPrimaryTypes()).thenReturn(primaryTypes); - FilterImpl filter = new FilterImpl(selector, "select * from [nt:folder]"); + FilterImpl filter = new FilterImpl(selector, "select * from [nt:folder]", new QueryEngineSettings()); Cursor cursor = index.query(filter, store.getRoot()); assertCursor(cursor, "/afoldernode"); }
