fix: fix testcontainers issues

arch · Jun 7, 2024 · 1b0acc5 · 1b0acc5
1 parent e78cca6
commit 1b0acc5
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 11 deletions.
diff --git a/mall-catalog/src/main/resources/schema.sql b/mall-catalog/src/main/resources/schema.sql
@@ -1,11 +1,12 @@
 DROP TABLE IF EXISTS book
-CREATE TABLE book (
-    id                  BIGSERIAL PRIMARY KEY NOT NULL,
-    isbn                varchar(255) UNIQUE NOT NULL,
-    title               varchar(255) NOT NULL,
-    author              varchar(255) NOT NULL,
-    price               float8 NOT NULL,
-    created_at          timestamp NOT NULL,
-    last_modified_at    timestamp NOT NULL,
-    version             integer NOT NULL
+CREATE TABLE book
+(
+    id               BIGSERIAL PRIMARY KEY NOT NULL,
+    isbn             varchar(255) UNIQUE   NOT NULL,
+    title            varchar(255)          NOT NULL,
+    author           varchar(255)          NOT NULL,
+    price            float8                NOT NULL,
+    created_at       timestamp             NOT NULL,
+    last_modified_at timestamp             NOT NULL,
+    version          integer               NOT NULL
 );
diff --git a/mall-catalog/src/test/java/org/mall/catalogservice/ApplicationTests.java b/mall-catalog/src/test/java/org/mall/catalogservice/ApplicationTests.java
@@ -17,7 +17,7 @@
 @SpringBootTest(
         webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT
 )
-//@ActiveProfiles("integration")
+@ActiveProfiles("integration")
 class ApplicationTests {
     @Autowired
     private WebTestClient webTestClient;

diff --git a/mall-catalog/src/test/java/org/mall/catalogservice/domain/BookRepositoryJdbcTests.java b/mall-catalog/src/test/java/org/mall/catalogservice/domain/BookRepositoryJdbcTests.java
@@ -20,7 +20,7 @@
 @DataJdbcTest
 @Import(DatabaseAuditing.class)
 @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
-//@ActiveProfiles("integration")
+@ActiveProfiles("integration")
 class BookRepositoryJdbcTests {
     @Autowired
     private BookRepository bookRepository;

diff --git a/mall-catalog/src/test/resources/application-integration.yml b/mall-catalog/src/test/resources/application-integration.yml
@@ -1,3 +1,7 @@
+sql:
+  init:
+    mode: always
+
 spring:
   datasource:
     url: jdbc:tc:postgresql:14.10:///
diff --git a/mall-catalog/src/test/resources/schema.sql b/mall-catalog/src/test/resources/schema.sql
@@ -0,0 +1,12 @@
+DROP TABLE IF EXISTS book
+CREATE TABLE book
+(
+    id               BIGSERIAL PRIMARY KEY NOT NULL,
+    isbn             varchar(255) UNIQUE   NOT NULL,
+    title            varchar(255)          NOT NULL,
+    author           varchar(255)          NOT NULL,
+    price            float8                NOT NULL,
+    created_at       timestamp             NOT NULL,
+    last_modified_at timestamp             NOT NULL,
+    version          integer               NOT NULL
+);