From c16716f2d8e15f6539995c656ad05e4e8f799a21 Mon Sep 17 00:00:00 2001 From: "Brian S. O'Neill" Date: Wed, 20 Sep 2006 03:00:40 +0000 Subject: More tests and fixes. --- .../amazon/carbonado/qe/TestUnionQueryAnalyzer.java | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'src/test/java/com/amazon/carbonado/qe') diff --git a/src/test/java/com/amazon/carbonado/qe/TestUnionQueryAnalyzer.java b/src/test/java/com/amazon/carbonado/qe/TestUnionQueryAnalyzer.java index 3d99c84..e9cc8f9 100644 --- a/src/test/java/com/amazon/carbonado/qe/TestUnionQueryAnalyzer.java +++ b/src/test/java/com/amazon/carbonado/qe/TestUnionQueryAnalyzer.java @@ -447,24 +447,12 @@ public class TestUnionQueryAnalyzer extends TestCase { (StorableTestBasic.class, "stringProp = ? | stringProp = ?"); filter = filter.bind(); UnionQueryAnalyzer.Result result = uqa.analyze(filter, null); - - boolean a = result.getTotalOrdering() == - OrderingList.get(StorableTestBasic.class, "+doubleProp", "+stringProp"); - boolean b = result.getTotalOrdering() == - OrderingList.get(StorableTestBasic.class, "+stringProp", "+doubleProp"); - - assertTrue(a || b); + assertEquals(OrderingList.get(StorableTestBasic.class, "+stringProp", "+doubleProp"), + result.getTotalOrdering()); QueryExecutor exec = result.createExecutor(); - - assertEquals(filter, exec.getFilter()); - - a = exec.getOrdering() == - OrderingList.get(StorableTestBasic.class, "+doubleProp", "+stringProp"); - b = exec.getOrdering() == - OrderingList.get(StorableTestBasic.class, "+stringProp", "+doubleProp"); - - assertTrue(a || b); + assertEquals(OrderingList.get(StorableTestBasic.class, "+stringProp", "+doubleProp"), + exec.getOrdering()); List.Result> subResults = result.getSubResults(); -- cgit v1.2.3