1 files changed, 45 insertions, 35 deletions
diff --git a/application/src/test/java/com/yahoo/application/container/ContainerDocprocTest.java b/application/src/test/java/com/yahoo/application/container/ContainerDocprocTest.java
index 7c786d35fab..7dad204a8ce 100644
--- a/application/src/test/java/com/yahoo/application/container/ContainerDocprocTest.java
+++ b/application/src/test/java/com/yahoo/application/container/ContainerDocprocTest.java
@@ -13,12 +13,13 @@ import com.yahoo.document.Document;
 import com.yahoo.document.DocumentPut;
 import com.yahoo.document.DocumentType;
 import com.yahoo.processing.execution.chain.ChainRegistry;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Einar M R Rosenvinge
@@ -47,16 +48,16 @@ public class ContainerDocprocTest {
         return xml;
     }
 
-    @Before
+    @BeforeEach
     public void resetContainer() {
         Container.resetInstance();
     }
 
     @Test
-    public void requireThatBasicDocumentProcessingWorks() throws Exception {
+    void requireThatBasicDocumentProcessingWorks() throws Exception {
         try (Application app = new ApplicationBuilder()
-                        .servicesXml(getXML(CHAIN_NAME, Rot13DocumentProcessor.class.getCanonicalName()))
-                        .documentType("music", DOCUMENT).build()) {
+                .servicesXml(getXML(CHAIN_NAME, Rot13DocumentProcessor.class.getCanonicalName()))
+                .documentType("music", DOCUMENT).build()) {
 
             JDisc container = app.getJDisc("container");
             DocumentProcessing docProc = container.documentProcessing();
@@ -84,11 +85,11 @@ public class ContainerDocprocTest {
     }
 
     @Test
-    public void requireThatLaterDocumentProcessingWorks() throws Exception {
+    void requireThatLaterDocumentProcessingWorks() throws Exception {
         try (Application app = new ApplicationBuilder()
-                        .servicesXml(getXML(CHAIN_NAME, Rot13DocumentProcessor.class.getCanonicalName()))
-                        .networking(Networking.disable)
-                        .documentType("music", DOCUMENT).build()) {
+                .servicesXml(getXML(CHAIN_NAME, Rot13DocumentProcessor.class.getCanonicalName()))
+                .networking(Networking.disable)
+                .documentType("music", DOCUMENT).build()) {
             JDisc container = app.getJDisc("container");
             DocumentProcessing docProc = container.documentProcessing();
             DocumentType type = docProc.getDocumentTypes().get("music");
@@ -118,35 +119,44 @@ public class ContainerDocprocTest {
         }
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void requireThatUnknownChainThrows() {
-        try (JDisc container = JDisc.fromServicesXml(
-                getXML("foo", Rot13DocumentProcessor.class.getCanonicalName()),
-                Networking.disable)) {
-            container.documentProcessing().process(ComponentSpecification.fromString("unknown"),
-                    new com.yahoo.docproc.Processing());
-        }
+    @Test
+    void requireThatUnknownChainThrows() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            try (JDisc container = JDisc.fromServicesXml(
+                    getXML("foo", Rot13DocumentProcessor.class.getCanonicalName()),
+                    Networking.disable)) {
+                container.documentProcessing().process(ComponentSpecification.fromString("unknown"),
+                        new com.yahoo.docproc.Processing());
+            }
+
+        });
 
     }
 
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void requireThatProcessingFails() {
-        try (JDisc container = JDisc.fromServicesXml(
-                getXML("foo", Rot13DocumentProcessor.class.getCanonicalName()),
-                Networking.disable)) {
-            container.processing();
-        }
+    @Test
+    void requireThatProcessingFails() {
+        assertThrows(UnsupportedOperationException.class, () -> {
+            try (JDisc container = JDisc.fromServicesXml(
+                    getXML("foo", Rot13DocumentProcessor.class.getCanonicalName()),
+                    Networking.disable)) {
+                container.processing();
+            }
+
+        });
 
     }
 
-    @Test(expected = UnsupportedOperationException.class)
-    public void requireThatSearchFails() {
-        try (JDisc container = JDisc.fromServicesXml(
-                getXML("foo", Rot13DocumentProcessor.class.getCanonicalName()),
-                Networking.disable)) {
-            container.search();
-        }
+    @Test
+    void requireThatSearchFails() {
+        assertThrows(UnsupportedOperationException.class, () -> {
+            try (JDisc container = JDisc.fromServicesXml(
+                    getXML("foo", Rot13DocumentProcessor.class.getCanonicalName()),
+                    Networking.disable)) {
+                container.search();
+            }
+
+        });
 
     }