aboutsummaryrefslogtreecommitdiffstats
path: root/container-core/src/test/java/com/yahoo/processing/ResponseTestCase.java
diff options
context:
space:
mode:
Diffstat (limited to 'container-core/src/test/java/com/yahoo/processing/ResponseTestCase.java')
-rw-r--r--container-core/src/test/java/com/yahoo/processing/ResponseTestCase.java30
1 files changed, 15 insertions, 15 deletions
diff --git a/container-core/src/test/java/com/yahoo/processing/ResponseTestCase.java b/container-core/src/test/java/com/yahoo/processing/ResponseTestCase.java
index f8cd646909d..274bd2050f2 100644
--- a/container-core/src/test/java/com/yahoo/processing/ResponseTestCase.java
+++ b/container-core/src/test/java/com/yahoo/processing/ResponseTestCase.java
@@ -5,11 +5,11 @@ import com.yahoo.processing.response.ArrayDataList;
import com.yahoo.processing.response.DataList;
import com.yahoo.processing.test.ProcessorLibrary;
import com.yahoo.processing.test.Responses;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.concurrent.ExecutionException;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
/**
* @author bratseth
@@ -24,7 +24,7 @@ public class ResponseTestCase {
*/
@SuppressWarnings({"unchecked"})
@Test
- public void testRecursiveCompletionAndToString() throws InterruptedException, ExecutionException {
+ void testRecursiveCompletionAndToString() throws InterruptedException, ExecutionException {
// create lists
Request request = new Request();
DataList list1 = ArrayDataList.create(request);
@@ -48,22 +48,22 @@ public class ResponseTestCase {
list123.add(list1231);
list123.add(list1232);
// add sync data elements
- list1.add(new ProcessorLibrary.StringData(request,"list1"));
- list12.add(new ProcessorLibrary.StringData(request,"list12"));
- list14.add(new ProcessorLibrary.StringData(request,"list14"));
- list122.add(new ProcessorLibrary.StringData(request,"list122"));
- list1231.add(new ProcessorLibrary.StringData(request,"list1231"));
+ list1.add(new ProcessorLibrary.StringData(request, "list1"));
+ list12.add(new ProcessorLibrary.StringData(request, "list12"));
+ list14.add(new ProcessorLibrary.StringData(request, "list14"));
+ list122.add(new ProcessorLibrary.StringData(request, "list122"));
+ list1231.add(new ProcessorLibrary.StringData(request, "list1231"));
- assertEqualsIgnoreObjectNumbers("Uncompleted tree, no incoming",uncompletedTreeUncompletedIncoming,Responses.recursiveToString(list1));
+ assertEqualsIgnoreObjectNumbers("Uncompleted tree, no incoming", uncompletedTreeUncompletedIncoming, Responses.recursiveToString(list1));
// provide all async incoming data
list12.incoming().markComplete();
- list121.incoming().addLast(new ProcessorLibrary.StringData(request,"list121async1"));
+ list121.incoming().addLast(new ProcessorLibrary.StringData(request, "list121async1"));
list123.incoming().markComplete();
- list1231.incoming().add(new ProcessorLibrary.StringData(request,"list13231async1"));
- list1231.incoming().addLast(new ProcessorLibrary.StringData(request,"list1231async2"));
- list13.incoming().add(new ProcessorLibrary.StringData(request,"list13async1"));
- list13.incoming().addLast(new ProcessorLibrary.StringData(request,"list13async2"));
+ list1231.incoming().add(new ProcessorLibrary.StringData(request, "list13231async1"));
+ list1231.incoming().addLast(new ProcessorLibrary.StringData(request, "list1231async2"));
+ list13.incoming().add(new ProcessorLibrary.StringData(request, "list13async1"));
+ list13.incoming().addLast(new ProcessorLibrary.StringData(request, "list13async2"));
assertEqualsIgnoreObjectNumbers("Uncompleted tree, incoming complete", uncompletedTreeCompletedIncoming, Responses.recursiveToString(list1));
@@ -73,7 +73,7 @@ public class ResponseTestCase {
}
private void assertEqualsIgnoreObjectNumbers(String explanation,String expected,String actual) {
- assertEquals(explanation,expected,removeObjectNumbers(actual));
+ assertEquals(expected,removeObjectNumbers(actual),explanation);
}
/** Removes all object numbers (occurrences of @hexnumber) */