1 files changed, 11 insertions, 9 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/image/ContainerImageDownloaderTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/image/ContainerImageDownloaderTest.java
index 7db8cb79949..9fd14e7e665 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/image/ContainerImageDownloaderTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/container/image/ContainerImageDownloaderTest.java
@@ -6,29 +6,31 @@ import com.yahoo.vespa.hosted.node.admin.component.TaskContext;
 import com.yahoo.vespa.hosted.node.admin.component.TestTaskContext;
 import com.yahoo.vespa.hosted.node.admin.container.ContainerEngineMock;
 import com.yahoo.vespa.hosted.node.admin.container.RegistryCredentials;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
-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 mpolden
  */
 public class ContainerImageDownloaderTest {
 
-    @Test(timeout = 5_000)
-    public void test_download() {
+    @Test
+    @Timeout(5_000)
+    void test_download() {
         ContainerEngineMock podman = new ContainerEngineMock().asyncImageDownload(true);
         ContainerImageDownloader downloader = new ContainerImageDownloader(podman);
         TaskContext context = new TestTaskContext();
         DockerImage image = DockerImage.fromString("registry.example.com/repo/vespa:7.42");
 
-        assertFalse("Download started", downloader.get(context, image, RegistryCredentials.none));
-        assertFalse("Download pending", downloader.get(context, image, RegistryCredentials.none));
+        assertFalse(downloader.get(context, image, RegistryCredentials.none), "Download started");
+        assertFalse(downloader.get(context, image, RegistryCredentials.none), "Download pending");
         podman.completeDownloadOf(image);
         boolean downloadCompleted;
-        while (!(downloadCompleted = downloader.get(context, image, RegistryCredentials.none)));
-        assertTrue("Download completed", downloadCompleted);
+        while (!(downloadCompleted = downloader.get(context, image, RegistryCredentials.none))) ;
+        assertTrue(downloadCompleted, "Download completed");
     }
 
 }