1 files changed, 24 insertions, 24 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/test/SourceParametersTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/test/SourceParametersTestCase.java
index 0606636d0cb..50a19753e0c 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/test/SourceParametersTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/test/SourceParametersTestCase.java
@@ -7,10 +7,10 @@ import com.yahoo.search.pagetemplates.PageTemplateRegistry;
 import com.yahoo.search.pagetemplates.PageTemplateSearcher;
 import com.yahoo.search.pagetemplates.config.PageTemplateXMLReader;
 import com.yahoo.search.searchchain.Execution;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * @author bratseth
@@ -20,40 +20,40 @@ public class SourceParametersTestCase {
     private static final String root="src/test/java/com/yahoo/search/pagetemplates/test/";
 
     @Test
-    public void testSourceParametersWithSourcesDeterminedByTemplate() {
+    void testSourceParametersWithSourcesDeterminedByTemplate() {
         // Create the page template
-        PageTemplateRegistry pageTemplateRegistry=new PageTemplateRegistry();
-        PageTemplate page=importPage("SourceParameters.xml");
+        PageTemplateRegistry pageTemplateRegistry = new PageTemplateRegistry();
+        PageTemplate page = importPage("SourceParameters.xml");
         pageTemplateRegistry.register(page);
-        PageTemplateSearcher s=new PageTemplateSearcher(pageTemplateRegistry);
-        Query query=new Query("?query=foo&page.id=SourceParameters&page.resolver=native.deterministic");
+        PageTemplateSearcher s = new PageTemplateSearcher(pageTemplateRegistry);
+        Query query = new Query("?query=foo&page.id=SourceParameters&page.resolver=native.deterministic");
         new Execution(s, Execution.Context.createContextStub()).search(query);
-        assertEquals("source1p1Value",query.properties().get("source.source1.p1"));
-        assertEquals("source1p1Value",query.properties().get("source.source1.p1"));
-        assertEquals("source2p1Value",query.properties().get("source.source2.p1"));
-        assertEquals("source2p3Value",query.properties().get("source.source2.p3"));
-        assertEquals("source3p1Value",query.properties().get("source.source3.p1"));
-        assertEquals("We get the correct number of parameters",5,query.properties().listProperties("source").size());
+        assertEquals("source1p1Value", query.properties().get("source.source1.p1"));
+        assertEquals("source1p1Value", query.properties().get("source.source1.p1"));
+        assertEquals("source2p1Value", query.properties().get("source.source2.p1"));
+        assertEquals("source2p3Value", query.properties().get("source.source2.p3"));
+        assertEquals("source3p1Value", query.properties().get("source.source3.p1"));
+        assertEquals(5, query.properties().listProperties("source").size(), "We get the correct number of parameters");
     }
 
     @Test
-    public void testSourceParametersWithSourcesDeterminedByParameter() {
+    void testSourceParametersWithSourcesDeterminedByParameter() {
         // Create the page template
-        PageTemplateRegistry pageTemplateRegistry=new PageTemplateRegistry();
-        PageTemplate page=importPage("SourceParameters.xml");
+        PageTemplateRegistry pageTemplateRegistry = new PageTemplateRegistry();
+        PageTemplate page = importPage("SourceParameters.xml");
         pageTemplateRegistry.register(page);
-        PageTemplateSearcher s=new PageTemplateSearcher(pageTemplateRegistry);
-        Query query=new Query("?query=foo&page.id=SourceParameters&model.sources=source1,source3&page.resolver=native.deterministic");
+        PageTemplateSearcher s = new PageTemplateSearcher(pageTemplateRegistry);
+        Query query = new Query("?query=foo&page.id=SourceParameters&model.sources=source1,source3&page.resolver=native.deterministic");
         new Execution(s, Execution.Context.createContextStub()).search(query);
-        assertEquals("source1p1Value",query.properties().get("source.source1.p1"));
-        assertEquals("source1p1Value",query.properties().get("source.source1.p1"));
-        assertEquals("source3p1Value",query.properties().get("source.source3.p1"));
-        assertEquals("We get the correct number of parameters",3,query.properties().listProperties("source").size());
+        assertEquals("source1p1Value", query.properties().get("source.source1.p1"));
+        assertEquals("source1p1Value", query.properties().get("source.source1.p1"));
+        assertEquals("source3p1Value", query.properties().get("source.source3.p1"));
+        assertEquals(3, query.properties().listProperties("source").size(), "We get the correct number of parameters");
     }
 
     protected PageTemplate importPage(String name) {
         PageTemplate template=new PageTemplateXMLReader().readFile(root + name);
-        assertNotNull("Could look up read template '" + name + "'",template);
+        assertNotNull(template,"Could look up read template '" + name + "'");
         return template;
     }