Convert container-search to junit5

17 files changed, 293 insertions, 303 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java
index b8457344944..5b4f4e82221 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/MapPageTemplateXMLReadingTestCase.java
@@ -8,13 +8,11 @@ import com.yahoo.search.pagetemplates.model.MapChoice;
 import com.yahoo.search.pagetemplates.model.Placeholder;
 import com.yahoo.search.pagetemplates.model.Section;
 import com.yahoo.search.pagetemplates.model.Source;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author bratseth
@@ -24,13 +22,13 @@ public class MapPageTemplateXMLReadingTestCase {
     private String root="src/test/java/com/yahoo/search/pagetemplates/config/test/examples/mapexamples/";
 
     @Test
-    public void testMap1() {
-        PageTemplateRegistry registry=new PageTemplateXMLReader().read(root);
+    void testMap1() {
+        PageTemplateRegistry registry = new PageTemplateXMLReader().read(root);
         assertCorrectMap1(registry.getComponent("map1"));
     }
 
     private void assertCorrectMap1(PageTemplate page) {
-        assertNotNull("map1 was read",page);
+        assertNotNull(page,"map1 was read");
         Section root=page.getSection();
         assertTrue(((Section)((Section)root.elements(Section.class).get(0)).elements(Section.class).get(0)).elements().get(0) instanceof Placeholder);
         assertTrue(((Section)((Section)root.elements(Section.class).get(0)).elements(Section.class).get(1)).elements().get(0) instanceof Placeholder);
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java
index 1b845802ec3..5994cad468d 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/config/test/PageTemplateXMLReadingTestCase.java
@@ -13,15 +13,12 @@ import com.yahoo.search.pagetemplates.model.Choice;
 import com.yahoo.search.pagetemplates.model.Renderer;
 import com.yahoo.search.pagetemplates.model.Section;
 import com.yahoo.search.pagetemplates.model.Source;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author bratseth
@@ -31,8 +28,8 @@ public class PageTemplateXMLReadingTestCase {
     private String root="src/test/java/com/yahoo/search/pagetemplates/config/test/";
 
     @Test
-    public void testExamples() {
-        PageTemplateRegistry registry=new PageTemplateXMLReader().read(root + "examples");
+    void testExamples() {
+        PageTemplateRegistry registry = new PageTemplateXMLReader().read(root + "examples");
         assertCorrectSerp(registry.getComponent("serp"));
         assertCorrectSlottingSerp(registry.getComponent("slottingSerp"));
         assertCorrectRichSerp(registry.getComponent("richSerp"));
@@ -42,7 +39,7 @@ public class PageTemplateXMLReadingTestCase {
     }
 
     @Test
-    public void testConfigReading() {
+    void testConfigReading() {
         PageTemplatesConfig config = new PageTemplatesConfig(new PageTemplatesConfig.Builder()
                 .page("<page id=\"slottingSerp\" layout=\"mainAndRight\">\n    <section layout=\"column\" region=\"main\" source=\"*\" order=\"-[rank]\"/>\n    <section layout=\"column\" region=\"right\" source=\"ads\"/>\n</page>\n")
                 .page("<page id=\"richSerp\" layout=\"mainAndRight\">\n    <section layout=\"row\" region=\"main\">\n        <section layout=\"column\" description=\"left main pane\">\n            <section layout=\"row\" max=\"5\" description=\"Bar of images, from one of two possible sources\">\n                <choice method=\"annealing\">\n                    <source name=\"images\"/>\n                    <source name=\"flickr\"/>\n                </choice>\n            </section>\n            <section max=\"1\" source=\"local map video ticker weather\" description=\"A single relevant graphically rich element\"/>\n            <section order=\"-[rank]\" max=\"10\" source=\"web news\" description=\"Various kinds of traditional search results\"/>\n        </section>\n        <section layout=\"column\" order=\"[source]\" source=\"answers blogs twitter\" description=\"right main pane, ugc stuff, grouped by source\"/>\n    </section>\n    <section layout=\"column\" source=\"ads\" region=\"right\"/>\n</page>\n")
@@ -57,19 +54,19 @@ public class PageTemplateXMLReadingTestCase {
     }
 
     @Test
-    public void testInvalidFilename() {
+    void testInvalidFilename() {
         try {
-            PageTemplateRegistry registry=new PageTemplateXMLReader().read(root + "examples/invalidfilename");
-            assertEquals(0,registry.allComponents().size());
+            PageTemplateRegistry registry = new PageTemplateXMLReader().read(root + "examples/invalidfilename");
+            assertEquals(0, registry.allComponents().size());
             fail("Should have caused an exception");
         }
         catch (IllegalArgumentException e) {
-            assertEquals("The file name of page template 'notinvalid' must be 'notinvalid.xml' but was 'invalid.xml'",e.getMessage());
+            assertEquals("The file name of page template 'notinvalid' must be 'notinvalid.xml' but was 'invalid.xml'", e.getMessage());
         }
     }
 
     protected void assertCorrectSerp(PageTemplate page) {
-        assertNotNull("'serp' was read",page);
+        assertNotNull(page,"'serp' was read");
         Section rootSection=page.getSection();
         assertNotNull(rootSection);
         assertEquals("mainAndRight",rootSection.getLayout().getName());
@@ -84,7 +81,7 @@ public class PageTemplateXMLReadingTestCase {
     }
 
     protected void assertCorrectSlottingSerp(PageTemplate page) {
-        assertNotNull("'slotting serp' was read",page);
+        assertNotNull(page,"'slotting serp' was read");
         Section rootSection=page.getSection();
         Section main=(Section)rootSection.elements(Section.class).get(0);
         assertEquals("-[rank]",main.getOrder().toString());
@@ -94,7 +91,7 @@ public class PageTemplateXMLReadingTestCase {
     }
 
     protected void assertCorrectRichSerp(PageTemplate page) {
-        assertNotNull("'rich serp' was read",page);
+        assertNotNull(page,"'rich serp' was read");
         Section rootSection=page.getSection();
         assertNotNull(rootSection);
         assertEquals("mainAndRight",rootSection.getLayout().getName());
@@ -129,7 +126,7 @@ public class PageTemplateXMLReadingTestCase {
     }
 
     protected void assertCorrectRicherSerp(PageTemplate page) {
-        assertNotNull("'richer serp' was read",page);
+        assertNotNull(page,"'richer serp' was read");
 
         // Check resolution as we go
         Resolver resolver=new DeterministicResolver();
@@ -139,7 +136,7 @@ public class PageTemplateXMLReadingTestCase {
         assertNotNull(root);
         assertEquals("column",root.getLayout().getName());
 
-        assertEquals("Sections was correctly imported and combined with the section in this",4,root.elements(Section.class).size());
+        assertEquals(4,root.elements(Section.class).size(),"Sections was correctly imported and combined with the section in this");
 
         assertCorrectHeader((Section)root.elements(Section.class).get(0));
 
@@ -218,14 +215,13 @@ public class PageTemplateXMLReadingTestCase {
         Set<String> sourceNames=new HashSet<>();
         for (Source source : page.getSources())
             sourceNames.add(source.getName());
-        assertEquals("Expected " + expectedSourceNames.length + " elements in " + sourceNames,
-                     expectedSourceNames.length,sourceNames.size());
+        assertEquals(expectedSourceNames.length,sourceNames.size(),"Expected " + expectedSourceNames.length + " elements in " + sourceNames);
         for (String expectedSourceName : expectedSourceNames)
-            assertTrue("Sources did not include '" + expectedSourceName+ "'",sourceNames.contains(expectedSourceName));
+            assertTrue(sourceNames.contains(expectedSourceName),"Sources did not include '" + expectedSourceName+ "'");
     }
 
     protected void assertCorrectIncluder(PageTemplate page) {
-        assertNotNull("'includer' was read",page);
+        assertNotNull(page,"'includer' was read");
 
         Resolution resolution=new DeterministicResolver().resolve(Choice.createSingleton(page),null,null);
 
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/AnySourceTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/AnySourceTestCase.java
index 4ee07db691b..7e72a57b1dc 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/AnySourceTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/AnySourceTestCase.java
@@ -9,9 +9,9 @@ import com.yahoo.search.pagetemplates.engine.Resolver;
 import com.yahoo.search.pagetemplates.engine.resolvers.DeterministicResolver;
 import com.yahoo.search.pagetemplates.model.Choice;
 import com.yahoo.search.result.HitGroup;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author bratseth
@@ -19,41 +19,41 @@ import static org.junit.Assert.assertEquals;
 public class AnySourceTestCase extends ExecutionAbstractTestCase {
 
     @Test
-    public void testExecution() {
+    void testExecution() {
         // Create the page template
-        Choice page=Choice.createSingleton(importPage("AnySource.xml"));
+        Choice page = Choice.createSingleton(importPage("AnySource.xml"));
 
         // Create a federated result
-        Query query=new Query();
-        Result result=new Result(query);
-        result.hits().add(createHits("source1",3));
-        result.hits().add(createHits("source2",3));
-        result.hits().add(createHits("source3",3));
+        Query query = new Query();
+        Result result = new Result(query);
+        result.hits().add(createHits("source1", 3));
+        result.hits().add(createHits("source2", 3));
+        result.hits().add(createHits("source3", 3));
 
         // Resolve (noop here)
-        Resolver resolver=new DeterministicResolver();
-        Resolution resolution=resolver.resolve(page,query,result);
+        Resolver resolver = new DeterministicResolver();
+        Resolution resolution = resolver.resolve(page, query, result);
 
         // Execute
-        Organizer organizer =new Organizer();
-        organizer.organize(page,resolution,result);
+        Organizer organizer = new Organizer();
+        organizer.organize(page, resolution, result);
 
         // Check execution:
         // all three sources, ordered by relevance, source 3 first in each relevance group
-        HitGroup hits=result.hits();
-        assertEquals(9,hits.size());
-        assertEquals("source3-1",hits.get(0).getId().stringValue());
-        assertEquals("source1-1",hits.get(1).getId().stringValue());
-        assertEquals("source2-1",hits.get(2).getId().stringValue());
-        assertEquals("source3-2",hits.get(3).getId().stringValue());
-        assertEquals("source1-2",hits.get(4).getId().stringValue());
-        assertEquals("source2-2",hits.get(5).getId().stringValue());
-        assertEquals("source3-3",hits.get(6).getId().stringValue());
-        assertEquals("source1-3",hits.get(7).getId().stringValue());
-        assertEquals("source2-3",hits.get(8).getId().stringValue());
+        HitGroup hits = result.hits();
+        assertEquals(9, hits.size());
+        assertEquals("source3-1", hits.get(0).getId().stringValue());
+        assertEquals("source1-1", hits.get(1).getId().stringValue());
+        assertEquals("source2-1", hits.get(2).getId().stringValue());
+        assertEquals("source3-2", hits.get(3).getId().stringValue());
+        assertEquals("source1-2", hits.get(4).getId().stringValue());
+        assertEquals("source2-2", hits.get(5).getId().stringValue());
+        assertEquals("source3-3", hits.get(6).getId().stringValue());
+        assertEquals("source1-3", hits.get(7).getId().stringValue());
+        assertEquals("source2-3", hits.get(8).getId().stringValue());
 
         // Check rendering
-        assertRendered(result,"AnySourceResult.xml");
+        assertRendered(result, "AnySourceResult.xml");
     }
 
 }
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersTestCase.java
index b495f68464e..227afbce9dc 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfRenderersTestCase.java
@@ -10,9 +10,9 @@ import com.yahoo.search.pagetemplates.engine.Resolver;
 import com.yahoo.search.pagetemplates.engine.resolvers.DeterministicResolver;
 import com.yahoo.search.pagetemplates.model.Choice;
 import com.yahoo.search.pagetemplates.model.Renderer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author bratseth
@@ -21,31 +21,31 @@ public class ChoiceOfRenderersTestCase extends ExecutionAbstractTestCase {
 
     //This test is order dependent. Fix this!!
     @Test
-    public void testExecution() {
+    void testExecution() {
         // Create the page template
-        Choice page=Choice.createSingleton(importPage("ChoiceOfRenderers.xml"));
+        Choice page = Choice.createSingleton(importPage("ChoiceOfRenderers.xml"));
 
         // Create a federated result
-        Query query=new Query();
-        Result result=new Result(query);
-        result.hits().add(createHits("source1",3));
-        result.hits().add(createHits("source2",3));
-        result.hits().add(createHits("source3",3));
+        Query query = new Query();
+        Result result = new Result(query);
+        result.hits().add(createHits("source1", 3));
+        result.hits().add(createHits("source2", 3));
+        result.hits().add(createHits("source3", 3));
 
         // Resolve
-        Resolver resolver=new DeterministicResolver();
-        Resolution resolution=resolver.resolve(page,query,result);
-        assertEquals(1,resolution.getResolution((Choice)((PageTemplate)page.get(0).get(0)).getSection().elements(Renderer.class).get(0)));
-        assertEquals(2,resolution.getResolution((Choice)((PageTemplate)page.get(0).get(0)).getSection().elements(Renderer.class).get(1)));
+        Resolver resolver = new DeterministicResolver();
+        Resolution resolution = resolver.resolve(page, query, result);
+        assertEquals(1, resolution.getResolution((Choice) ((PageTemplate) page.get(0).get(0)).getSection().elements(Renderer.class).get(0)));
+        assertEquals(2, resolution.getResolution((Choice) ((PageTemplate) page.get(0).get(0)).getSection().elements(Renderer.class).get(1)));
 
         // Execute
-        Organizer organizer =new Organizer();
-        organizer.organize(page,resolution,result);
+        Organizer organizer = new Organizer();
+        organizer.organize(page, resolution, result);
 
-        assertEquals(6,result.getConcreteHitCount());
-        assertEquals(6,result.getHitCount());
+        assertEquals(6, result.getConcreteHitCount());
+        assertEquals(6, result.getHitCount());
 
         // Check rendering
-        assertRendered(result,"ChoiceOfRenderersResult.xml");
+        assertRendered(result, "ChoiceOfRenderersResult.xml");
     }
 }
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsTestCase.java
index 332d8612954..50db2810630 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfSubsectionsTestCase.java
@@ -8,12 +8,12 @@ import com.yahoo.search.pagetemplates.engine.Resolution;
 import com.yahoo.search.pagetemplates.engine.resolvers.DeterministicResolver;
 import com.yahoo.search.pagetemplates.model.Choice;
 import com.yahoo.search.result.HitGroup;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.stream.Collectors;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author bratseth
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals;
 public class ChoiceOfSubsectionsTestCase extends ExecutionAbstractTestCase {
 
     @Test
-    public void testExecution() {
+    void testExecution() {
         // Create the page template
         Choice page = Choice.createSingleton(importPage("ChoiceOfSubsections.xml"));
 
@@ -38,8 +38,8 @@ public class ChoiceOfSubsectionsTestCase extends ExecutionAbstractTestCase {
         // Check execution:
         // Two subsections with one source each
         assertEquals(2, result.hits().size());
-        HitGroup section1 = (HitGroup)result.hits().get(0);
-        HitGroup section2 = (HitGroup)result.hits().get(1);
+        HitGroup section1 = (HitGroup) result.hits().get(0);
+        HitGroup section2 = (HitGroup) result.hits().get(1);
         assertEquals("section", section1.types().stream().collect(Collectors.joining(", ")));
         assertEquals("section", section2.types().stream().collect(Collectors.joining(", ")));
         assertEqualHitGroups(createHits("source2", 3), section1);
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesTestCase.java
index b7fb22713f2..8849f73cfb6 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoiceOfTwoSourcesTestCase.java
@@ -10,9 +10,9 @@ import com.yahoo.search.pagetemplates.engine.Resolver;
 import com.yahoo.search.pagetemplates.engine.resolvers.DeterministicResolver;
 import com.yahoo.search.pagetemplates.model.Choice;
 import com.yahoo.search.pagetemplates.model.Source;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author bratseth
@@ -20,32 +20,32 @@ import static org.junit.Assert.assertEquals;
 public class ChoiceOfTwoSourcesTestCase extends ExecutionAbstractTestCase {
 
     @Test
-    public void testExecution() {
+    void testExecution() {
         // Create the page template
-        Choice page=Choice.createSingleton(importPage("ChoiceOfTwoSources.xml"));
+        Choice page = Choice.createSingleton(importPage("ChoiceOfTwoSources.xml"));
 
         // Create a federated result
-        Query query=new Query();
-        Result result=new Result(query);
-        result.hits().add(createHits("source1",3));
-        result.hits().add(createHits("source2",3));
-        result.hits().add(createHits("source3",3));
+        Query query = new Query();
+        Result result = new Result(query);
+        result.hits().add(createHits("source1", 3));
+        result.hits().add(createHits("source2", 3));
+        result.hits().add(createHits("source3", 3));
 
         // Resolve
-        Resolver resolver=new DeterministicResolver();
-        Resolution resolution=resolver.resolve(page,query,result);
-        assertEquals(1,resolution.getResolution((Choice)((PageTemplate)page.get(0).get(0)).getSection().elements(Source.class).get(0)));
+        Resolver resolver = new DeterministicResolver();
+        Resolution resolution = resolver.resolve(page, query, result);
+        assertEquals(1, resolution.getResolution((Choice) ((PageTemplate) page.get(0).get(0)).getSection().elements(Source.class).get(0)));
 
         // Execute
-        Organizer organizer =new Organizer();
-        organizer.organize(page,resolution,result);
+        Organizer organizer = new Organizer();
+        organizer.organize(page, resolution, result);
 
         // Check execution:
         // No subsections: Last choice (source2) used
-        assertEqualHitGroups(createHits("source2",3),result.hits());
+        assertEqualHitGroups(createHits("source2", 3), result.hits());
 
         // Check rendering
-        assertRendered(result,"ChoiceOfTwoSourcesResult.xml");
+        assertRendered(result, "ChoiceOfTwoSourcesResult.xml");
     }
 
 }
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesTestCase.java
index 629d690fda2..17d59b3e22f 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ChoicesTestCase.java
@@ -9,7 +9,7 @@ import com.yahoo.search.pagetemplates.engine.Resolver;
 import com.yahoo.search.pagetemplates.engine.resolvers.DeterministicResolver;
 import com.yahoo.search.pagetemplates.model.Choice;
 import com.yahoo.search.pagetemplates.model.PageElement;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,31 +20,31 @@ import java.util.List;
 public class ChoicesTestCase extends ExecutionAbstractTestCase {
 
     @Test
-    public void testExecution() {
+    void testExecution() {
         // Create the page template (second alternative will be chosen)
-        List<PageElement> pages=new ArrayList<>();
+        List<PageElement> pages = new ArrayList<>();
         pages.add(importPage("AnySource.xml"));
         pages.add(importPage("Choices.xml"));
-        Choice page=Choice.createSingletons(pages);
+        Choice page = Choice.createSingletons(pages);
 
         // Create a federated result
-        Query query=new Query();
-        Result result=new Result(query);
-        result.hits().add(createHits("news",3));
-        result.hits().add(createHits("web",3));
-        result.hits().add(createHits("blog",3));
-        result.hits().add(createHits("images",3));
+        Query query = new Query();
+        Result result = new Result(query);
+        result.hits().add(createHits("news", 3));
+        result.hits().add(createHits("web", 3));
+        result.hits().add(createHits("blog", 3));
+        result.hits().add(createHits("images", 3));
 
         // Resolve
-        Resolver resolver=new DeterministicResolver();
-        Resolution resolution=resolver.resolve(page,query,result);
+        Resolver resolver = new DeterministicResolver();
+        Resolution resolution = resolver.resolve(page, query, result);
 
         // Execute
-        Organizer organizer =new Organizer();
-        organizer.organize(page,resolution,result);
+        Organizer organizer = new Organizer();
+        organizer.organize(page, resolution, result);
 
         // Check rendering
-        assertRendered(result,"ChoicesResult.xml");
+        assertRendered(result, "ChoicesResult.xml");
     }
 
 }
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ExecutionAbstractTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ExecutionAbstractTestCase.java
index 5a8a4dfa9d2..3645b0efe37 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ExecutionAbstractTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/ExecutionAbstractTestCase.java
@@ -14,7 +14,7 @@ import java.io.ByteArrayOutputStream;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author bratseth
@@ -25,7 +25,7 @@ public class ExecutionAbstractTestCase {
 
     protected PageTemplate importPage(String name) {
         PageTemplate template=new PageTemplateXMLReader().readFile(root + name);
-        assertNotNull("Could look up page template '" + name + "'",template);
+        assertNotNull(template,"Could look up page template '" + name + "'");
         return template;
     }
 
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsTestCase.java
index 770e7f524e8..284c719b05e 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSectionsToSectionsTestCase.java
@@ -13,13 +13,13 @@ import com.yahoo.search.pagetemplates.model.MapChoice;
 import com.yahoo.search.pagetemplates.model.PageElement;
 import com.yahoo.search.pagetemplates.model.Section;
 import com.yahoo.search.result.HitGroup;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
 
-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
@@ -27,52 +27,52 @@ import static org.junit.Assert.assertNotNull;
 public class MapSectionsToSectionsTestCase extends ExecutionAbstractTestCase {
 
     @Test
-    public void testExecution() {
+    void testExecution() {
         // Create the page template
-        Choice page=Choice.createSingleton(importPage("MapSectionsToSections.xml"));
+        Choice page = Choice.createSingleton(importPage("MapSectionsToSections.xml"));
 
         // Create a federated result
-        Query query=new Query();
-        Result result=new Result(query);
-        result.hits().add(createHits("source1",3));
-        result.hits().add(createHits("source2",4));
-        result.hits().add(createHits("source3",5));
-        result.hits().add(createHits("source4",6));
-        result.hits().add(createHits("source5",7));
+        Query query = new Query();
+        Result result = new Result(query);
+        result.hits().add(createHits("source1", 3));
+        result.hits().add(createHits("source2", 4));
+        result.hits().add(createHits("source3", 5));
+        result.hits().add(createHits("source4", 6));
+        result.hits().add(createHits("source5", 7));
 
         // Resolve
-        Resolver resolver=new DeterministicResolverAssertingMethod();
-        Resolution resolution=resolver.resolve(page,query,result);
-        Map<String, List<PageElement>> mapping=
-                resolution.getResolution((MapChoice)((PageTemplate)page.get(0).get(0)).getSection().elements().get(2));
+        Resolver resolver = new DeterministicResolverAssertingMethod();
+        Resolution resolution = resolver.resolve(page, query, result);
+        Map<String, List<PageElement>> mapping =
+                resolution.getResolution((MapChoice) ((PageTemplate) page.get(0).get(0)).getSection().elements().get(2));
         assertNotNull(mapping);
-        assertEquals("box1",((Section)mapping.get("box1holder").get(0)).getId());
-        assertEquals("box2",((Section)mapping.get("box2holder").get(0)).getId());
-        assertEquals("box3",((Section)mapping.get("box3holder").get(0)).getId());
-        assertEquals("box4",((Section)mapping.get("box4holder").get(0)).getId());
+        assertEquals("box1", ((Section) mapping.get("box1holder").get(0)).getId());
+        assertEquals("box2", ((Section) mapping.get("box2holder").get(0)).getId());
+        assertEquals("box3", ((Section) mapping.get("box3holder").get(0)).getId());
+        assertEquals("box4", ((Section) mapping.get("box4holder").get(0)).getId());
 
         // Execute
-        Organizer organizer =new Organizer();
-        organizer.organize(page,resolution,result);
+        Organizer organizer = new Organizer();
+        organizer.organize(page, resolution, result);
 
         // Check execution:
         // Two subsections, each containing two sub-subsections with one source each
-        assertEquals(2,result.hits().size());
-        HitGroup row1=(HitGroup)result.hits().get(0);
-        HitGroup column11=(HitGroup)row1.get(0);
-        HitGroup column12=(HitGroup)row1.get(1);
-        HitGroup row2=(HitGroup)result.hits().get(1);
-        HitGroup column21a=(HitGroup)row2.get(0);
-        HitGroup column21b=(HitGroup)row2.get(1);
-        HitGroup column22=(HitGroup)row2.get(2);
-        assertEqualHitGroups(createHits("source1",3),column11);
-        assertEqualHitGroups(createHits("source2",4),column12);
-        assertEqualHitGroups(createHits("source3",5),column21a);
-        assertEqualHitGroups(createHits("source5",7),column21b);
-        assertEqualHitGroups(createHits("source4",6),column22);
+        assertEquals(2, result.hits().size());
+        HitGroup row1 = (HitGroup) result.hits().get(0);
+        HitGroup column11 = (HitGroup) row1.get(0);
+        HitGroup column12 = (HitGroup) row1.get(1);
+        HitGroup row2 = (HitGroup) result.hits().get(1);
+        HitGroup column21a = (HitGroup) row2.get(0);
+        HitGroup column21b = (HitGroup) row2.get(1);
+        HitGroup column22 = (HitGroup) row2.get(2);
+        assertEqualHitGroups(createHits("source1", 3), column11);
+        assertEqualHitGroups(createHits("source2", 4), column12);
+        assertEqualHitGroups(createHits("source3", 5), column21a);
+        assertEqualHitGroups(createHits("source5", 7), column21b);
+        assertEqualHitGroups(createHits("source4", 6), column22);
 
         // Check rendering
-        assertRendered(result,"MapSectionsToSectionsResult.xml");
+        assertRendered(result, "MapSectionsToSectionsResult.xml");
     }
 
     /** Same as deterministic resolver, but asserts that it received the correct method names for each map choice */
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsTestCase.java
index 8d8e39bd934..4d844c50cc9 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/MapSourcesToSectionsTestCase.java
@@ -13,13 +13,13 @@ import com.yahoo.search.pagetemplates.model.MapChoice;
 import com.yahoo.search.pagetemplates.model.PageElement;
 import com.yahoo.search.pagetemplates.model.Source;
 import com.yahoo.search.result.HitGroup;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
 
-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
@@ -27,50 +27,50 @@ import static org.junit.Assert.assertNotNull;
 public class MapSourcesToSectionsTestCase extends ExecutionAbstractTestCase {
 
     @Test
-    public void testExecution() {
+    void testExecution() {
         // Create the page template
-        Choice page=Choice.createSingleton(importPage("MapSourcesToSections.xml"));
+        Choice page = Choice.createSingleton(importPage("MapSourcesToSections.xml"));
 
         // Create a federated result
-        Query query=new Query();
-        Result result=new Result(query);
-        result.hits().add(createHits("source1",3));
-        result.hits().add(createHits("source2",4));
-        result.hits().add(createHits("source3",5));
-        result.hits().add(createHits("source4",6));
-        result.hits().add(createHits("source5",7));
+        Query query = new Query();
+        Result result = new Result(query);
+        result.hits().add(createHits("source1", 3));
+        result.hits().add(createHits("source2", 4));
+        result.hits().add(createHits("source3", 5));
+        result.hits().add(createHits("source4", 6));
+        result.hits().add(createHits("source5", 7));
 
         // Resolve
-        Resolver resolver=new DeterministicResolverAssertingMethod();
-        Resolution resolution=resolver.resolve(page,query,result);
-        Map<String, List<PageElement>> mapping=
-                resolution.getResolution((MapChoice)((PageTemplate)page.get(0).get(0)).getSection().elements().get(2));
+        Resolver resolver = new DeterministicResolverAssertingMethod();
+        Resolution resolution = resolver.resolve(page, query, result);
+        Map<String, List<PageElement>> mapping =
+                resolution.getResolution((MapChoice) ((PageTemplate) page.get(0).get(0)).getSection().elements().get(2));
         assertNotNull(mapping);
-        assertEquals("source1",((Source)mapping.get("box1source").get(0)).getName());
-        assertEquals("source2",((Source)mapping.get("box2source").get(0)).getName());
-        assertEquals("source3",((Source)mapping.get("box3source").get(0)).getName());
-        assertEquals("source4",((Source)mapping.get("box4source").get(0)).getName());
+        assertEquals("source1", ((Source) mapping.get("box1source").get(0)).getName());
+        assertEquals("source2", ((Source) mapping.get("box2source").get(0)).getName());
+        assertEquals("source3", ((Source) mapping.get("box3source").get(0)).getName());
+        assertEquals("source4", ((Source) mapping.get("box4source").get(0)).getName());
 
         // Execute
-        Organizer organizer =new Organizer();
-        organizer.organize(page,resolution,result);
+        Organizer organizer = new Organizer();
+        organizer.organize(page, resolution, result);
 
         // Check execution:
         // Two subsections, each containing two sub-subsections with one source each
-        assertEquals(2,result.hits().size());
-        HitGroup row1=(HitGroup)result.hits().get(0);
-        HitGroup column11=(HitGroup)row1.get(0);
-        HitGroup column12=(HitGroup)row1.get(1);
-        HitGroup row2=(HitGroup)result.hits().get(1);
-        HitGroup column21=(HitGroup)row2.get(0);
-        HitGroup column22=(HitGroup)row2.get(1);
-        assertEqualHitGroups(createHits("source1",3),column11);
-        assertEqualHitGroups(createHits("source2",4),column12);
-        assertEqualHitGroups(createHits("source3",5),column21);
-        assertEqualHitGroups(createHits("source4",6),column22);
+        assertEquals(2, result.hits().size());
+        HitGroup row1 = (HitGroup) result.hits().get(0);
+        HitGroup column11 = (HitGroup) row1.get(0);
+        HitGroup column12 = (HitGroup) row1.get(1);
+        HitGroup row2 = (HitGroup) result.hits().get(1);
+        HitGroup column21 = (HitGroup) row2.get(0);
+        HitGroup column22 = (HitGroup) row2.get(1);
+        assertEqualHitGroups(createHits("source1", 3), column11);
+        assertEqualHitGroups(createHits("source2", 4), column12);
+        assertEqualHitGroups(createHits("source3", 5), column21);
+        assertEqualHitGroups(createHits("source4", 6), column22);
 
         // Check rendering
-        assertRendered(result,"MapSourcesToSectionsResult.xml");
+        assertRendered(result, "MapSourcesToSectionsResult.xml");
     }
 
     /** Same as deterministic resolver, but asserts that it received the correct method names for each map choice */
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageTestCase.java
index 6a86f4f81aa..a985c7435d8 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageTestCase.java
@@ -8,7 +8,7 @@ import com.yahoo.search.pagetemplates.engine.Resolution;
 import com.yahoo.search.pagetemplates.engine.Resolver;
 import com.yahoo.search.pagetemplates.engine.resolvers.DeterministicResolver;
 import com.yahoo.search.pagetemplates.model.Choice;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests an example page.
@@ -18,7 +18,7 @@ import org.junit.Test;
 public class PageTestCase extends ExecutionAbstractTestCase {
 
     @Test
-    public void testExecution() {
+    void testExecution() {
         // Create the page template
         Choice page = Choice.createSingleton(importPage("Page.xml"));
 
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithBlendingTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithBlendingTestCase.java
index 69d35eb2b69..a4166b6d90f 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithBlendingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithBlendingTestCase.java
@@ -8,7 +8,7 @@ import com.yahoo.search.pagetemplates.engine.Resolution;
 import com.yahoo.search.pagetemplates.engine.Resolver;
 import com.yahoo.search.pagetemplates.engine.resolvers.DeterministicResolver;
 import com.yahoo.search.pagetemplates.model.Choice;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests an expanded example.
@@ -18,7 +18,7 @@ import org.junit.Test;
 public class PageWithBlendingTestCase extends ExecutionAbstractTestCase {
 
     @Test
-    public void testExecution() {
+    void testExecution() {
         // Create the page template
         Choice page = Choice.createSingleton(importPage("PageWithBlending.xml"));
 
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithSourceRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithSourceRendererTestCase.java
index 8cb35bf5e4f..7becf7f1895 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithSourceRendererTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/PageWithSourceRendererTestCase.java
@@ -8,7 +8,7 @@ import com.yahoo.search.pagetemplates.engine.Resolution;
 import com.yahoo.search.pagetemplates.engine.Resolver;
 import com.yahoo.search.pagetemplates.engine.resolvers.DeterministicResolver;
 import com.yahoo.search.pagetemplates.model.Choice;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests an example with two data sources with a renderer each.
@@ -18,7 +18,7 @@ import org.junit.Test;
 public class PageWithSourceRendererTestCase extends ExecutionAbstractTestCase {
 
     @Test
-    public void testExecution() {
+    void testExecution() {
         // Create the page template
         Choice page = Choice.createSingleton(importPage("PageWithSourceRenderer.xml"));
 
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceTestCase.java
index bcd6a462a62..349c39514ba 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/SourceChoiceTestCase.java
@@ -8,7 +8,7 @@ import com.yahoo.search.pagetemplates.engine.Resolution;
 import com.yahoo.search.pagetemplates.engine.Resolver;
 import com.yahoo.search.pagetemplates.engine.resolvers.DeterministicResolver;
 import com.yahoo.search.pagetemplates.model.Choice;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author bratseth
@@ -16,7 +16,7 @@ import org.junit.Test;
 public class SourceChoiceTestCase extends ExecutionAbstractTestCase {
 
     @Test
-    public void testExecution() {
+    void testExecution() {
         // Create the page template
         Choice page = Choice.createSingleton(importPage("SourceChoice.xml"));
 
@@ -29,14 +29,14 @@ public class SourceChoiceTestCase extends ExecutionAbstractTestCase {
 
         // Resolve (noop here)
         Resolver resolver = new DeterministicResolver();
-        Resolution resolution = resolver.resolve(page,query,result);
+        Resolution resolution = resolver.resolve(page, query, result);
 
         // Execute
         Organizer organizer = new Organizer();
         organizer.organize(page, resolution, result);
 
         // Check rendering
-        assertRendered(result,"SourceChoiceResult.xml", false);
+        assertRendered(result, "SourceChoiceResult.xml", false);
     }
 
 }
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesTestCase.java
index 8413b43e662..43bb16f8b14 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/engine/test/TwoSectionsFourSourcesTestCase.java
@@ -8,11 +8,11 @@ import com.yahoo.search.pagetemplates.engine.resolvers.DeterministicResolver;
 import com.yahoo.search.pagetemplates.model.Choice;
 import com.yahoo.search.result.Hit;
 import com.yahoo.search.result.HitGroup;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author bratseth
@@ -20,95 +20,95 @@ import static org.junit.Assert.assertEquals;
 public class TwoSectionsFourSourcesTestCase extends ExecutionAbstractTestCase {
 
     @Test
-    public void testExecution() {
+    void testExecution() {
         // Create the page template
-        Choice page=Choice.createSingleton(importPage("TwoSectionsFourSources.xml"));
+        Choice page = Choice.createSingleton(importPage("TwoSectionsFourSources.xml"));
 
         // Create a federated result
-        Query query=new Query();
-        Result result=new Result(query);
-        result.hits().add(createHits("source1",3));
-        result.hits().add(createHits("source2",4));
-        result.hits().add(createHits("source3",12));
-        result.hits().add(createHits("source4",13));
+        Query query = new Query();
+        Result result = new Result(query);
+        result.hits().add(createHits("source1", 3));
+        result.hits().add(createHits("source2", 4));
+        result.hits().add(createHits("source3", 12));
+        result.hits().add(createHits("source4", 13));
 
-        new Organizer().organize(page,new DeterministicResolver().resolve(page,query,result),result);
+        new Organizer().organize(page, new DeterministicResolver().resolve(page, query, result), result);
 
         // Check execution:
         // Two subsections with two sources each, the first grouped the second blended
-        assertEquals(2,result.hits().size());
-        HitGroup section1=(HitGroup)result.hits().get(0);
-        HitGroup section2=(HitGroup)result.hits().get(1);
+        assertEquals(2, result.hits().size());
+        HitGroup section1 = (HitGroup) result.hits().get(0);
+        HitGroup section2 = (HitGroup) result.hits().get(1);
         assertGroupedSource3Source1(section1.asList());
         assertBlendedSource4Source2(section2.asList());
 
         // Check rendering
-        assertRendered(result,"TwoSectionsFourSourcesResult.xml");
+        assertRendered(result, "TwoSectionsFourSourcesResult.xml");
     }
 
     @Test
-    public void testExecutionMissingOneSource() {
+    void testExecutionMissingOneSource() {
         // Create the page template
-        Choice page=Choice.createSingleton(importPage("TwoSectionsFourSources.xml"));
+        Choice page = Choice.createSingleton(importPage("TwoSectionsFourSources.xml"));
 
         // Create a federated result
-        Query query=new Query();
-        Result result=new Result(query);
-        result.hits().add(createHits("source1",3));
-        result.hits().add(createHits("source3",12));
-        result.hits().add(createHits("source4",13));
+        Query query = new Query();
+        Result result = new Result(query);
+        result.hits().add(createHits("source1", 3));
+        result.hits().add(createHits("source3", 12));
+        result.hits().add(createHits("source4", 13));
 
-        new Organizer().organize(page,new DeterministicResolver().resolve(page,query,result),result);
+        new Organizer().organize(page, new DeterministicResolver().resolve(page, query, result), result);
 
         // Check execution:
         // Two subsections with two sources each, the first grouped the second blended
-        assertEquals(2,result.hits().size());
-        HitGroup section1=(HitGroup)result.hits().get(0);
-        HitGroup section2=(HitGroup)result.hits().get(1);
+        assertEquals(2, result.hits().size());
+        HitGroup section1 = (HitGroup) result.hits().get(0);
+        HitGroup section2 = (HitGroup) result.hits().get(1);
         assertGroupedSource3Source1(section1.asList());
-        assertEqualHitGroups(createHits("source4",10),section2);
+        assertEqualHitGroups(createHits("source4", 10), section2);
     }
 
     @Test
-    public void testExecutionMissingTwoSources() {
+    void testExecutionMissingTwoSources() {
         // Create the page template
-        Choice page=Choice.createSingleton(importPage("TwoSectionsFourSources.xml"));
+        Choice page = Choice.createSingleton(importPage("TwoSectionsFourSources.xml"));
 
         // Create a federated result
-        Query query=new Query();
-        Result result=new Result(query);
-        result.hits().add(createHits("source1",3));
-        result.hits().add(createHits("source3",12));
+        Query query = new Query();
+        Result result = new Result(query);
+        result.hits().add(createHits("source1", 3));
+        result.hits().add(createHits("source3", 12));
 
-        new Organizer().organize(page,new DeterministicResolver().resolve(page,query,result),result);
+        new Organizer().organize(page, new DeterministicResolver().resolve(page, query, result), result);
 
         // Check execution:
         // Two subsections with two sources each, the first grouped the second blended
-        assertEquals(2,result.hits().size());
-        HitGroup section1=(HitGroup)result.hits().get(0);
-        HitGroup section2=(HitGroup)result.hits().get(1);
+        assertEquals(2, result.hits().size());
+        HitGroup section1 = (HitGroup) result.hits().get(0);
+        HitGroup section2 = (HitGroup) result.hits().get(1);
         assertGroupedSource3Source1(section1.asList());
-        assertEquals(0,section2.size());
+        assertEquals(0, section2.size());
     }
 
     @Test
-    public void testExecutionMissingAllSources() {
+    void testExecutionMissingAllSources() {
         // Create the page template
-        Choice page=Choice.createSingleton(importPage("TwoSectionsFourSources.xml"));
+        Choice page = Choice.createSingleton(importPage("TwoSectionsFourSources.xml"));
 
         // Create a federated result
-        Query query=new Query();
-        Result result=new Result(query);
+        Query query = new Query();
+        Result result = new Result(query);
 
-        new Organizer().organize(page,new DeterministicResolver().resolve(page,query,result),result);
+        new Organizer().organize(page, new DeterministicResolver().resolve(page, query, result), result);
 
         // Check execution:
         // Two subsections with two sources each, the first grouped the second blended
-        assertEquals(2,result.hits().size());
-        HitGroup section1=(HitGroup)result.hits().get(0);
-        HitGroup section2=(HitGroup)result.hits().get(1);
-        assertEquals(0,section1.size());
-        assertEquals(0,section2.size());
+        assertEquals(2, result.hits().size());
+        HitGroup section1 = (HitGroup) result.hits().get(0);
+        HitGroup section2 = (HitGroup) result.hits().get(1);
+        assertEquals(0, section1.size());
+        assertEquals(0, section2.size());
     }
 
     private void assertGroupedSource3Source1(List<Hit> hits) {
diff --git a/container-search/src/test/java/com/yahoo/search/pagetemplates/test/PageTemplateSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/pagetemplates/test/PageTemplateSearcherTestCase.java
index 7b10966a675..a38c3f164b9 100644
--- a/container-search/src/test/java/com/yahoo/search/pagetemplates/test/PageTemplateSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/pagetemplates/test/PageTemplateSearcherTestCase.java
@@ -18,15 +18,11 @@ import com.yahoo.search.result.Hit;
 import com.yahoo.search.result.HitGroup;
 import com.yahoo.search.searchchain.Execution;
 import com.yahoo.text.interpretation.Interpretation;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.*;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author bratseth
@@ -34,50 +30,50 @@ import static org.junit.Assert.fail;
 public class PageTemplateSearcherTestCase {
 
     @Test
-    public void testSearcher() {
+    void testSearcher() {
         PageTemplateSearcher s = new PageTemplateSearcher(createPageTemplateRegistry(), new FirstChoiceResolver());
-        Chain<Searcher> chain = new Chain<>(s,new MockFederator());
+        Chain<Searcher> chain = new Chain<>(s, new MockFederator());
 
         {
             // No template specified, should use default
-            Result result=new Execution(chain, Execution.Context.createContextStub()).search(new Query("?query=foo&page.resolver=native.deterministic"));
-            assertSources("source1 source2",result);
+            Result result = new Execution(chain, Execution.Context.createContextStub()).search(new Query("?query=foo&page.resolver=native.deterministic"));
+            assertSources("source1 source2", result);
         }
 
         {
-            Result result=new Execution(chain, Execution.Context.createContextStub()).search(new Query("?query=foo&page.id=oneSource&page.resolver=native.deterministic"));
-            assertSources("source1",result);
+            Result result = new Execution(chain, Execution.Context.createContextStub()).search(new Query("?query=foo&page.id=oneSource&page.resolver=native.deterministic"));
+            assertSources("source1", result);
         }
 
         {
-            Result result=new Execution(chain, Execution.Context.createContextStub()).search(new Query("?query=foo&page.id=twoSources&model.sources=source1&page.resolver=native.deterministic"));
-            assertSources("source1",result);
+            Result result = new Execution(chain, Execution.Context.createContextStub()).search(new Query("?query=foo&page.id=twoSources&model.sources=source1&page.resolver=native.deterministic"));
+            assertSources("source1", result);
         }
 
         {
-            Query query=new Query("?query=foo&page.resolver=native.deterministic");
+            Query query = new Query("?query=foo&page.resolver=native.deterministic");
             addIntentModelSpecifyingSource3(query);
-            Result result=new Execution(chain, Execution.Context.createContextStub()).search(query);
-            assertSources("source1 source2",result);
+            Result result = new Execution(chain, Execution.Context.createContextStub()).search(query);
+            assertSources("source1 source2", result);
         }
 
         {
-            Query query=new Query("?query=foo&page.id=twoSourcesAndAny&page.resolver=native.deterministic");
+            Query query = new Query("?query=foo&page.id=twoSourcesAndAny&page.resolver=native.deterministic");
             addIntentModelSpecifyingSource3(query);
-            Result result=new Execution(chain, Execution.Context.createContextStub()).search(query);
-            assertSources("source1 source2 source3",result);
+            Result result = new Execution(chain, Execution.Context.createContextStub()).search(query);
+            assertSources("source1 source2 source3", result);
         }
 
         {
-            Query query=new Query("?query=foo&page.id=anySource&page.resolver=native.deterministic");
+            Query query = new Query("?query=foo&page.id=anySource&page.resolver=native.deterministic");
             addIntentModelSpecifyingSource3(query);
-            Result result=new Execution(chain, Execution.Context.createContextStub()).search(query);
-            assertSources("source3",result);
+            Result result = new Execution(chain, Execution.Context.createContextStub()).search(query);
+            assertSources("source3", result);
         }
 
         {
-            Query query=new Query("?query=foo&page.id=anySource&page.resolver=native.deterministic");
-            Result result=new Execution(chain, Execution.Context.createContextStub()).search(query);
+            Query query = new Query("?query=foo&page.id=anySource&page.resolver=native.deterministic");
+            Result result = new Execution(chain, Execution.Context.createContextStub()).search(query);
             assertTrue(query.getModel().getSources().isEmpty());
             assertNotNull(result.hits().get("source1"));
             assertNotNull(result.hits().get("source2"));
@@ -85,38 +81,38 @@ public class PageTemplateSearcherTestCase {
         }
 
         {
-            Query query=new Query("?query=foo&page.id=choiceOfSources&page.resolver=native.deterministic");
-            Result result=new Execution(chain, Execution.Context.createContextStub()).search(query);
-            assertSources("source1 source2","source2",result);
+            Query query = new Query("?query=foo&page.id=choiceOfSources&page.resolver=native.deterministic");
+            Result result = new Execution(chain, Execution.Context.createContextStub()).search(query);
+            assertSources("source1 source2", "source2", result);
         }
 
         {
-            Query query=new Query("?query=foo&page.id=choiceOfSources&page.resolver=test.firstChoice");
-            Result result=new Execution(chain, Execution.Context.createContextStub()).search(query);
-            assertSources("source1 source2","source1",result);
+            Query query = new Query("?query=foo&page.id=choiceOfSources&page.resolver=test.firstChoice");
+            Result result = new Execution(chain, Execution.Context.createContextStub()).search(query);
+            assertSources("source1 source2", "source1", result);
         }
 
         { // Specifying two templates, should pick the last
-            Query query=new Query("?query=foo&page.id=threeSources+oneSource&page.resolver=native.deterministic");
-            Result result=new Execution(chain, Execution.Context.createContextStub()).search(query);
-            assertSources("source1 source2 source3","source1",result);
+            Query query = new Query("?query=foo&page.id=threeSources+oneSource&page.resolver=native.deterministic");
+            Result result = new Execution(chain, Execution.Context.createContextStub()).search(query);
+            assertSources("source1 source2 source3", "source1", result);
         }
 
         { // Specifying two templates as a list, should override the page.id setting
-            Query query=new Query("?query=foo&page.id=anySource&page.resolver=native.deterministic");
-            query.properties().set("page.idList",Arrays.asList("oneSource","threeSources"));
-            Result result=new Execution(chain, Execution.Context.createContextStub()).search(query);
-            assertSources("source1 source2 source3","source1 source2 source3",result);
+            Query query = new Query("?query=foo&page.id=anySource&page.resolver=native.deterministic");
+            query.properties().set("page.idList", Arrays.asList("oneSource", "threeSources"));
+            Result result = new Execution(chain, Execution.Context.createContextStub()).search(query);
+            assertSources("source1 source2 source3", "source1 source2 source3", result);
         }
 
         {
             try {
-                Query query=new Query("?query=foo&page.id=oneSource+choiceOfSources&page.resolver=noneSuch");
+                Query query = new Query("?query=foo&page.id=oneSource+choiceOfSources&page.resolver=noneSuch");
                 new Execution(chain, Execution.Context.createContextStub()).search(query);
                 fail("Expected exception");
             }
             catch (IllegalArgumentException e) {
-                assertEquals("No page template resolver 'noneSuch'",e.getMessage());
+                assertEquals("No page template resolver 'noneSuch'", e.getMessage());
             }
         }
 
@@ -182,9 +178,9 @@ public class PageTemplateSearcherTestCase {
         Set<String> expectedResultSources=new HashSet<>(Arrays.asList(expectedResultSourceString.split(" ")));
         for (String sourceName : Arrays.asList("source1 source2 source3".split(" "))) {
             if (expectedResultSources.contains(sourceName))
-                assertNotNull("Result contains '" + sourceName + "'",result.hits().get(sourceName));
+                assertNotNull(result.hits().get(sourceName),"Result contains '" + sourceName + "'");
             else
-                assertNull("Result does not contain '" + sourceName + "'",result.hits().get(sourceName));
+                assertNull(result.hits().get(sourceName),"Result does not contain '" + sourceName + "'");
         }
     }
 
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;
     }