1 files changed, 45 insertions, 46 deletions
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 4af29822a26..8fe451dd095 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
@@ -1,14 +1,13 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.yql;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 import com.yahoo.search.query.QueryTree;
 import org.apache.http.client.utils.URIBuilder;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import com.yahoo.component.chain.Chain;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
@@ -30,14 +29,14 @@ public class UserInputTestCase {
     private Execution.Context context;
     private Execution execution;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         searchChain = new Chain<>(new MinimalQueryInserter());
         context = Execution.Context.createContextStub();
         execution = new Execution(searchChain, context);
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         searchChain = null;
         context = null;
@@ -45,7 +44,7 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testSimpleUserInput() {
+    void testSimpleUserInput() {
         {
             URIBuilder builder = searchUri();
             builder.setParameter("yql", "select * from sources * where userInput(\"nalle\")");
@@ -70,7 +69,7 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testRawUserInput() {
+    void testRawUserInput() {
         URIBuilder builder = searchUri();
         builder.setParameter("yql", "select * from sources * where {grammar: \"raw\"}userInput(\"nal le\")");
         Query query = searchAndAssertNoErrors(builder);
@@ -78,7 +77,7 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testSegmentedUserInput() {
+    void testSegmentedUserInput() {
         URIBuilder builder = searchUri();
         builder.setParameter("yql",
                 "select * from sources * where {grammar: \"segment\"}userInput(\"nal le\")");
@@ -87,7 +86,7 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testSegmentedNoiseUserInput() {
+    void testSegmentedNoiseUserInput() {
         URIBuilder builder = searchUri();
         builder.setParameter("yql",
                 "select * from sources * where {grammar: \"segment\"}userInput(\"^^^^^^^^\")");
@@ -96,45 +95,45 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testAnyParsedUserInput() {
+    void testAnyParsedUserInput() {
         URIBuilder builder = searchUri();
         builder.setParameter("yql", "select * from sources * where {grammar: \"any\"}userInput('foo bar')");
         Query query = searchAndAssertNoErrors(builder);
         assertEquals("select * from sources * where (default contains \"foo\" OR default contains \"bar\")",
-                     query.yqlRepresentation());
+                query.yqlRepresentation());
     }
 
     @Test
-    public void testAllParsedUserInput() {
+    void testAllParsedUserInput() {
         URIBuilder builder = searchUri();
         builder.setParameter("yql", "select * from sources * where {grammar: \"all\"}userInput('foo bar')");
         Query query = searchAndAssertNoErrors(builder);
         assertEquals("select * from sources * where (default contains \"foo\" AND default contains \"bar\")",
-                     query.yqlRepresentation());
+                query.yqlRepresentation());
     }
 
     @Test
-    public void testWeakAndParsedUserInput() {
+    void testWeakAndParsedUserInput() {
         URIBuilder builder = searchUri();
         builder.setParameter("yql", "select * from sources * where {grammar: \"weakAnd\"}userInput('foo bar')");
         Query query = searchAndAssertNoErrors(builder);
         assertEquals("select * from sources * where weakAnd(default contains \"foo\", default contains \"bar\")",
-                     query.yqlRepresentation());
+                query.yqlRepresentation());
     }
 
     @Test
-    public void testIllegalGrammar() {
+    void testIllegalGrammar() {
         URIBuilder builder = searchUri();
         builder.setParameter("yql", "select * from sources * where {grammar: \"nonesuch\"}userInput('foo bar')");
         Query query = new Query(builder.toString());
         Result r = execution.search(query);
         assertNotNull(r.hits().getError());
         assertEquals("Could not create query from YQL: No query type 'nonesuch'",
-                     r.hits().getError().getDetailedMessage());
+                r.hits().getError().getDetailedMessage());
     }
 
     @Test
-    public void testCustomDefaultIndexUserInput() {
+    void testCustomDefaultIndexUserInput() {
         URIBuilder builder = searchUri();
         builder.setParameter("yql",
                 "select * from sources * where {defaultIndex: \"glompf\"}userInput(\"nalle\")");
@@ -143,7 +142,7 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testAnnotatedUserInputStemming() {
+    void testAnnotatedUserInputStemming() {
         URIBuilder builder = searchUri();
         builder.setParameter("yql",
                 "select * from sources * where {stem: false}userInput(\"nalle\")");
@@ -154,18 +153,18 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testNegativeNumberComparison() {
+    void testNegativeNumberComparison() {
         URIBuilder builder = searchUri();
         builder.setParameter("myinput", "-5");
         builder.setParameter("yql",
-                             "select * from ecitem where rank(({defaultIndex:\"myfield\"}(userInput(@myinput))))");
+                "select * from ecitem where rank(({defaultIndex:\"myfield\"}(userInput(@myinput))))");
         Query query = searchAndAssertNoErrors(builder);
         assertEquals("select * from ecitem where rank(weakAnd(myfield = (-5)))", query.yqlRepresentation());
         assertEquals("RANK (WEAKAND(100) myfield:-5)", query.getModel().getQueryTree().getRoot().toString());
     }
 
     @Test
-    public void testAnnotatedUserInputUnrankedTerms() {
+    void testAnnotatedUserInputUnrankedTerms() {
         URIBuilder builder = searchUri();
         builder.setParameter("yql",
                 "select * from sources * where {ranked: false}userInput(\"nalle\")");
@@ -176,7 +175,7 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testAnnotatedUserInputFiltersTerms() {
+    void testAnnotatedUserInputFiltersTerms() {
         URIBuilder builder = searchUri();
         builder.setParameter("yql",
                 "select * from sources * where {filter: true}userInput(\"nalle\")");
@@ -187,7 +186,7 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testAnnotatedUserInputCaseNormalization() {
+    void testAnnotatedUserInputCaseNormalization() {
         URIBuilder builder = searchUri();
         builder.setParameter(
                 "yql",
@@ -199,7 +198,7 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testAnnotatedUserInputAccentRemoval() {
+    void testAnnotatedUserInputAccentRemoval() {
         URIBuilder builder = searchUri();
         builder.setParameter("yql",
                 "select * from sources * where {accentDrop: false}userInput(\"nalle\")");
@@ -210,7 +209,7 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testAnnotatedUserInputPositionData() {
+    void testAnnotatedUserInputPositionData() {
         URIBuilder builder = searchUri();
         builder.setParameter("yql",
                 "select * from sources * where {usePositionData: false}userInput(\"nalle\")");
@@ -221,7 +220,7 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testQueryPropertiesAsStringArguments() {
+    void testQueryPropertiesAsStringArguments() {
         URIBuilder builder = searchUri();
         builder.setParameter("nalle", "bamse");
         builder.setParameter("meta", "syntactic");
@@ -232,7 +231,7 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testReferenceInComparison() {
+    void testReferenceInComparison() {
         URIBuilder builder = searchUri();
         builder.setParameter("varref", "1980");
         builder.setParameter("yql", "select * from sources * where year > @varref");
@@ -241,22 +240,22 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testReferenceInContinuation() {
+    void testReferenceInContinuation() {
         URIBuilder builder = searchUri();
         builder.setParameter("continuation", "BCBCBCBEBG");
         builder.setParameter("yql",
-                             "select * from sources * where myfield contains 'token'" +
-                             "| {'continuations':[@continuation, 'BCBKCBACBKCCK'] }all(group(f) each(output(count())))");
+                "select * from sources * where myfield contains 'token'" +
+                        "| {'continuations':[@continuation, 'BCBKCBACBKCCK'] }all(group(f) each(output(count())))");
         Query query = searchAndAssertNoErrors(builder);
         assertEquals("select * from sources * where myfield contains \"token\" | { continuations:['BCBCBCBEBG', 'BCBKCBACBKCCK'] }all(group(f) each(output(count())))", query.yqlRepresentation());
     }
 
     @Test
-    public void testReferenceInEquiv() {
+    void testReferenceInEquiv() {
         URIBuilder builder = searchUri();
         builder.setParameter("term", "A");
         builder.setParameter("yql",
-                             "select foo from bar where fieldName contains equiv(@term,'B')");
+                "select foo from bar where fieldName contains equiv(@term,'B')");
         Query query = searchAndAssertNoErrors(builder);
         assertEquals("select foo from bar where fieldName contains equiv(\"A\", \"B\")", query.yqlRepresentation());
     }
@@ -264,7 +263,7 @@ public class UserInputTestCase {
     private Query searchAndAssertNoErrors(URIBuilder builder) {
         Query query = new Query(builder.toString());
         Result r = execution.search(query);
-        assertNull(stackTraceIfAny(r), r.hits().getError());
+        assertNull(r.hits().getError(), stackTraceIfAny(r));
         return query;
     }
 
@@ -281,14 +280,14 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testEmptyUserInput() {
+    void testEmptyUserInput() {
         URIBuilder builder = searchUri();
         builder.setParameter("yql", "select * from sources * where userInput(\"\")");
         assertQueryFails(builder);
     }
 
     @Test
-    public void testEmptyUserInputFromQueryProperty() {
+    void testEmptyUserInputFromQueryProperty() {
         URIBuilder builder = searchUri();
         builder.setParameter("foo", "");
         builder.setParameter("yql", "select * from sources * where userInput(@foo)");
@@ -296,7 +295,7 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testEmptyQueryProperty() {
+    void testEmptyQueryProperty() {
         URIBuilder builder = searchUri();
         builder.setParameter("foo", "");
         builder.setParameter("yql", "select * from sources * where bar contains \"a\" and nonEmpty(foo contains @foo)");
@@ -304,7 +303,7 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testEmptyQueryPropertyInsideExpression() {
+    void testEmptyQueryPropertyInsideExpression() {
         URIBuilder builder = searchUri();
         builder.setParameter("foo", "");
         builder.setParameter("yql",
@@ -313,7 +312,7 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testCompositeWithoutArguments() {
+    void testCompositeWithoutArguments() {
         URIBuilder builder = searchUri();
         builder.setParameter("yql", "select * from sources * where bar contains \"a\" and foo contains phrase()");
         searchAndAssertNoErrors(builder);
@@ -323,7 +322,7 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testAnnoyingPlacementOfNonEmpty() {
+    void testAnnoyingPlacementOfNonEmpty() {
         URIBuilder builder = searchUri();
         builder.setParameter("yql",
                 "select * from sources * where bar contains \"a\" and foo contains nonEmpty(phrase(\"a\", \"b\"))");
@@ -336,7 +335,7 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testAllowEmptyUserInput() {
+    void testAllowEmptyUserInput() {
         URIBuilder builder = searchUri();
         builder.setParameter("foo", "");
         builder.setParameter("yql", "select * from sources * where [{allowEmpty: true}]userInput(@foo)");
@@ -344,7 +343,7 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testAllowEmptyNullFromQueryParsing() {
+    void testAllowEmptyNullFromQueryParsing() {
         URIBuilder builder = searchUri();
         builder.setParameter("foo", ",,,,,,,,");
         builder.setParameter("yql", "select * from sources * where [{allowEmpty: true}]userInput(@foo)");
@@ -352,7 +351,7 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testDisallowEmptyNullFromQueryParsing() {
+    void testDisallowEmptyNullFromQueryParsing() {
         URIBuilder builder = searchUri();
         builder.setParameter("foo", ",,,,,,,,");
         builder.setParameter("yql", "select * from sources * where userInput(@foo)");
@@ -360,7 +359,7 @@ public class UserInputTestCase {
     }
 
     @Test
-    public void testUserInputWithEmptyRangeStart() {
+    void testUserInputWithEmptyRangeStart() {
         URIBuilder builder = searchUri();
         builder.setParameter("wql", "[;boom]");
         builder.setParameter("yql", "select * from sources * where ([{\"defaultIndex\": \"text_field\",\"grammar\": \"any\"}]userInput(@wql))");