1 files changed, 18 insertions, 17 deletions

diff --git a/application/src/test/java/com/yahoo/application/container/ContainerTest.java b/application/src/test/java/com/yahoo/application/container/ContainerTest.java
index fda8e0c597a..31e0b71d186 100644
--- a/application/src/test/java/com/yahoo/application/container/ContainerTest.java
+++ b/application/src/test/java/com/yahoo/application/container/ContainerTest.java
@@ -10,17 +10,17 @@ import com.yahoo.application.container.handlers.TestHandler;
 import com.yahoo.component.ComponentSpecification;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.nio.charset.CharacterCodingException;
 import java.nio.file.FileSystems;
 
 import static com.yahoo.application.container.JDisc.fromServicesXml;
-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.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Tony Vaagenes
@@ -30,7 +30,7 @@ import static org.junit.Assert.fail;
 public class ContainerTest {
 
     @Test
-    public void container_can_be_used_as_top_level_element() {
+    void container_can_be_used_as_top_level_element() {
         try (JDisc container = fromServicesXml("<container version=\"1.0\">" + //
                 "<search />" + //
                 "</container>", Networking.disable)) {
@@ -39,7 +39,7 @@ public class ContainerTest {
     }
 
     @Test
-    public void container_id_can_be_set() {
+    void container_id_can_be_set() {
         try (JDisc container = fromServicesXml("<container version=\"1.0\" id=\"my-service-id\">" + //
                 "<search />" + //
                 "</container>", Networking.disable)) {
@@ -48,7 +48,7 @@ public class ContainerTest {
     }
 
     @Test
-    public void container_can_be_embedded_in_services_tag() {
+    void container_can_be_embedded_in_services_tag() {
         try (JDisc container = fromServicesXml("<services>" + //
                 "<container version=\"1.0\" id=\"my-service-id\">" + //
                 "<search />" + //
@@ -58,9 +58,10 @@ public class ContainerTest {
         }
     }
 
+    // container is unused inside the try block
     @Test
-    @SuppressWarnings("try") // container is unused inside the try block
-    public void multiple_container_elements_gives_exception() {
+    @SuppressWarnings("try")
+    void multiple_container_elements_gives_exception() {
         try (JDisc container = fromServicesXml("<services>" + //
                 "<container version=\"1.0\" id=\"id1\" />" + //
                 "<container version=\"1.0\" />" + //
@@ -72,7 +73,7 @@ public class ContainerTest {
     }
 
     @Test
-    public void handleRequest_yields_response_from_correct_request_handler() {
+    void handleRequest_yields_response_from_correct_request_handler() {
         final String handlerClass = TestHandler.class.getName();
         try (JDisc container = fromServicesXml("<container version=\"1.0\">" + //
                 "<handler id=\"test-handler\" class=\"" + handlerClass + "\">" + //
@@ -89,7 +90,7 @@ public class ContainerTest {
     }
 
     @Test
-    public void load_searcher_from_bundle() {
+    void load_searcher_from_bundle() {
         try (JDisc container = JDisc.fromPath(FileSystems.getDefault().getPath("src/test/app-packages/searcher-app"),
                 Networking.disable)) {
             Result result = container.search().process(ComponentSpecification.fromString("default"),
@@ -99,7 +100,7 @@ public class ContainerTest {
     }
 
     @Test
-    public void document_types_can_be_accessed() throws Exception {
+    void document_types_can_be_accessed() throws Exception {
         try (Application application = new ApplicationBuilder().documentType("example", EXAMPLE_DOCUMENT)
                 .servicesXml(CONTAINER_WITH_DOCUMENT_PROCESSING).build()) {
             JDisc container = application.getJDisc("container");
@@ -109,7 +110,7 @@ public class ContainerTest {
     }
 
     @Test
-    public void annotation_types_can_be_accessed() throws Exception {
+    void annotation_types_can_be_accessed() throws Exception {
         try (Application application = new ApplicationBuilder().documentType("example", "search example {\n" + //
                 "  " + EXAMPLE_DOCUMENT + "\n" + //
                 "  annotation exampleAnnotation {}\n" + //
@@ -121,9 +122,9 @@ public class ContainerTest {
         }
     }
 
-    @Ignore // Enable this when static state has been removed.
+    @Disabled // Enable this when static state has been removed.
     @Test
-    public void multiple_containers_can_be_run_in_parallel() throws Exception {
+    void multiple_containers_can_be_run_in_parallel() throws Exception {
         try (JDisc jdisc1 = jdiscWithHttp(); JDisc jdisc2 = jdiscWithHttp()) {
             sendRequest(jdisc1);
             sendRequest(jdisc2);