Merge pull request #23555 from vespa-engine/bjorncs/more-junit5v8.26.15

Bjorncs/more junit5

1 files changed, 12 insertions, 11 deletions

diff --git a/application/src/test/java/com/yahoo/application/container/ContainerModelEvaluationTest.java b/application/src/test/java/com/yahoo/application/container/ContainerModelEvaluationTest.java
index f76008b4e02..656660f7580 100644
--- a/application/src/test/java/com/yahoo/application/container/ContainerModelEvaluationTest.java
+++ b/application/src/test/java/com/yahoo/application/container/ContainerModelEvaluationTest.java
@@ -9,16 +9,16 @@ import com.yahoo.application.container.handler.Response;
 import com.yahoo.tensor.Tensor;
 import com.yahoo.tensor.TensorType;
 import com.yahoo.test.json.JsonTestHelper;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.net.URLEncoder;
 import java.nio.charset.CharacterCodingException;
 import java.nio.charset.StandardCharsets;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 /**
  * Verify that we can create a JDisc (and hence Application) instance capable of doing model evaluation
@@ -27,22 +27,23 @@ import static org.junit.Assume.assumeTrue;
  */
 public class ContainerModelEvaluationTest {
 
+    // This should ideally work but may not be worth the effort
     @Test
-    @Ignore // This should ideally work but may not be worth the effort
-    public void testCreateJDiscInstanceWithModelEvaluation() {
+    @Disabled
+    void testCreateJDiscInstanceWithModelEvaluation() {
         try (JDisc jdisc =
-                     JDisc.fromPath(new File("src/test/app-packages/model-evaluation").toPath(),
-                                    Networking.disable)) {
+                JDisc.fromPath(new File("src/test/app-packages/model-evaluation").toPath(),
+                        Networking.disable)) {
             assertLoadedModels(jdisc);
         }
     }
 
     @Test
-    public void testCreateApplicationInstanceWithModelEvaluation() {
+    void testCreateApplicationInstanceWithModelEvaluation() {
         assumeTrue(OnnxEvaluator.isRuntimeAvailable());
         try (Application application =
-                     Application.fromApplicationPackage(new File("src/test/app-packages/model-evaluation"),
-                                                        Networking.disable)) {
+                Application.fromApplicationPackage(new File("src/test/app-packages/model-evaluation"),
+                        Networking.disable)) {
             assertLoadedModels(application.getJDisc("default"));
         }
     }