diff options
author | Jon Bratseth <bratseth@oath.com> | 2019-04-08 11:28:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-08 11:28:59 +0200 |
commit | b8f02d9ef033d418764d1af6ebfd773fb2673086 (patch) | |
tree | e451c80ee08a70b4d8e3829e5c7daf191bf18b60 /container-search/src/test | |
parent | f2cebf8fc201dac284499ce45d6f26f4ffe39983 (diff) | |
parent | ba415d216374f974dde970a1cc39ba4212a18d01 (diff) |
Merge pull request #9043 from vespa-engine/revert-9026-bratseth/better-negative-number-heuristics
Revert "Better heuristics for negative numbers"
Diffstat (limited to 'container-search/src/test')
-rw-r--r-- | container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java | 22 | ||||
-rw-r--r-- | container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java | 11 |
2 files changed, 6 insertions, 27 deletions
diff --git a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java index 73f2ae7eb87..12f9ef2b18f 100644 --- a/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/query/parser/test/ParseTestCase.java @@ -1957,12 +1957,7 @@ public class ParseTestCase { @Test public void testNumbersAndNot() { - tester.assertParsed("AND a -12", "a -12", Query.Type.ALL); - } - - @Test - public void testNumbersAndDoubleNot() { - tester.assertParsed("+a --12", "a --12", Query.Type.ALL); + tester.assertParsed("+a -12", "a -12", Query.Type.ALL); } @Test @@ -1972,7 +1967,7 @@ public class ParseTestCase { @Test public void testSingleNegativeNumberLikeTerm() { - tester.assertParsed("-12", "-12", Query.Type.ALL); + tester.assertParsed(null, "-12", Query.Type.ALL); } @Test @@ -2009,12 +2004,7 @@ public class ParseTestCase { @Test public void testDecimalNumbersAndNot() { - tester.assertParsed("AND a -12.2", "a -12.2", Query.Type.ALL); - } - - @Test - public void testDecimalNumbersAndDoubleNot() { - tester.assertParsed("+a --12.2", "a --12.2", Query.Type.ALL); + tester.assertParsed("+a -12.2", "a -12.2", Query.Type.ALL); } @Test @@ -2024,7 +2014,7 @@ public class ParseTestCase { @Test public void testSingleNegativeDecimalNumberLikeTerm() { - tester.assertParsed("-12.2", "-12.2", Query.Type.ALL); + tester.assertParsed(null, "-12.2", Query.Type.ALL); } @Test @@ -2331,12 +2321,12 @@ public class ParseTestCase { @Test public void testSingleNegativeNumberLikeTermWeb() { - tester.assertParsed("-12", "-12", Query.Type.WEB); + tester.assertParsed(null, "-12", Query.Type.WEB); } @Test public void testSingleNegativeDecimalNumberLikeTermWeb() { - tester.assertParsed("-12.2", "-12.2", Query.Type.WEB); + tester.assertParsed(null, "-12.2", Query.Type.WEB); } @Test diff --git a/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java index 6173d710434..b5c4166e4de 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/UserInputTestCase.java @@ -118,17 +118,6 @@ public class UserInputTestCase { } @Test - public void testNegativeNumberComparison() { - URIBuilder builder = searchUri(); - builder.setParameter("myinput", "-5"); - builder.setParameter("yql", - "select * from ecitem where rank(([{\"defaultIndex\":\"myfield\"}](userInput(@myinput))));"); - Query query = searchAndAssertNoErrors(builder); - assertEquals("select * from ecitem where rank(myfield = (-5));", query.yqlRepresentation()); - assertEquals("RANK myfield:-5", query.getModel().getQueryTree().getRoot().toString()); - } - - @Test public void testAnnotatedUserInputUnrankedTerms() { URIBuilder builder = searchUri(); builder.setParameter("yql", |