Fix JUnit Jupiter migration: compilation errors from CI

claude · claude · commit f73c178ff247 · 2026-05-26T08:27:24.000Z
- Fix @test(timeout=N) → @timeout + @test in SessionConcurrencyTest and MultimodalIntegrationTest - Fix @test(expected=X.class) → assertThrows() in ErrorHandlingTest, InferenceParametersTest, ParameterJsonSerializerTest - Fix @BeforeClass/@afterclass → @BeforeAll/@afterall across all affected test files - Fix broken imports: org.junit.assertNotEquals → org.junit.jupiter.api.Assertions.assertNotEquals - Fix org.junit.assertNull and org.junit.fail → static-imported equivalents - Add missing assertThrows imports in ContentPartTest, MultimodalMessagesTest, NativeLibraryPermissionSetterTest - Fix assertEquals argument order for float delta: message-first → message-last (RerankingModelTest) - Fix Assume.assumeNotNull → Assumptions.assumeTrue (LlamaEmbeddingsTest) https://claude.ai/code/session_01Wz6qiYa6SGNirh9tVs4jUL
diff --git a/src/test/java/net/ladenthin/llama/ChatAdvancedTest.java b/src/test/java/net/ladenthin/llama/ChatAdvancedTest.java
@@ -53,7 +53,7 @@ public class ChatAdvancedTest {
 
     private static LlamaModel model;
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() {
         Assumptions.assumeTrue(new File(TestConstants.MODEL_PATH).exists(), "Model file not found, skipping ChatAdvancedTest");
         int gpuLayers = Integer.getInteger(TestConstants.PROP_TEST_NGL, TestConstants.DEFAULT_TEST_NGL);
@@ -66,7 +66,7 @@ public static void setup() {
         );
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         if (model != null) {
             model.close();
diff --git a/src/test/java/net/ladenthin/llama/ChatResponseTest.java b/src/test/java/net/ladenthin/llama/ChatResponseTest.java
@@ -113,7 +113,7 @@ public void buildMessagesJsonRoundTripsToolTurns() {
     @Test
     public void buildToolsJsonEmptyWhenNoTools() {
         ChatRequest req = new ChatRequest().addMessage("user", "hi");
-        org.junit.assertNull(req.buildToolsJson());
+        assertNull(req.buildToolsJson());
     }
 
     @Test
diff --git a/src/test/java/net/ladenthin/llama/ChatScenarioTest.java b/src/test/java/net/ladenthin/llama/ChatScenarioTest.java
@@ -53,7 +53,7 @@ public class ChatScenarioTest {
 
     private static LlamaModel model;
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() {
         Assumptions.assumeTrue(new File(TestConstants.MODEL_PATH).exists(), "Model file not found, skipping ChatScenarioTest");
         int gpuLayers = Integer.getInteger(TestConstants.PROP_TEST_NGL, TestConstants.DEFAULT_TEST_NGL);
@@ -70,7 +70,7 @@ public static void setup() {
         );
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         if (model != null) {
             model.close();
diff --git a/src/test/java/net/ladenthin/llama/ConfigureParallelInferenceTest.java b/src/test/java/net/ladenthin/llama/ConfigureParallelInferenceTest.java
@@ -32,7 +32,7 @@ public class ConfigureParallelInferenceTest {
 
     private static LlamaModel model;
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() {
         Assumptions.assumeTrue(new File(TestConstants.MODEL_PATH).exists(), "Model file not found, skipping ConfigureParallelInferenceTest");
         int gpuLayers = Integer.getInteger(TestConstants.PROP_TEST_NGL, TestConstants.DEFAULT_TEST_NGL);
@@ -45,7 +45,7 @@ public static void setup() {
         );
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         if (model != null) {
             model.close();
diff --git a/src/test/java/net/ladenthin/llama/ContentPartTest.java b/src/test/java/net/ladenthin/llama/ContentPartTest.java
@@ -12,6 +12,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
diff --git a/src/test/java/net/ladenthin/llama/ErrorHandlingTest.java b/src/test/java/net/ladenthin/llama/ErrorHandlingTest.java
@@ -36,7 +36,7 @@ public class ErrorHandlingTest {
     private static LlamaModel model;
     private static LlamaModel modelNoEmbed;
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() {
         Assumptions.assumeTrue(new File(TestConstants.MODEL_PATH).exists(), "Model file not found, skipping ErrorHandlingTest");
         int gpuLayers = Integer.getInteger(TestConstants.PROP_TEST_NGL, TestConstants.DEFAULT_TEST_NGL);
@@ -59,7 +59,7 @@ public static void setup() {
         );
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         if (model != null) {
             model.close();
@@ -73,22 +73,22 @@ public static void tearDown() {
     // Invalid model path
     // -------------------------------------------------------------------------
 
-    @Test(expected = LlamaException.class)
+    @Test
     public void testInvalidModelPathThrows() {
-        new LlamaModel(
+        assertThrows(LlamaException.class, () -> new LlamaModel(
                 new ModelParameters()
                         .setModel("/nonexistent/path/model.gguf")
                         .setFit(false)
-        );
+        ));
     }
 
-    @Test(expected = LlamaException.class)
+    @Test
     public void testEmptyModelPathThrows() {
-        new LlamaModel(
+        assertThrows(LlamaException.class, () -> new LlamaModel(
                 new ModelParameters()
                         .setModel("")
                         .setFit(false)
-        );
+        ));
     }
 
     // -------------------------------------------------------------------------
diff --git a/src/test/java/net/ladenthin/llama/InferenceParametersTest.java b/src/test/java/net/ladenthin/llama/InferenceParametersTest.java
@@ -556,16 +556,16 @@ public void testSetMessagesEmptySystemMessage() {
 		assertFalse(value.contains("system"));
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void testSetMessagesInvalidRole() {
 		List<Pair<String, String>> messages = Collections.singletonList(new Pair<>("system", "Bad"));
-		new InferenceParameters("").setMessages(null, messages);
+		assertThrows(IllegalArgumentException.class, () -> new InferenceParameters("").setMessages(null, messages));
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void testSetMessagesInvalidRoleOther() {
 		List<Pair<String, String>> messages = Collections.singletonList(new Pair<>("admin", "Hack"));
-		new InferenceParameters("").setMessages(null, messages);
+		assertThrows(IllegalArgumentException.class, () -> new InferenceParameters("").setMessages(null, messages));
 	}
 
 	// -------------------------------------------------------------------------
diff --git a/src/test/java/net/ladenthin/llama/JsonEndpointParametersTest.java b/src/test/java/net/ladenthin/llama/JsonEndpointParametersTest.java
@@ -45,7 +45,7 @@ public class JsonEndpointParametersTest {
 
     private static LlamaModel model;
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() {
         Assumptions.assumeTrue(new File(TestConstants.MODEL_PATH).exists(), "Model file not found, skipping JsonEndpointParametersTest");
         int gpuLayers = Integer.getInteger(TestConstants.PROP_TEST_NGL, TestConstants.DEFAULT_TEST_NGL);
@@ -58,7 +58,7 @@ public static void setup() {
         );
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         if (model != null) {
             model.close();
diff --git a/src/test/java/net/ladenthin/llama/LlamaEmbeddingsTest.java b/src/test/java/net/ladenthin/llama/LlamaEmbeddingsTest.java
@@ -184,9 +184,8 @@ private static void assertEmbeddingValid(float[] embedding, PoolingType type) {
     @Test
     public void testNomicEmbedLoads() {
         String nomicPath = System.getProperty(TestConstants.PROP_NOMIC_MODEL_PATH);
-        Assume.assumeNotNull(
-                "Set -D" + TestConstants.PROP_NOMIC_MODEL_PATH + " to a nomic-embed-text GGUF to run this test",
-                nomicPath);
+        Assumptions.assumeTrue(nomicPath != null,
+                "Set -D" + TestConstants.PROP_NOMIC_MODEL_PATH + " to a nomic-embed-text GGUF to run this test");
         Assumptions.assumeTrue(new File(nomicPath).exists(), "Nomic model file not found at " + nomicPath);
 
         int gpuLayers = Integer.getInteger(TestConstants.PROP_TEST_NGL, TestConstants.DEFAULT_TEST_NGL);
diff --git a/src/test/java/net/ladenthin/llama/LlamaModelTest.java b/src/test/java/net/ladenthin/llama/LlamaModelTest.java
@@ -44,7 +44,7 @@ public class LlamaModelTest {
 
 	private static LlamaModel model;
 
-	@BeforeClass
+	@BeforeAll
 	public static void setup() {
 		Assumptions.assumeTrue(new java.io.File("models/codellama-7b.Q2_K.gguf").exists(), "Model file not found, skipping LlamaModelTest");
 //		LlamaModel.setLogger(LogFormat.TEXT, (level, msg) -> System.out.println(level + ": " + msg));
@@ -60,7 +60,7 @@ public static void setup() {
 		);
 	}
 
-	@AfterClass
+	@AfterAll
 	public static void tearDown() {
 		if (model != null) {
 			model.close();
diff --git a/src/test/java/net/ladenthin/llama/LlamaPublisherTest.java b/src/test/java/net/ladenthin/llama/LlamaPublisherTest.java
@@ -145,7 +145,7 @@ public void nullSubscriberThrows() {
         // Construct a publisher without a model — subscribe(null) must NPE before any model use.
         try {
             new LlamaPublisher(null, null, false).subscribe(null);
-            org.junit.fail("expected NPE");
+            fail("expected NPE");
         } catch (NullPointerException expected) {
             assertEquals("subscriber", expected.getMessage());
         }
diff --git a/src/test/java/net/ladenthin/llama/LoadProgressCallbackTest.java b/src/test/java/net/ladenthin/llama/LoadProgressCallbackTest.java
@@ -11,7 +11,7 @@
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
diff --git a/src/test/java/net/ladenthin/llama/MemoryManagementTest.java b/src/test/java/net/ladenthin/llama/MemoryManagementTest.java
@@ -70,7 +70,7 @@ public class MemoryManagementTest {
      */
     private static LlamaModel smallCtxModel;
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() {
         Assumptions.assumeTrue(new File(TestConstants.MODEL_PATH).exists(), "Model file not found, skipping MemoryManagementTest");
 
@@ -93,7 +93,7 @@ public static void setup() {
                         .setFit(false));
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         if (model != null) {
             model.close();
diff --git a/src/test/java/net/ladenthin/llama/MultimodalIntegrationTest.java b/src/test/java/net/ladenthin/llama/MultimodalIntegrationTest.java
@@ -8,10 +8,12 @@
 import java.nio.file.Paths;
 import java.util.Collections;
 
+import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -60,7 +62,7 @@ public class MultimodalIntegrationTest {
     private static String imagePath;
     private static LlamaModel model;
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() {
         modelPath  = System.getProperty(TestConstants.PROP_VISION_MODEL_PATH);
         mmprojPath = System.getProperty(TestConstants.PROP_VISION_MMPROJ_PATH);
@@ -90,7 +92,7 @@ public static void setup() {
                         .setFit(false));
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         if (model != null) {
             model.close();
@@ -106,7 +108,8 @@ public static void tearDown() {
      * JSON &#x2192; upstream mtmd &#x2192; non-empty token stream pipeline
      * works without crashing.
      */
-    @Test(timeout = 240_000)
+    @Timeout(value = 240_000, unit = TimeUnit.MILLISECONDS)
+    @Test
     public void multimodalRequestProducesNonEmptyReply() throws Exception {
         ChatMessage userMsg = ChatMessage.userMultimodal(
                 ContentPart.text("Describe what you see in this image in one short sentence."),
@@ -127,7 +130,8 @@ public void multimodalRequestProducesNonEmptyReply() throws Exception {
      * legacy split in {@code ParameterJsonSerializer.buildMessages} doesn't
      * poison the inference context for subsequent requests.
      */
-    @Test(timeout = 240_000)
+    @Timeout(value = 240_000, unit = TimeUnit.MILLISECONDS)
+    @Test
     public void multimodalThenTextOnSameModel() throws Exception {
         ChatMessage img = ChatMessage.userMultimodal(
                 ContentPart.text("What is this?"),
diff --git a/src/test/java/net/ladenthin/llama/MultimodalMessagesTest.java b/src/test/java/net/ladenthin/llama/MultimodalMessagesTest.java
@@ -15,6 +15,7 @@
 import net.ladenthin.llama.json.ParameterJsonSerializer;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/net/ladenthin/llama/NativeLibraryPermissionSetterTest.java b/src/test/java/net/ladenthin/llama/NativeLibraryPermissionSetterTest.java
@@ -10,6 +10,7 @@
 
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/src/test/java/net/ladenthin/llama/ReasoningBudgetTest.java b/src/test/java/net/ladenthin/llama/ReasoningBudgetTest.java
@@ -68,7 +68,7 @@ public class ReasoningBudgetTest {
     private static LlamaModel model;
     private final ChatResponseParser parser = new ChatResponseParser();
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() {
         Assumptions.assumeTrue(new File(TestConstants.REASONING_MODEL_PATH).exists(), "Reasoning model not found, skipping ReasoningBudgetTest");
         int gpuLayers = Integer.getInteger(TestConstants.PROP_TEST_NGL, TestConstants.DEFAULT_TEST_NGL);
@@ -83,7 +83,7 @@ public static void setup() {
         );
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         if (model != null) {
             model.close();
diff --git a/src/test/java/net/ladenthin/llama/RerankingModelTest.java b/src/test/java/net/ladenthin/llama/RerankingModelTest.java
@@ -24,7 +24,7 @@ public class RerankingModelTest {
 			"Machine learning is a field of study in artificial intelligence concerned with the development and study of statistical algorithms that can learn from data and generalize to unseen data, and thus perform tasks without explicit instructions.",
 			"Paris, capitale de la France, est une grande ville européenne et un centre mondial de l'art, de la mode, de la gastronomie et de la culture. Son paysage urbain du XIXe siècle est traversé par de larges boulevards et la Seine." };
 
-	@BeforeClass
+	@BeforeAll
 	public static void setup() {
 		int gpuLayers = Integer.getInteger(TestConstants.PROP_TEST_NGL, TestConstants.DEFAULT_TEST_NGL);
 		model = new LlamaModel(
@@ -33,7 +33,7 @@ public static void setup() {
 						.skipWarmup());
 	}
 
-	@AfterClass
+	@AfterAll
 	public static void tearDown() {
 		if (model != null) {
 			model.close();
@@ -195,7 +195,7 @@ public void testRerankConsistency() {
 		float score1 = first.probabilities.values().iterator().next();
 		float score2 = second.probabilities.values().iterator().next();
 
-		assertEquals("Reranking must be deterministic", score1, score2, 1e-4f);
+		assertEquals(score1, score2, 1e-4f, "Reranking must be deterministic");
 	}
 
 	/**
diff --git a/src/test/java/net/ladenthin/llama/ResponseJsonStructureTest.java b/src/test/java/net/ladenthin/llama/ResponseJsonStructureTest.java
@@ -44,7 +44,7 @@ public class ResponseJsonStructureTest {
 
     private static LlamaModel model;
 
-    @BeforeClass
+    @BeforeAll
     public static void setup() {
         Assumptions.assumeTrue(new File(TestConstants.MODEL_PATH).exists(), "Model file not found, skipping ResponseJsonStructureTest");
         int gpuLayers = Integer.getInteger(TestConstants.PROP_TEST_NGL, TestConstants.DEFAULT_TEST_NGL);
@@ -59,7 +59,7 @@ public static void setup() {
         );
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDown() {
         if (model != null) {
             model.close();
diff --git a/src/test/java/net/ladenthin/llama/SessionConcurrencyTest.java b/src/test/java/net/ladenthin/llama/SessionConcurrencyTest.java
diff --git a/src/test/java/net/ladenthin/llama/UsageTest.java b/src/test/java/net/ladenthin/llama/UsageTest.java
diff --git a/src/test/java/net/ladenthin/llama/json/ParameterJsonSerializerTest.java b/src/test/java/net/ladenthin/llama/json/ParameterJsonSerializerTest.java

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public void buildMessagesJsonRoundTripsToolTurns() {`
`113`	`113`	`@Test`
`114`	`114`	`public void buildToolsJsonEmptyWhenNoTools() {`
`115`	`115`	`ChatRequest req = new ChatRequest().addMessage("user", "hi");`
`116`		`- org.junit.assertNull(req.buildToolsJson());`
	`116`	`+ assertNull(req.buildToolsJson());`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -556,16 +556,16 @@ public void testSetMessagesEmptySystemMessage() {`
`556`	`556`	`assertFalse(value.contains("system"));`
`557`	`557`	`}`
`558`	`558`
`559`		`- @Test(expected = IllegalArgumentException.class)`
	`559`	`+ @Test`
`560`	`560`	`public void testSetMessagesInvalidRole() {`
`561`	`561`	`List<Pair<String, String>> messages = Collections.singletonList(new Pair<>("system", "Bad"));`
`562`		`- new InferenceParameters("").setMessages(null, messages);`
	`562`	`+ assertThrows(IllegalArgumentException.class, () -> new InferenceParameters("").setMessages(null, messages));`
`563`	`563`	`}`
`564`	`564`
`565`		`- @Test(expected = IllegalArgumentException.class)`
	`565`	`+ @Test`
`566`	`566`	`public void testSetMessagesInvalidRoleOther() {`
`567`	`567`	`List<Pair<String, String>> messages = Collections.singletonList(new Pair<>("admin", "Hack"));`
`568`		`- new InferenceParameters("").setMessages(null, messages);`
	`568`	`+ assertThrows(IllegalArgumentException.class, () -> new InferenceParameters("").setMessages(null, messages));`
`569`	`569`	`}`
`570`	`570`
`571`	`571`	`// -------------------------------------------------------------------------`