Fix integration tests

ls1intum · Oct 29, 2024 · 0c97dee · 0c97dee
1 parent 1c18dd9
commit 0c97dee
Show file tree

Hide file tree

Showing 7 changed files with 223 additions and 153 deletions.
diff --git a/server/build.gradle b/server/build.gradle
@@ -51,4 +51,7 @@ dependencies {
 
 test {
 	useJUnitPlatform()
+
+	maxParallelForks = 1
+	forkEvery = 0
 }
diff --git a/server/src/test/java/thesistrack/ls1/controller/ApplicationControllerTest.java b/server/src/test/java/thesistrack/ls1/controller/ApplicationControllerTest.java
@@ -1,9 +1,16 @@
 package thesistrack.ls1.controller;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 import thesistrack.ls1.constants.ApplicationState;
 import thesistrack.ls1.controller.payload.AcceptApplicationPayload;
 import thesistrack.ls1.controller.payload.CreateApplicationPayload;
@@ -16,7 +23,32 @@
 
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+@Testcontainers
 class ApplicationControllerTest extends BaseIntegrationTest {
+    @Container
+    static PostgreSQLContainer<?> dbContainer = new PostgreSQLContainer<>(
+            "postgres:16-alpine"
+    );
+
+    @BeforeAll
+    static void startDatabase() {
+        dbContainer.start();
+    }
+
+    @AfterAll
+    static void stopDatabase() {
+        dbContainer.stop();
+    }
+
+    @DynamicPropertySource
+    static void configureProperties(DynamicPropertyRegistry registry) {
+        dbContainer.start();
+
+        registry.add("spring.datasource.url", dbContainer::getJdbcUrl);
+        registry.add("spring.datasource.username", dbContainer::getUsername);
+        registry.add("spring.datasource.password", dbContainer::getPassword);
+    }
+
     @Test
     void createApplication_Success() throws Exception {
         CreateApplicationPayload payload = new CreateApplicationPayload(

diff --git a/server/src/test/java/thesistrack/ls1/controller/ThesisControllerTest.java b/server/src/test/java/thesistrack/ls1/controller/ThesisControllerTest.java
@@ -1,11 +1,14 @@
 package thesistrack.ls1.controller;
 
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockMultipartFile;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 import thesistrack.ls1.constants.*;
 import thesistrack.ls1.controller.payload.*;
 import thesistrack.ls1.mock.BaseIntegrationTest;
@@ -16,7 +19,32 @@
 import static org.hamcrest.Matchers.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
+@Testcontainers
 class ThesisControllerTest extends BaseIntegrationTest {
+    @Container
+    static PostgreSQLContainer<?> dbContainer = new PostgreSQLContainer<>(
+            "postgres:16-alpine"
+    );
+
+    @BeforeAll
+    static void startDatabase() {
+        dbContainer.start();
+    }
+
+    @AfterAll
+    static void stopDatabase() {
+        dbContainer.stop();
+    }
+
+    @DynamicPropertySource
+    static void configureProperties(DynamicPropertyRegistry registry) {
+        dbContainer.start();
+
+        registry.add("spring.datasource.url", dbContainer::getJdbcUrl);
+        registry.add("spring.datasource.username", dbContainer::getUsername);
+        registry.add("spring.datasource.password", dbContainer::getPassword);
+    }
+
     @Nested
     class ThesisBasicOperations {
         @Test

diff --git a/server/src/test/java/thesistrack/ls1/controller/TopicControllerTest.java b/server/src/test/java/thesistrack/ls1/controller/TopicControllerTest.java
@@ -1,10 +1,17 @@
 package thesistrack.ls1.controller;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 import thesistrack.ls1.constants.ApplicationRejectReason;
 import thesistrack.ls1.controller.payload.CloseTopicPayload;
 import thesistrack.ls1.controller.payload.ReplaceTopicPayload;
@@ -17,7 +24,32 @@
 import static org.hamcrest.Matchers.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
+@Testcontainers
 class TopicControllerTest extends BaseIntegrationTest {
+    @Container
+    static PostgreSQLContainer<?> dbContainer = new PostgreSQLContainer<>(
+            "postgres:16-alpine"
+    );
+
+    @BeforeAll
+    static void startDatabase() {
+        dbContainer.start();
+    }
+
+    @AfterAll
+    static void stopDatabase() {
+        dbContainer.stop();
+    }
+
+    @DynamicPropertySource
+    static void configureProperties(DynamicPropertyRegistry registry) {
+        dbContainer.start();
+
+        registry.add("spring.datasource.url", dbContainer::getJdbcUrl);
+        registry.add("spring.datasource.username", dbContainer::getUsername);
+        registry.add("spring.datasource.password", dbContainer::getPassword);
+    }
+
     @Test
     void getTopics_Success() throws Exception {
         createTestTopic("Test Topic");

diff --git a/server/src/test/java/thesistrack/ls1/controller/UserControllerTest.java b/server/src/test/java/thesistrack/ls1/controller/UserControllerTest.java
@@ -1,15 +1,47 @@
 package thesistrack.ls1.controller;
 
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 import thesistrack.ls1.mock.BaseIntegrationTest;
 
 import java.util.List;
 
 import static org.hamcrest.Matchers.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
+@Testcontainers
 public class UserControllerTest extends BaseIntegrationTest {
+    @Container
+    static PostgreSQLContainer<?> dbContainer = new PostgreSQLContainer<>(
+            "postgres:16-alpine"
+    );
+
+    @BeforeAll
+    static void startDatabase() {
+        dbContainer.start();
+    }
+
+    @AfterAll
+    static void stopDatabase() {
+        dbContainer.stop();
+    }
+
+    @DynamicPropertySource
+    static void configureProperties(DynamicPropertyRegistry registry) {
+        dbContainer.start();
+
+        registry.add("spring.datasource.url", dbContainer::getJdbcUrl);
+        registry.add("spring.datasource.username", dbContainer::getUsername);
+        registry.add("spring.datasource.password", dbContainer::getPassword);
+    }
+
     @Test
     void getUsers_AsAdmin_Success() throws Exception {
         mockMvc.perform(MockMvcRequestBuilders.get("/v2/users")