refactor: seed test data with sql script and remove @DrtiestContext

while1618 · while1618 · commit e7913772845d · 2026-03-23T09:19:44.000+01:00
diff --git a/backend/spring-boot/src/main/java/org/bugzkit/api/shared/config/DataInit.java b/backend/spring-boot/src/main/java/org/bugzkit/api/shared/config/DataInit.java
@@ -17,7 +17,7 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
 
-@Profile({"dev", "prod", "test"})
+@Profile({"dev", "prod"})
 @Component
 public class DataInit implements ApplicationRunner {
   private final UserRepository userRepository;
@@ -45,41 +45,39 @@ public DataInit(
 
   @Override
   public void run(ApplicationArguments args) {
-    initRoles();
-    saveUsers();
+    getRoles();
+    seedUsers();
   }
 
-  private void initRoles() {
+  private void getRoles() {
     userRole = roleRepository.findByName(RoleName.USER).orElseThrow();
     adminRole = roleRepository.findByName(RoleName.ADMIN).orElseThrow();
   }
 
-  private void saveUsers() {
+  private void seedUsers() {
     if (!userRepository.existsByUsername("admin"))
       userRepository.save(
           User.builder()
               .username("admin")
-              .email("admin@localhost")
+              .email("office@bugzkit.com")
               .password(bCryptPasswordEncoder.encode(password))
               .active(true)
               .lock(false)
               .roles(Set.of(userRole, adminRole))
               .build());
-    if (!userRepository.existsByUsername("user"))
-      userRepository.save(
-          User.builder()
-              .username("user")
-              .email("user@localhost")
-              .password(bCryptPasswordEncoder.encode(password))
-              .active(true)
-              .lock(false)
-              .roles(Collections.singleton(userRole))
-              .build());
     if (environment.getActiveProfiles()[0].equals("dev")) devUsers();
-    else if (environment.getActiveProfiles()[0].equals("test")) testUsers();
   }
 
   private void devUsers() {
+    userRepository.save(
+        User.builder()
+            .username("user")
+            .email("user@localhost")
+            .password(bCryptPasswordEncoder.encode(password))
+            .active(true)
+            .lock(false)
+            .roles(Collections.singleton(userRole))
+            .build());
     List<User> users =
         faker
             .collection(
@@ -96,89 +94,4 @@ private void devUsers() {
             .generate();
     userRepository.saveAll(users);
   }
-
-  private void testUsers() {
-    userRepository.saveAll(
-        List.of(
-            User.builder()
-                .username("deactivated1")
-                .email("deactivate1d@localhost")
-                .password(bCryptPasswordEncoder.encode(password))
-                .active(false)
-                .lock(false)
-                .roles(Collections.singleton(userRole))
-                .build(),
-            User.builder()
-                .username("deactivated2")
-                .email("deactivated2@localhost")
-                .password(bCryptPasswordEncoder.encode(password))
-                .active(false)
-                .lock(false)
-                .roles(Collections.singleton(userRole))
-                .build(),
-            User.builder()
-                .username("deactivated3")
-                .email("deactivated3@localhost")
-                .password(bCryptPasswordEncoder.encode(password))
-                .active(false)
-                .lock(false)
-                .roles(Collections.singleton(userRole))
-                .build(),
-            User.builder()
-                .username("locked")
-                .email("locked@localhost")
-                .password(bCryptPasswordEncoder.encode(password))
-                .active(true)
-                .lock(true)
-                .roles(Collections.singleton(userRole))
-                .build(),
-            User.builder()
-                .username("update1")
-                .email("update1@localhost")
-                .password(bCryptPasswordEncoder.encode(password))
-                .active(true)
-                .lock(false)
-                .roles(Collections.singleton(userRole))
-                .build(),
-            User.builder()
-                .username("update2")
-                .email("update2@localhost")
-                .password(bCryptPasswordEncoder.encode(password))
-                .active(true)
-                .lock(false)
-                .roles(Collections.singleton(userRole))
-                .build(),
-            User.builder()
-                .username("update3")
-                .email("update3@localhost")
-                .password(bCryptPasswordEncoder.encode(password))
-                .active(true)
-                .lock(false)
-                .roles(Collections.singleton(userRole))
-                .build(),
-            User.builder()
-                .username("update4")
-                .email("update4@localhost")
-                .password(bCryptPasswordEncoder.encode(password))
-                .active(true)
-                .lock(false)
-                .roles(Collections.singleton(userRole))
-                .build(),
-            User.builder()
-                .username("delete1")
-                .email("delete1@localhost")
-                .password(bCryptPasswordEncoder.encode(password))
-                .active(true)
-                .lock(false)
-                .roles(Collections.singleton(userRole))
-                .build(),
-            User.builder()
-                .username("delete2")
-                .email("delete2@localhost")
-                .password(bCryptPasswordEncoder.encode(password))
-                .active(true)
-                .lock(false)
-                .roles(Collections.singleton(userRole))
-                .build()));
-  }
 }
diff --git a/backend/spring-boot/src/test/java/org/bugzkit/api/admin/integration/UserControllerIT.java b/backend/spring-boot/src/test/java/org/bugzkit/api/admin/integration/UserControllerIT.java
@@ -28,12 +28,10 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.http.MediaType;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
 import tools.jackson.databind.ObjectMapper;
 
-@DirtiesContext
 @AutoConfigureMockMvc
 @ActiveProfiles("test")
 @SpringBootTest
diff --git a/backend/spring-boot/src/test/java/org/bugzkit/api/auth/integration/AuthControllerIT.java b/backend/spring-boot/src/test/java/org/bugzkit/api/auth/integration/AuthControllerIT.java
@@ -44,13 +44,11 @@
 import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import tools.jackson.databind.ObjectMapper;
 
-@DirtiesContext
 @AutoConfigureMockMvc
 @ActiveProfiles("test")
 @SpringBootTest
diff --git a/backend/spring-boot/src/test/java/org/bugzkit/api/auth/integration/OAuth2UserServiceIT.java b/backend/spring-boot/src/test/java/org/bugzkit/api/auth/integration/OAuth2UserServiceIT.java
@@ -11,10 +11,10 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.transaction.annotation.Transactional;
 
-@DirtiesContext
+@Transactional
 @ActiveProfiles("test")
 @SpringBootTest
 class OAuth2UserServiceIT extends DatabaseContainers {
diff --git a/backend/spring-boot/src/test/java/org/bugzkit/api/shared/config/DatabaseContainers.java b/backend/spring-boot/src/test/java/org/bugzkit/api/shared/config/DatabaseContainers.java
@@ -1,28 +1,35 @@
 package org.bugzkit.api.shared.config;
 
-import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
 import org.testcontainers.postgresql.PostgreSQLContainer;
 import org.testcontainers.utility.DockerImageName;
 
-@Testcontainers
+@Sql(
+    scripts = {"classpath:sql/truncate.sql", "classpath:sql/test-data.sql"},
+    executionPhase = ExecutionPhase.BEFORE_TEST_CLASS)
 public abstract class DatabaseContainers {
-  @Container @ServiceConnection
   static PostgreSQLContainer postgres =
       new PostgreSQLContainer(DockerImageName.parse("postgres").withTag("latest"));
 
-  @Container
   static GenericContainer<?> redis =
       new GenericContainer<>(DockerImageName.parse("redis").withTag("latest"))
           .withExposedPorts(6379)
           .withCommand("redis-server", "--requirepass", "root");
 
+  static {
+    postgres.start();
+    redis.start();
+  }
+
   @DynamicPropertySource
-  static void redisProperties(DynamicPropertyRegistry registry) {
+  static void containerProperties(DynamicPropertyRegistry registry) {
+    registry.add("spring.datasource.url", postgres::getJdbcUrl);
+    registry.add("spring.datasource.username", postgres::getUsername);
+    registry.add("spring.datasource.password", postgres::getPassword);
     registry.add("spring.data.redis.host", redis::getHost);
     registry.add("spring.data.redis.port", () -> redis.getMappedPort(6379));
   }
diff --git a/backend/spring-boot/src/test/java/org/bugzkit/api/shared/integration/AccessingResourcesIT.java b/backend/spring-boot/src/test/java/org/bugzkit/api/shared/integration/AccessingResourcesIT.java
@@ -22,12 +22,10 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.http.MediaType;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
 import tools.jackson.databind.ObjectMapper;
 
-@DirtiesContext
 @AutoConfigureMockMvc
 @ActiveProfiles("test")
 @SpringBootTest
diff --git a/backend/spring-boot/src/test/java/org/bugzkit/api/shared/integration/FlywayMigrationIT.java b/backend/spring-boot/src/test/java/org/bugzkit/api/shared/integration/FlywayMigrationIT.java
@@ -3,10 +3,8 @@
 import org.bugzkit.api.shared.config.DatabaseContainers;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 
-@DirtiesContext
 @ActiveProfiles("test")
 @SpringBootTest
 class FlywayMigrationIT extends DatabaseContainers {
diff --git a/backend/spring-boot/src/test/java/org/bugzkit/api/shared/integration/RateLimitIT.java b/backend/spring-boot/src/test/java/org/bugzkit/api/shared/integration/RateLimitIT.java
@@ -18,14 +18,12 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.http.MediaType;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import tools.jackson.databind.ObjectMapper;
 
-@DirtiesContext
 @AutoConfigureMockMvc
 @ActiveProfiles("test")
 @SpringBootTest
diff --git a/backend/spring-boot/src/test/java/org/bugzkit/api/user/integration/ProfileControllerIT.java b/backend/spring-boot/src/test/java/org/bugzkit/api/user/integration/ProfileControllerIT.java
@@ -23,13 +23,11 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.http.MediaType;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 import tools.jackson.databind.ObjectMapper;
 
-@DirtiesContext
 @AutoConfigureMockMvc
 @ActiveProfiles("test")
 @SpringBootTest
diff --git a/backend/spring-boot/src/test/java/org/bugzkit/api/user/integration/RoleControllerIT.java b/backend/spring-boot/src/test/java/org/bugzkit/api/user/integration/RoleControllerIT.java
@@ -13,12 +13,10 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.http.MediaType;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
 import tools.jackson.databind.ObjectMapper;
 
-@DirtiesContext
 @AutoConfigureMockMvc
 @ActiveProfiles("test")
 @SpringBootTest
diff --git a/backend/spring-boot/src/test/java/org/bugzkit/api/user/integration/UserControllerIT.java b/backend/spring-boot/src/test/java/org/bugzkit/api/user/integration/UserControllerIT.java
@@ -19,12 +19,10 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.http.MediaType;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
 import tools.jackson.databind.ObjectMapper;
 
-@DirtiesContext
 @AutoConfigureMockMvc
 @ActiveProfiles("test")
 @SpringBootTest
diff --git a/backend/spring-boot/src/test/resources/sql/test-data.sql b/backend/spring-boot/src/test/resources/sql/test-data.sql
@@ -0,0 +1,29 @@
+INSERT INTO roles (role_name) VALUES ('USER'), ('ADMIN');
+
+INSERT INTO users (username, email, password, active, lock, created_at) VALUES
+  ('admin',        'admin@localhost',        '$2a$10$4Nm6TI1IULsNWuBSLXp85uK5tp5pbfjk1UMByB2.zSoQPmKsgpWl2', true,  false, NOW()),
+  ('user',         'user@localhost',         '$2a$10$4Nm6TI1IULsNWuBSLXp85uK5tp5pbfjk1UMByB2.zSoQPmKsgpWl2', true,  false, NOW()),
+  ('deactivated1', 'deactivated1@localhost', '$2a$10$4Nm6TI1IULsNWuBSLXp85uK5tp5pbfjk1UMByB2.zSoQPmKsgpWl2', false, false, NOW()),
+  ('deactivated2', 'deactivated2@localhost', '$2a$10$4Nm6TI1IULsNWuBSLXp85uK5tp5pbfjk1UMByB2.zSoQPmKsgpWl2', false, false, NOW()),
+  ('deactivated3', 'deactivated3@localhost', '$2a$10$4Nm6TI1IULsNWuBSLXp85uK5tp5pbfjk1UMByB2.zSoQPmKsgpWl2', false, false, NOW()),
+  ('locked',       'locked@localhost',       '$2a$10$4Nm6TI1IULsNWuBSLXp85uK5tp5pbfjk1UMByB2.zSoQPmKsgpWl2', true,  true,  NOW()),
+  ('update1',      'update1@localhost',      '$2a$10$4Nm6TI1IULsNWuBSLXp85uK5tp5pbfjk1UMByB2.zSoQPmKsgpWl2', true,  false, NOW()),
+  ('update2',      'update2@localhost',      '$2a$10$4Nm6TI1IULsNWuBSLXp85uK5tp5pbfjk1UMByB2.zSoQPmKsgpWl2', true,  false, NOW()),
+  ('update3',      'update3@localhost',      '$2a$10$4Nm6TI1IULsNWuBSLXp85uK5tp5pbfjk1UMByB2.zSoQPmKsgpWl2', true,  false, NOW()),
+  ('update4',      'update4@localhost',      '$2a$10$4Nm6TI1IULsNWuBSLXp85uK5tp5pbfjk1UMByB2.zSoQPmKsgpWl2', true,  false, NOW()),
+  ('delete1',      'delete1@localhost',      '$2a$10$4Nm6TI1IULsNWuBSLXp85uK5tp5pbfjk1UMByB2.zSoQPmKsgpWl2', true,  false, NOW()),
+  ('delete2',      'delete2@localhost',      '$2a$10$4Nm6TI1IULsNWuBSLXp85uK5tp5pbfjk1UMByB2.zSoQPmKsgpWl2', true,  false, NOW());
+
+INSERT INTO user_roles (user_id, role_id) VALUES
+  (1, 1), (1, 2),
+  (2, 1),
+  (3, 1),
+  (4, 1),
+  (5, 1),
+  (6, 1),
+  (7, 1),
+  (8, 1),
+  (9, 1),
+  (10, 1),
+  (11, 1),
+  (12, 1);
diff --git a/backend/spring-boot/src/test/resources/sql/truncate.sql b/backend/spring-boot/src/test/resources/sql/truncate.sql
@@ -0,0 +1 @@
+TRUNCATE TABLE devices, user_roles, users, roles RESTART IDENTITY;
