From f3c13f7c387369cdd7d1834b79728c20c4bc0a98 Mon Sep 17 00:00:00 2001 From: Willi Goesgens Date: Sat, 13 Dec 2014 00:13:00 +0100 Subject: [PATCH] Fix unittest. --- .../aql-optimizer-rule-use-index-instead-filter.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/js/server/tests/aql-optimizer-rule-use-index-instead-filter.js b/js/server/tests/aql-optimizer-rule-use-index-instead-filter.js index a90f8a582d..ec567f2d5a 100644 --- a/js/server/tests/aql-optimizer-rule-use-index-instead-filter.js +++ b/js/server/tests/aql-optimizer-rule-use-index-instead-filter.js @@ -43,7 +43,7 @@ var py=function(what) {require("internal").print( yaml.safeDump(what));}; /// @brief test suite //////////////////////////////////////////////////////////////////////////////// -function optimizerRuleTestSuite() { +function optimizerRuleTestSuite_filterByIndex() { var IndexRangeRule = "use-index-range"; var FilterRemoveRule = "remove-filter-covered-by-index"; var SortRemoveRule = "use-index-for-sort"; @@ -190,13 +190,13 @@ function optimizerRuleTestSuite() { assertEqual([ IndexRangeRule, FilterRemoveRule ], removeAlwaysOnClusterRules(result.plan.rules), query); hasNoFilterNode(result); - hasIndexRangeNode_WithRanges(result); + hasIndexRangeNode_WithRanges(result, true); result = AQL_EXPLAIN(query, { }, paramIndexRangeSortFilter); assertEqual([ IndexRangeRule, FilterRemoveRule, SortRemoveRule ], removeAlwaysOnClusterRules(result.plan.rules), query); hasNoFilterNode(result); - hasIndexRangeNode_WithRanges(result); + hasIndexRangeNode_WithRanges(result, true); QResults[0] = AQL_EXECUTE(query, { }, paramNone).json; @@ -241,15 +241,11 @@ function optimizerRuleTestSuite() { assertEqual([ IndexRangeRule, FilterRemoveRule ], removeAlwaysOnClusterRules(result.plan.rules), query); hasNoFilterNode(result); - hasIndexRangeNode_WithRanges(result); result = AQL_EXPLAIN(query, { }, paramIndexRangeSortFilter); - py(result); assertEqual([ IndexRangeRule, FilterRemoveRule ], removeAlwaysOnClusterRules(result.plan.rules), query); hasNoFilterNode(result); - hasIndexRangeNode_WithRanges(result); - QResults[0] = AQL_EXECUTE(query, { }, paramNone).json; QResults[1] = AQL_EXECUTE(query, { }, paramIndexRangeFilter).json; @@ -280,7 +276,7 @@ function optimizerRuleTestSuite() { /// @brief executes the test suite //////////////////////////////////////////////////////////////////////////////// -jsunity.run(optimizerRuleTestSuite); +jsunity.run(optimizerRuleTestSuite_filterByIndex); return jsunity.done();