Merge branch 'test' into develop

Author: YuSunjo

.github/workflows/run-tests.yml

@@ -2,9 +2,9 @@ name: Run Tests
 
 on:
   push:
-    branches: [ main, develop ]
+    branches: [ main, develop, test ]
   pull_request:
-    branches: [ main, develop ]
+    branches: [ main, develop, test ]
 
 jobs:
   test:
@@ -21,8 +21,22 @@ jobs:
         distribution: 'temurin'
         cache: gradle
 
+    - name: Check Docker availability
+      run: |
+        docker --version
+        docker info
+        
+    - name: Make gradlew executable
+      run: chmod +x ./gradlew
+        
     - name: Run memory-api tests with coverage
-      run: ./gradlew :memory-api:test :memory-api:jacocoTestReport
+      run: ./gradlew :memory-api:test :memory-api:jacocoTestReport --info --stacktrace
+      env:
+        SPRING_PROFILES_ACTIVE: test
+        TESTCONTAINERS_RYUK_DISABLED: true
+        TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE: /var/run/docker.sock
+        # ElasticSearch TestContainer 설정
+        ES_JAVA_OPTS: "-Xms512m -Xmx512m"
 
     - name: Upload coverage reports to Codecov
       uses: codecov/codecov-action@v3

memory-api/build.gradle

@@ -22,6 +22,7 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-testcontainers'
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.testcontainers:postgresql'
+    testImplementation 'org.testcontainers:elasticsearch:1.19.3'
 }
 
 tasks.named('test') {

memory-api/src/test/java/com/memory/controller/BaseIntegrationTest.java

@@ -13,12 +13,18 @@
 @Transactional
 public abstract class BaseIntegrationTest {
     static final PostgresTC PG = PostgresTC.getInstance();
+    // ElasticSearch 임시 비활성화
+    static final ElasticSearchTC ES = ElasticSearchTC.getInstance();
 
     @DynamicPropertySource
     static void props(DynamicPropertyRegistry r) {
+        // PostgreSQL 설정
         r.add("spring.datasource.url", PG::getJdbcUrl);
         r.add("spring.datasource.username", PG::getUsername);
         r.add("spring.datasource.password", PG::getPassword);
         r.add("spring.datasource.driver-class-name", () -> "org.postgresql.Driver");
+        
+        // ElasticSearch 설정 임시 비활성화
+         r.add("spring.elasticsearch.uris", ES::getHttpHostAddress);
     }
 }

memory-api/src/test/java/com/memory/controller/ElasticSearchTC.java

@@ -0,0 +1,56 @@
+package com.memory.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.elasticsearch.ElasticsearchContainer;
+import org.testcontainers.images.builder.ImageFromDockerfile;
+import org.testcontainers.utility.DockerImageName;
+
+import java.time.Duration;
+import java.time.LocalDateTime;
+
+public class ElasticSearchTC extends ElasticsearchContainer {
+    private static final Logger log = LoggerFactory.getLogger(ElasticSearchTC.class);
+    private static final String TAGGED_IMAGE = "es-nori:8.11.0";
+    private static final String UPSTREAM = "docker.elastic.co/elasticsearch/elasticsearch";
+    private static ElasticSearchTC INSTANCE;
+
+    private static DockerImageName imageName() {
+        // 1) Dockerfile을 즉석 빌드(최초 1회). 태그: es-nori:8.11.0
+        new ImageFromDockerfile(TAGGED_IMAGE, false)
+                .withDockerfileFromBuilder(b -> b
+                        .from("docker.elastic.co/elasticsearch/elasticsearch:8.11.0")
+                        .run("bin/elasticsearch-plugin install --batch analysis-nori")
+                        .build()
+                )
+                .get();
+
+        // 2) 커스텀 이미지를 '엘라스틱 공식 이미지와 호환'이라고 선언
+        return DockerImageName.parse(TAGGED_IMAGE)
+                .asCompatibleSubstituteFor(UPSTREAM);
+    }
+
+    private ElasticSearchTC() {
+        super(imageName());
+        log.info("[{}] ElasticSearchTC 생성자 호출 - 컨테이너 설정 시작", LocalDateTime.now());
+
+        withEnv("discovery.type", "single-node");
+        withEnv("xpack.security.enabled", "false");          // 8.x 필수(비인증 테스트용)
+        withEnv("xpack.ml.enabled", "false");                // 메모리 절약
+        withEnv("ingest.geoip.downloader.enabled", "false"); // 외부 네트워크/시간 절약
+        withEnv("ES_JAVA_OPTS", "-Xms512m -Xmx512m");        // 힙 축소 (필요시 256/512 조정)
+
+        waitingFor(Wait.forHttp("/").forPort(9200).forStatusCode(200));
+        withStartupTimeout(Duration.ofMinutes(3))
+        .withReuse(false);
+    }
+    
+    public static synchronized ElasticSearchTC getInstance() {
+        if (INSTANCE == null) {
+            INSTANCE = new ElasticSearchTC();
+            INSTANCE.start();
+        }
+        return INSTANCE;
+    }
+}

memory-api/src/test/java/com/memory/controller/PostgresTC.java

@@ -1,22 +1,36 @@
 package com.memory.controller;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
+import java.time.Duration;
+
 public class PostgresTC extends PostgreSQLContainer<PostgresTC> {
+    private static final Logger log = LoggerFactory.getLogger(PostgresTC.class);
     private static final DockerImageName IMG = DockerImageName.parse("postgis/postgis:15-3.3")
             .asCompatibleSubstituteFor("postgres");
     private static PostgresTC INSTANCE;
 
     private PostgresTC() {
         super(IMG);
+        log.info("[{}] PostgresTC 생성자 호출 - 컨테이너 설정 시작", java.time.LocalDateTime.now());
+
         withDatabaseName("memory_test");
         withUsername("test");
         withPassword("test");
-        // 필요하면 .waitingFor(Wait.forListeningPort());
+        withStartupTimeout(Duration.ofMinutes(5));
+        waitingFor(Wait.forListeningPort())
+        .withReuse(false);
     }
+    
     public static synchronized PostgresTC getInstance() {
-        if (INSTANCE == null) { INSTANCE = new PostgresTC(); INSTANCE.start(); }
+        if (INSTANCE == null) { 
+            INSTANCE = new PostgresTC(); 
+            INSTANCE.start(); 
+        }
         return INSTANCE;
     }
 }

memory-api/src/test/resources/application-test.yml

@@ -19,9 +19,6 @@ cloud:
   aws:
     enabled: false
 
-# ElasticSearch Configuration for testing (disabled)
-elasticsearch:
-  enabled: false
 
 jwt:
   token:
@@ -34,4 +31,16 @@ logging:
   level:
     org.springframework.web: INFO
     com.memory: INFO
-    com.amazonaws: WARN
+    com.amazonaws: WARN
+    # TestContainers 관련 디버깅 로그
+    com.memory.controller.PostgresTC: DEBUG
+    com.memory.controller.ElasticSearchTC: DEBUG
+    com.memory.controller.BaseIntegrationTest: DEBUG
+    org.testcontainers: INFO
+    org.springframework.boot.test: DEBUG
+    org.springframework.test.context: DEBUG
+    org.flywaydb: INFO
+    org.postgresql: INFO
+    # ElasticSearch 로깅
+    org.elasticsearch: INFO
+    org.springframework.data.elasticsearch: DEBUG