2 files changed, 10 insertions, 10 deletions
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/client/AbstractClientApplicationTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/client/AbstractClientApplicationTestCase.java
index 5534a97a10c..3362726ddc7 100644
--- a/jdisc_core/src/test/java/com/yahoo/jdisc/client/AbstractClientApplicationTestCase.java
+++ b/jdisc_core/src/test/java/com/yahoo/jdisc/client/AbstractClientApplicationTestCase.java
@@ -6,7 +6,7 @@ import com.google.inject.Inject;
 import com.yahoo.jdisc.application.BundleInstaller;
 import com.yahoo.jdisc.application.ContainerActivator;
 import com.yahoo.jdisc.service.CurrentContainer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
@@ -16,8 +16,8 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Simon Thoresen Hult
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
 public class AbstractClientApplicationTestCase {
 
     @Test
-    public void requireThatApplicationCanBeShutdown() throws Exception {
+    void requireThatApplicationCanBeShutdown() throws Exception {
         MyDriver driver = newDriver();
         assertFalse(driver.awaitDone(100, TimeUnit.MILLISECONDS));
         assertTrue(driver.awaitApp(600, TimeUnit.SECONDS));
@@ -35,7 +35,7 @@ public class AbstractClientApplicationTestCase {
     }
 
     @Test
-    public void requireThatShutdownCanBeWaitedForWithTimeout() throws Exception {
+    void requireThatShutdownCanBeWaitedForWithTimeout() throws Exception {
         final MyDriver driver = newDriver();
         assertFalse(driver.awaitDone(100, TimeUnit.MILLISECONDS));
         assertTrue(driver.awaitApp(600, TimeUnit.SECONDS));
@@ -57,7 +57,7 @@ public class AbstractClientApplicationTestCase {
     }
 
     @Test
-    public void requireThatShutdownCanBeWaitedForWithoutTimeout() throws Exception {
+    void requireThatShutdownCanBeWaitedForWithoutTimeout() throws Exception {
         final MyDriver driver = newDriver();
         assertFalse(driver.awaitDone(100, TimeUnit.MILLISECONDS));
         assertTrue(driver.awaitApp(600, TimeUnit.SECONDS));
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/client/ClientDriverTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/client/ClientDriverTestCase.java
index cd7d5552287..159d8ef8f44 100644
--- a/jdisc_core/src/test/java/com/yahoo/jdisc/client/ClientDriverTestCase.java
+++ b/jdisc_core/src/test/java/com/yahoo/jdisc/client/ClientDriverTestCase.java
@@ -3,9 +3,9 @@ package com.yahoo.jdisc.client;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Inject;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 /**
@@ -14,14 +14,14 @@ import static org.junit.Assert.assertEquals;
 public class ClientDriverTestCase {
 
     @Test
-    public void requireThatApplicationInstanceInjectionWorks() throws Exception {
+    void requireThatApplicationInstanceInjectionWorks() throws Exception {
         MyModule module = new MyModule();
         ClientDriver.runApplication(new MyApplication(module));
         assertEquals(5, module.state);
     }
 
     @Test
-    public void requireThatApplicationClassInjectionWorks() throws Exception {
+    void requireThatApplicationClassInjectionWorks() throws Exception {
         MyModule module = new MyModule();
         ClientDriver.runApplication(MyApplication.class, module);
         assertEquals(5, module.state);