1 files changed, 18 insertions, 18 deletions
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");
     }
 }