Merge pull request #9043 from vespa-engine/revert-9026-bratseth/better-negative-number-heuristics

Revert "Better heuristics for negative numbers"

1 files changed, 6 insertions, 16 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