3 files changed, 31 insertions, 31 deletions

diff --git a/src/test/java/com/amazon/carbonado/qe/TestIndexedQueryAnalyzer.java b/src/test/java/com/amazon/carbonado/qe/TestIndexedQueryAnalyzer.java
index 85c78cb..166d6e6 100644
--- a/src/test/java/com/amazon/carbonado/qe/TestIndexedQueryAnalyzer.java
+++ b/src/test/java/com/amazon/carbonado/qe/TestIndexedQueryAnalyzer.java
@@ -71,7 +71,7 @@ public class TestIndexedQueryAnalyzer extends TestCase {
         IndexedQueryAnalyzer iqa = new IndexedQueryAnalyzer(Address.class, IxProvider.INSTANCE);

         Filter<Address> filter = Filter.filterFor(Address.class, "addressZip = ?");

         filter = filter.bind();

-        IndexedQueryAnalyzer.Result result = iqa.analyze(filter);

+        IndexedQueryAnalyzer.Result result = iqa.analyze(filter, null);

 

         assertFalse(result.handlesAnything());

         assertEquals(filter, result.getCompositeScore().getFilteringScore().getRemainderFilter());

@@ -84,7 +84,7 @@ public class TestIndexedQueryAnalyzer extends TestCase {
         IndexedQueryAnalyzer iqa = new IndexedQueryAnalyzer(Address.class, IxProvider.INSTANCE);

         Filter<Address> filter = Filter.filterFor(Address.class, "addressID = ?");

         filter = filter.bind();

-        IndexedQueryAnalyzer.Result result = iqa.analyze(filter);

+        IndexedQueryAnalyzer.Result result = iqa.analyze(filter, null);

 

         assertTrue(result.handlesAnything());

         assertEquals(filter, result.getCompositeScore().getFilteringScore().getIdentityFilter());

@@ -97,7 +97,7 @@ public class TestIndexedQueryAnalyzer extends TestCase {
         IndexedQueryAnalyzer iqa = new IndexedQueryAnalyzer(Shipment.class, IxProvider.INSTANCE);

         Filter<Shipment> filter = Filter.filterFor(Shipment.class, "shipmentID = ?");

         filter = filter.bind();

-        IndexedQueryAnalyzer.Result result = iqa.analyze(filter);

+        IndexedQueryAnalyzer.Result result = iqa.analyze(filter, null);

 

         assertTrue(result.handlesAnything());

         assertEquals(filter, result.getCompositeScore().getFilteringScore().getIdentityFilter());

@@ -107,7 +107,7 @@ public class TestIndexedQueryAnalyzer extends TestCase {
 

         filter = Filter.filterFor(Shipment.class, "orderID = ?");

         filter = filter.bind();

-        result = iqa.analyze(filter);

+        result = iqa.analyze(filter, null);

 

         assertTrue(result.handlesAnything());

         assertEquals(filter, result.getCompositeScore().getFilteringScore().getIdentityFilter());

@@ -120,7 +120,7 @@ public class TestIndexedQueryAnalyzer extends TestCase {
         IndexedQueryAnalyzer iqa = new IndexedQueryAnalyzer(Shipment.class, IxProvider.INSTANCE);

         Filter<Shipment> filter = Filter.filterFor(Shipment.class, "order.orderTotal >= ?");

         filter = filter.bind();

-        IndexedQueryAnalyzer.Result result = iqa.analyze(filter);

+        IndexedQueryAnalyzer.Result result = iqa.analyze(filter, null);

 

         assertTrue(result.handlesAnything());

         assertTrue(result.getCompositeScore().getFilteringScore().hasRangeStart());

@@ -136,7 +136,7 @@ public class TestIndexedQueryAnalyzer extends TestCase {
         Filter<Shipment> filter = Filter.filterFor

             (Shipment.class, "shipmentNotes = ? & order.orderTotal >= ?");

         filter = filter.bind();

-        IndexedQueryAnalyzer.Result result = iqa.analyze(filter);

+        IndexedQueryAnalyzer.Result result = iqa.analyze(filter, null);

 

         assertTrue(result.handlesAnything());

         assertTrue(result.getCompositeScore().getFilteringScore().hasRangeStart());

@@ -155,7 +155,7 @@ public class TestIndexedQueryAnalyzer extends TestCase {
         Filter<Shipment> filter = Filter.filterFor

             (Shipment.class, "orderID >= ? & order.orderTotal >= ?");

         filter = filter.bind();

-        IndexedQueryAnalyzer.Result result = iqa.analyze(filter);

+        IndexedQueryAnalyzer.Result result = iqa.analyze(filter, null);

 

         assertTrue(result.handlesAnything());

         assertTrue(result.getCompositeScore().getFilteringScore().hasRangeStart());

@@ -171,7 +171,7 @@ public class TestIndexedQueryAnalyzer extends TestCase {
         Filter<Shipment> filter = Filter.filterFor

             (Shipment.class, "order.address.addressState = ?");

         filter = filter.bind();

-        IndexedQueryAnalyzer.Result result = iqa.analyze(filter);

+        IndexedQueryAnalyzer.Result result = iqa.analyze(filter, null);

 

         assertTrue(result.handlesAnything());

         assertEquals(filter, result.getCompositeScore().getFilteringScore().getIdentityFilter());

@@ -189,7 +189,7 @@ public class TestIndexedQueryAnalyzer extends TestCase {
             (Shipment.class, "order.address.addressState = ? & order.address.addressZip = ?");

         FilterValues<Shipment> values = filter.initialFilterValues();

         filter = values.getFilter();

-        IndexedQueryAnalyzer.Result result = iqa.analyze(filter);

+        IndexedQueryAnalyzer.Result result = iqa.analyze(filter, null);

 

         assertTrue(result.handlesAnything());

         assertEquals(Filter.filterFor(Shipment.class, "order.address.addressState = ?").bind(),

diff --git a/src/test/java/com/amazon/carbonado/qe/TestIndexedQueryExecutor.java b/src/test/java/com/amazon/carbonado/qe/TestIndexedQueryExecutor.java
index b3eef91..922266a 100644
--- a/src/test/java/com/amazon/carbonado/qe/TestIndexedQueryExecutor.java
+++ b/src/test/java/com/amazon/carbonado/qe/TestIndexedQueryExecutor.java
@@ -76,7 +76,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         FilterValues<StorableTestBasic> values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        CompositeScore<StorableTestBasic> score = CompositeScore.evaluate(index, filter);

+        CompositeScore<StorableTestBasic> score = CompositeScore.evaluate(index, filter, null);

 

         Mock<StorableTestBasic> executor = new Mock(index, score);

 

@@ -96,7 +96,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        score = CompositeScore.evaluate(index, filter);

+        score = CompositeScore.evaluate(index, filter, null);

 

         executor = new Mock(index, score);

 

@@ -117,7 +117,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        score = CompositeScore.evaluate(index, filter);

+        score = CompositeScore.evaluate(index, filter, null);

 

         executor = new Mock(index, score);

 

@@ -140,7 +140,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         FilterValues<StorableTestBasic> values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        CompositeScore<StorableTestBasic> score = CompositeScore.evaluate(index, filter);

+        CompositeScore<StorableTestBasic> score = CompositeScore.evaluate(index, filter, null);

 

         Mock<StorableTestBasic> executor = new Mock(index, score);

 

@@ -159,7 +159,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        score = CompositeScore.evaluate(index, filter);

+        score = CompositeScore.evaluate(index, filter, null);

 

         executor = new Mock(index, score);

 

@@ -178,7 +178,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        score = CompositeScore.evaluate(index, filter);

+        score = CompositeScore.evaluate(index, filter, null);

 

         executor = new Mock(index, score);

 

@@ -197,7 +197,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        score = CompositeScore.evaluate(index, filter);

+        score = CompositeScore.evaluate(index, filter, null);

 

         executor = new Mock(index, score);

 

@@ -216,7 +216,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        score = CompositeScore.evaluate(index, filter);

+        score = CompositeScore.evaluate(index, filter, null);

 

         executor = new Mock(index, score);

 

@@ -235,7 +235,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        score = CompositeScore.evaluate(index, filter);

+        score = CompositeScore.evaluate(index, filter, null);

 

         executor = new Mock(index, score);

 

@@ -276,7 +276,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        score = CompositeScore.evaluate(index, filter);

+        score = CompositeScore.evaluate(index, filter, null);

 

         executor = new Mock(index, score);

 

@@ -339,7 +339,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         FilterValues<StorableTestBasic> values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        CompositeScore<StorableTestBasic> score = CompositeScore.evaluate(index, filter);

+        CompositeScore<StorableTestBasic> score = CompositeScore.evaluate(index, filter, null);

 

         Mock<StorableTestBasic> executor = new Mock(index, score);

 

@@ -358,7 +358,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        score = CompositeScore.evaluate(index, filter);

+        score = CompositeScore.evaluate(index, filter, null);

 

         executor = new Mock(index, score);

 

@@ -377,7 +377,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        score = CompositeScore.evaluate(index, filter);

+        score = CompositeScore.evaluate(index, filter, null);

 

         executor = new Mock(index, score);

 

@@ -396,7 +396,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        score = CompositeScore.evaluate(index, filter);

+        score = CompositeScore.evaluate(index, filter, null);

 

         executor = new Mock(index, score);

 

@@ -415,7 +415,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        score = CompositeScore.evaluate(index, filter);

+        score = CompositeScore.evaluate(index, filter, null);

 

         executor = new Mock(index, score);

 

@@ -434,7 +434,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        score = CompositeScore.evaluate(index, filter);

+        score = CompositeScore.evaluate(index, filter, null);

 

         executor = new Mock(index, score);

 

@@ -475,7 +475,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        score = CompositeScore.evaluate(index, filter);

+        score = CompositeScore.evaluate(index, filter, null);

 

         executor = new Mock(index, score);

 

@@ -541,7 +541,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         FilterValues<StorableTestBasic> values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        CompositeScore<StorableTestBasic> score = CompositeScore.evaluate(index, filter);

+        CompositeScore<StorableTestBasic> score = CompositeScore.evaluate(index, filter, null);

 

         Mock<StorableTestBasic> executor = new Mock(index, score);

 

@@ -560,7 +560,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        score = CompositeScore.evaluate(index, filter);

+        score = CompositeScore.evaluate(index, filter, null);

 

         executor = new Mock(index, score);

 

@@ -580,7 +580,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        score = CompositeScore.evaluate(index, filter);

+        score = CompositeScore.evaluate(index, filter, null);

 

         executor = new Mock(index, score);

 

@@ -612,7 +612,7 @@ public class TestIndexedQueryExecutor extends TestCase {
         values = filter.initialFilterValues();

         filter = values.getFilter();

 

-        score = CompositeScore.evaluate(index, filter);

+        score = CompositeScore.evaluate(index, filter, null);

 

         executor = new Mock(index, score);

 

diff --git a/src/test/java/com/amazon/carbonado/qe/TestOrderingScore.java b/src/test/java/com/amazon/carbonado/qe/TestOrderingScore.java
index 1545b70..ac407ec 100644
--- a/src/test/java/com/amazon/carbonado/qe/TestOrderingScore.java
+++ b/src/test/java/com/amazon/carbonado/qe/TestOrderingScore.java
@@ -79,7 +79,7 @@ public class TestOrderingScore extends TestCase {
     public void testEmpty() throws Exception {

         StorableIndex<StorableTestBasic> ix = makeIndex(StorableTestBasic.class, "id");

 

-        OrderingScore score = OrderingScore.evaluate(ix, null);

+        OrderingScore score = OrderingScore.evaluate(ix, null, null);

 

         assertEquals(0, score.getHandledCount());

         assertEquals(0, score.getRemainderCount());