1 files changed, 37 insertions, 40 deletions

diff --git a/container-core/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java b/container-core/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java
index c8c489b2f9d..ce7a747d676 100644
--- a/container-core/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java
+++ b/container-core/src/test/java/com/yahoo/processing/execution/test/ExecutionContextTestCase.java
@@ -5,16 +5,13 @@ import com.yahoo.component.chain.Chain;
 import com.yahoo.processing.Processor;
 import com.yahoo.processing.execution.Execution;
 import com.yahoo.processing.test.ProcessorLibrary;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author bratseth
@@ -25,53 +22,53 @@ public class ExecutionContextTestCase {
 
     /** Tests combined use of trace messages, context values and access log entries */
     @Test
-    public void testtrace() {
-        Execution execution1=Execution.createRoot(chain,2,Execution.Environment.createEmpty());
-        execution1.trace().setProperty("a","a1");
-        execution1.trace().logValue("a","a1");
+    void testtrace() {
+        Execution execution1 = Execution.createRoot(chain, 2, Execution.Environment.createEmpty());
+        execution1.trace().setProperty("a", "a1");
+        execution1.trace().logValue("a", "a1");
         execution1.trace().trace("root 1", 2);
-        execution1.trace().setProperty("a","a2");
-        execution1.trace().setProperty("b","b1");
-        execution1.trace().logValue("a","a2");
-        execution1.trace().logValue("b","b1");
-
-        Execution execution2=new Execution(chain,execution1);
-        execution2.trace().setProperty("b","b2");
-        execution2.trace().logValue("b","b2");
+        execution1.trace().setProperty("a", "a2");
+        execution1.trace().setProperty("b", "b1");
+        execution1.trace().logValue("a", "a2");
+        execution1.trace().logValue("b", "b1");
+
+        Execution execution2 = new Execution(chain, execution1);
+        execution2.trace().setProperty("b", "b2");
+        execution2.trace().logValue("b", "b2");
         execution2.trace().trace("  child-1 1", 2);
         execution2.trace().setProperty("b", "b3");
-        execution2.trace().logValue("b","b3");
+        execution2.trace().logValue("b", "b3");
 
-        execution1.trace().setProperty("b","b4");
-        execution1.trace().logValue("b","b4");
+        execution1.trace().setProperty("b", "b4");
+        execution1.trace().logValue("b", "b4");
 
-        Execution execution3=new Execution(chain,execution1);
-        execution3.trace().setProperty("b","b5");
-        execution3.trace().setProperty("c","c1");
-        execution3.trace().logValue("b","b5");
-        execution3.trace().logValue("c","c1");
+        Execution execution3 = new Execution(chain, execution1);
+        execution3.trace().setProperty("b", "b5");
+        execution3.trace().setProperty("c", "c1");
+        execution3.trace().logValue("b", "b5");
+        execution3.trace().logValue("c", "c1");
         execution3.trace().trace("  child-2 1", 2);
 
-        execution2.trace().setProperty("c","c2");
-        execution2.trace().logValue("c","c2");
+        execution2.trace().setProperty("c", "c2");
+        execution2.trace().logValue("c", "c2");
 
         execution1.trace().trace("root 2", 2);
         execution3.trace().setProperty("d", "d1");
-        execution1.trace().logValue("d","d1");
+        execution1.trace().logValue("d", "d1");
 
         execution2.trace().trace("  child-1 2", 2);
         execution2.trace().setProperty("c", "c3");
-        execution2.trace().logValue("c","c3");
+        execution2.trace().logValue("c", "c3");
 
-        execution1.trace().setProperty("c","c4");
-        execution1.trace().logValue("c","c4");
+        execution1.trace().setProperty("c", "c4");
+        execution1.trace().logValue("c", "c4");
 
-        Iterator<String> traceIterator=execution1.trace().traceNode().root().descendants(String.class).iterator();
-        assertEquals("root 1",traceIterator.next());
-        assertEquals("  child-1 1",traceIterator.next());
-        assertEquals("  child-1 2",traceIterator.next());
-        assertEquals("  child-2 1",traceIterator.next());
-        assertEquals("root 2",traceIterator.next());
+        Iterator<String> traceIterator = execution1.trace().traceNode().root().descendants(String.class).iterator();
+        assertEquals("root 1", traceIterator.next());
+        assertEquals("  child-1 1", traceIterator.next());
+        assertEquals("  child-1 2", traceIterator.next());
+        assertEquals("  child-2 1", traceIterator.next());
+        assertEquals("root 2", traceIterator.next());
         assertFalse(traceIterator.hasNext());
 
         // Verify context variables
@@ -82,10 +79,10 @@ public class ExecutionContextTestCase {
         assertNull(execution1.trace().getProperty("e"));
 
         // Verify access log
-        Set<String> logValues=new HashSet<>();
-        for (Iterator<Execution.Trace.LogValue> logValueIterator=execution1.trace().logValueIterator(); logValueIterator.hasNext(); )
+        Set<String> logValues = new HashSet<>();
+        for (Iterator<Execution.Trace.LogValue> logValueIterator = execution1.trace().logValueIterator(); logValueIterator.hasNext(); )
             logValues.add(logValueIterator.next().toString());
-        assertEquals(12,logValues.size());
+        assertEquals(12, logValues.size());
         assertTrue(logValues.contains("a=a1"));
         assertTrue(logValues.contains("a=a2"));
         assertTrue(logValues.contains("b=b1"));