cleanup tests

Author: dfuchss

src/test/java/stanfordnlp/StanfordTestBase.java

@@ -0,0 +1,30 @@
+/* Licensed under MIT 2025. */
+package stanfordnlp;
+
+import java.nio.file.Path;
+
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.images.builder.ImageFromDockerfile;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+@Testcontainers
+public class StanfordTestBase {
+    @Container
+    protected static ProjectContainer simpleWebServer = new ProjectContainer().withExposedPorts(8080);
+
+    protected final String username = "admin";
+    protected final String password = "changeme";
+    protected final String registrationEndpoint = "/stanfordnlp/registration";
+    protected final String healthEndpoint = "/stanfordnlp/health";
+    protected final String textEndpoint = "/stanfordnlp";
+
+    protected static final class ProjectContainer extends GenericContainer<ProjectContainer> {
+        public ProjectContainer() {
+            super(new ImageFromDockerfile("localhost/testcontainers/stanfordcorenlp-provider-service", true) //
+                    .withFileFromPath("./src", Path.of("./src")) //
+                    .withFileFromPath("./pom.xml", Path.of("./pom.xml")) //
+                    .withFileFromPath("./Dockerfile", Path.of("./Dockerfile")));
+        }
+    }
+}

src/test/java/stanfordnlp/authentication/RegistrationControllerTest.java

@@ -1,8 +1,6 @@
 /* Licensed under MIT 2023-2025. */
 package stanfordnlp.authentication;
 
-import java.nio.file.Path;
-
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
@@ -13,29 +11,14 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.images.builder.ImageFromDockerfile;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
 
-@Testcontainers
-class RegistrationControllerTest {
+import stanfordnlp.StanfordTestBase;
+
+class RegistrationControllerTest extends StanfordTestBase {
 
-    String username = "admin";
-    String password = "changeme";
-    String registrationEndpoint = "/stanfordnlp/registration";
-    String healthEndpoint = "/stanfordnlp/health";
     static String address;
     static TestRestTemplate restTemplate;
 
-    @Container
-    public static GenericContainer<?> simpleWebServer = new GenericContainer<>(new ImageFromDockerfile(
-            "localhost/testcontainers/stanfordcorenlp-provider-service", true) //
-            .withFileFromPath("./src", Path.of("./src")) //
-            .withFileFromPath("./pom.xml", Path.of("./pom.xml")) //
-            .withFileFromPath("./Dockerfile", Path.of("./Dockerfile")) //
-    ).withExposedPorts(8080);
-
     @BeforeAll
     static void beforeAll() {
         simpleWebServer.start();

src/test/java/stanfordnlp/corenlp/TextControllerTest.java

@@ -2,7 +2,6 @@
 package stanfordnlp.corenlp;
 
 import java.io.IOException;
-import java.nio.file.Path;
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
@@ -11,33 +10,18 @@
 import org.springframework.boot.resttestclient.TestRestTemplate;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.images.builder.ImageFromDockerfile;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
 
 import edu.kit.kastel.mcse.ardoco.core.textproviderjson.converter.JsonConverter;
 import edu.kit.kastel.mcse.ardoco.core.textproviderjson.dto.TextDto;
 import edu.kit.kastel.mcse.ardoco.core.textproviderjson.error.InvalidJsonException;
+import stanfordnlp.StanfordTestBase;
 import stanfordnlp.TestUtil;
 
-@Testcontainers
-public class TextControllerTest {
+class TextControllerTest extends StanfordTestBase {
 
-    String username = "admin";
-    String password = "changeme";
-    String textEndpoint = "/stanfordnlp";
     static String address;
     static TestRestTemplate restTemplate;
 
-    @Container
-    public static GenericContainer<?> simpleWebServer = new GenericContainer<>(new ImageFromDockerfile(
-            "localhost/testcontainers/stanfordcorenlp-provider-service", true) //
-            .withFileFromPath("./src", Path.of("./src")) //
-            .withFileFromPath("./pom.xml", Path.of("./pom.xml")) //
-            .withFileFromPath("./Dockerfile", Path.of("./Dockerfile")) //
-    ).withExposedPorts(8080);
-
     @BeforeAll
     static void setUp() {
         simpleWebServer.start();
@@ -64,7 +48,5 @@ void testTextProcessing() throws InvalidJsonException, IOException {
         TextDto expected = JsonConverter.fromJsonString(TestUtil.getJsonExample());
         TextDto actual = JsonConverter.fromJsonString(response1.getBody());
         Assertions.assertEquals(expected, actual);
-
     }
-
 }