1 files changed, 48 insertions, 47 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileSubstitutionTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileSubstitutionTestCase.java
index 2173d72cab9..9c162df02bf 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileSubstitutionTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/test/QueryProfileSubstitutionTestCase.java
@@ -6,10 +6,10 @@ import com.yahoo.yolean.Exceptions;
 import com.yahoo.search.query.profile.QueryProfile;
 import com.yahoo.search.query.profile.QueryProfileProperties;
 import com.yahoo.search.query.profile.compiled.CompiledQueryProfile;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author bratseth
@@ -17,17 +17,17 @@ import static org.junit.Assert.fail;
 public class QueryProfileSubstitutionTestCase {
 
     @Test
-    public void testSubstitutionOnly() {
+    void testSubstitutionOnly() {
         QueryProfile p = new QueryProfile("test");
-        p.set("message","%{world}", null);
+        p.set("message", "%{world}", null);
         p.set("world", "world", null);
         assertEquals("world", p.compile(null).get("message"));
     }
 
     @Test
-    public void testSingleSubstitution() {
+    void testSingleSubstitution() {
         QueryProfile p = new QueryProfile("test");
-        p.set("message","Hello %{world}!", null);
+        p.set("message", "Hello %{world}!", null);
         p.set("world", "world", null);
         assertEquals("Hello world!", p.compile(null).get("message"));
 
@@ -38,15 +38,15 @@ public class QueryProfileSubstitutionTestCase {
     }
 
     @Test
-    public void testRelativeSubstitution() {
+    void testRelativeSubstitution() {
         QueryProfile p = new QueryProfile("test");
-        p.set("message","Hello %{.world}!", null);
+        p.set("message", "Hello %{.world}!", null);
         p.set("world", "world", null);
         assertEquals("Hello world!", p.compile(null).get("message"));
     }
 
     @Test
-    public void testRelativeSubstitutionNotFound() {
+    void testRelativeSubstitutionNotFound() {
         try {
             QueryProfile p = new QueryProfile("test");
             p.set("message", "Hello %{.world}!", null);
@@ -55,80 +55,80 @@ public class QueryProfileSubstitutionTestCase {
         }
         catch (IllegalArgumentException e) {
             assertEquals("Invalid query profile 'test': Could not resolve local substitution 'world' in variant []",
-                         Exceptions.toMessageString(e));
+                    Exceptions.toMessageString(e));
         }
     }
 
     @Test
-    public void testMultipleSubstitutions() {
+    void testMultipleSubstitutions() {
         QueryProfile p = new QueryProfile("test");
-        p.set("message","%{greeting} %{entity}%{exclamation}", null);
-        p.set("greeting","Hola", null);
-        p.set("entity","local group", null);
-        p.set("exclamation","?", null);
+        p.set("message", "%{greeting} %{entity}%{exclamation}", null);
+        p.set("greeting", "Hola", null);
+        p.set("entity", "local group", null);
+        p.set("exclamation", "?", null);
         assertEquals("Hola local group?", p.compile(null).get("message"));
 
         QueryProfile p2 = new QueryProfile("test2");
         p2.addInherited(p);
-        p2.set("entity","milky way", null);
+        p2.set("entity", "milky way", null);
         assertEquals("Hola milky way?", p2.compile(null).get("message"));
     }
 
     @Test
-    public void testUnclosedSubstitution1() {
+    void testUnclosedSubstitution1() {
         try {
             QueryProfile p = new QueryProfile("test");
-            p.set("message1","%{greeting} %{entity}%{exclamation", null);
+            p.set("message1", "%{greeting} %{entity}%{exclamation", null);
             fail("Should have produced an exception");
         }
         catch (IllegalArgumentException e) {
             assertEquals("Could not set 'message1' to '%{greeting} %{entity}%{exclamation': Unterminated value substitution '%{exclamation'",
-                         Exceptions.toMessageString(e));
+                    Exceptions.toMessageString(e));
         }
     }
 
     @Test
-    public void testUnclosedSubstitution2() {
+    void testUnclosedSubstitution2() {
         try {
             QueryProfile p = new QueryProfile("test");
-            p.set("message1","%{greeting} %{entity%{exclamation}", null);
+            p.set("message1", "%{greeting} %{entity%{exclamation}", null);
             fail("Should have produced an exception");
         }
         catch (IllegalArgumentException e) {
             assertEquals("Could not set 'message1' to '%{greeting} %{entity%{exclamation}': Unterminated value substitution '%{entity%{exclamation}'",
-                         Exceptions.toMessageString(e));
+                    Exceptions.toMessageString(e));
         }
     }
 
     @Test
-    public void testNullSubstitution() {
+    void testNullSubstitution() {
         QueryProfile p = new QueryProfile("test");
-        p.set("message","%{greeting} %{entity}%{exclamation}", null);
-        p.set("greeting","Hola", null);
+        p.set("message", "%{greeting} %{entity}%{exclamation}", null);
+        p.set("greeting", "Hola", null);
         assertEquals("Hola ", p.compile(null).get("message"));
 
         QueryProfile p2 = new QueryProfile("test2");
         p2.addInherited(p);
-        p2.set("greeting","Hola", null);
+        p2.set("greeting", "Hola", null);
         p2.set("exclamation", "?", null);
         assertEquals("Hola ?", p2.compile(null).get("message"));
     }
 
     @Test
-    public void testNoOverridingOfPropertiesSetAtRuntime() {
+    void testNoOverridingOfPropertiesSetAtRuntime() {
         QueryProfile p = new QueryProfile("test");
-        p.set("message","Hello %{world}!", null);
-        p.set("world","world", null);
+        p.set("message", "Hello %{world}!", null);
+        p.set("world", "world", null);
         p.freeze();
 
         Properties runtime = new QueryProfileProperties(p.compile(null));
-        runtime.set("runtimeMessage","Hello %{world}!");
+        runtime.set("runtimeMessage", "Hello %{world}!");
         assertEquals("Hello world!", runtime.get("message"));
-        assertEquals("Hello %{world}!",runtime.get("runtimeMessage"));
+        assertEquals("Hello %{world}!", runtime.get("runtimeMessage"));
     }
 
     @Test
-    public void testButPropertiesSetAtRuntimeAreUsedInSubstitutions() {
+    void testButPropertiesSetAtRuntimeAreUsedInSubstitutions() {
         QueryProfile p = new QueryProfile("test");
         p.set("message", "Hello %{world}!", null);
         p.set("world", "world", null);
@@ -139,21 +139,22 @@ public class QueryProfileSubstitutionTestCase {
     }
 
     @Test
-    public void testInspection() {
+    void testInspection() {
         QueryProfile p = new QueryProfile("test");
         p.set("message", "%{greeting} %{entity}%{exclamation}", null);
-        assertEquals("message","%{greeting} %{entity}%{exclamation}",
-                     p.declaredContent().entrySet().iterator().next().getValue().toString());
+        assertEquals("%{greeting} %{entity}%{exclamation}",
+                p.declaredContent().entrySet().iterator().next().getValue().toString(),
+                "message");
     }
 
     @Test
-    public void testVariants() {
+    void testVariants() {
         QueryProfile p = new QueryProfile("test");
-        p.set("message","Hello %{world}!", null);
-        p.set("world","world", null);
-        p.setDimensions(new String[] {"x"});
-        p.set("message","Halo %{world}!",new String[] {"x1"}, null);
-        p.set("world","Europe",new String[] {"x2"}, null);
+        p.set("message", "Hello %{world}!", null);
+        p.set("world", "world", null);
+        p.setDimensions(new String[]{"x"});
+        p.set("message", "Halo %{world}!", new String[]{"x1"}, null);
+        p.set("world", "Europe", new String[]{"x2"}, null);
 
         CompiledQueryProfile cp = p.compile(null);
         assertEquals("Hello world!", cp.get("message", QueryProfileVariantsTestCase.toMap("x=x?")));
@@ -162,12 +163,12 @@ public class QueryProfileSubstitutionTestCase {
     }
 
     @Test
-    public void testRecursion() {
+    void testRecursion() {
         QueryProfile p = new QueryProfile("test");
-        p.set("message","Hello %{world}!", null);
-        p.set("world","sol planet number %{number}", null);
-        p.set("number",3, null);
-        assertEquals("Hello sol planet number 3!",p.compile(null).get("message"));
+        p.set("message", "Hello %{world}!", null);
+        p.set("world", "sol planet number %{number}", null);
+        p.set("number", 3, null);
+        assertEquals("Hello sol planet number 3!", p.compile(null).get("message"));
     }
 
 }