diff --git a/src/main/java/com/knu/ddip/common/config/RedisConfig.java b/src/main/java/com/knu/ddip/common/config/RedisConfig.java index d4c4f51..0d20ba7 100644 --- a/src/main/java/com/knu/ddip/common/config/RedisConfig.java +++ b/src/main/java/com/knu/ddip/common/config/RedisConfig.java @@ -17,11 +17,13 @@ @Configuration public class RedisConfig { - @Value("${REDIS_HOST}") + @Value("${spring.data.redis.host}") private String host; - @Value("${REDIS_PORT}") + + @Value("${spring.data.redis.port}") private int port; - @Value("${REDIS_PASSWORD}") + + @Value("${spring.data.redis.password}") private String password; @Bean diff --git a/src/main/java/com/knu/ddip/common/config/RedissonConfig.java b/src/main/java/com/knu/ddip/common/config/RedissonConfig.java index d01e04f..76cb55a 100644 --- a/src/main/java/com/knu/ddip/common/config/RedissonConfig.java +++ b/src/main/java/com/knu/ddip/common/config/RedissonConfig.java @@ -12,13 +12,13 @@ @Configuration public class RedissonConfig { - @Value("${REDIS_HOST}") + @Value("${spring.data.redis.host}") private String host; - @Value("${REDIS_PORT}") + @Value("${spring.data.redis.port}") private int port; - @Value("${REDIS_PASSWORD}") + @Value("${spring.data.redis.password}") private String password; @Bean diff --git a/src/test/java/com/knu/ddip/DdipApplicationTests.java b/src/test/java/com/knu/ddip/DdipApplicationTests.java index b3f0efa..5485b8d 100644 --- a/src/test/java/com/knu/ddip/DdipApplicationTests.java +++ b/src/test/java/com/knu/ddip/DdipApplicationTests.java @@ -6,9 +6,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ActiveProfiles; -@ActiveProfiles("test") @SpringBootTest @ExtendWith({RedisTestContainerConfig.class, MySQLTestContainerConfig.class, TestEnvironmentConfig.class}) class DdipApplicationTests { diff --git a/src/test/java/com/knu/ddip/auth/infrastructure/repository/RedisTokenRepositoryImplIntegrationTest.java b/src/test/java/com/knu/ddip/auth/infrastructure/repository/RedisTokenRepositoryImplIntegrationTest.java index 66d38ea..6cec3d5 100644 --- a/src/test/java/com/knu/ddip/auth/infrastructure/repository/RedisTokenRepositoryImplIntegrationTest.java +++ b/src/test/java/com/knu/ddip/auth/infrastructure/repository/RedisTokenRepositoryImplIntegrationTest.java @@ -14,14 +14,12 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Import; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.test.context.ActiveProfiles; import java.util.Optional; import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; -@ActiveProfiles("test") @SpringBootTest @ExtendWith({RedisTestContainerConfig.class, MySQLTestContainerConfig.class, TestEnvironmentConfig.class}) @Import(IntegrationTestConfig.class) diff --git a/src/test/java/com/knu/ddip/config/IntegrationTestConfig.java b/src/test/java/com/knu/ddip/config/IntegrationTestConfig.java index 8307ac2..346f290 100644 --- a/src/test/java/com/knu/ddip/config/IntegrationTestConfig.java +++ b/src/test/java/com/knu/ddip/config/IntegrationTestConfig.java @@ -2,7 +2,6 @@ import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.Import; -import org.springframework.test.context.ActiveProfiles; @TestConfiguration diff --git a/src/test/java/com/knu/ddip/config/RedisTestConfig.java b/src/test/java/com/knu/ddip/config/RedisTestConfig.java index 9ac8c2f..17d8762 100644 --- a/src/test/java/com/knu/ddip/config/RedisTestConfig.java +++ b/src/test/java/com/knu/ddip/config/RedisTestConfig.java @@ -11,7 +11,6 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer; -import org.springframework.test.context.ActiveProfiles; @TestConfiguration public class RedisTestConfig { diff --git a/src/test/java/com/knu/ddip/location/application/service/LocationServiceTest.java b/src/test/java/com/knu/ddip/location/application/service/LocationServiceTest.java index 18f1485..3b4b5ed 100644 --- a/src/test/java/com/knu/ddip/location/application/service/LocationServiceTest.java +++ b/src/test/java/com/knu/ddip/location/application/service/LocationServiceTest.java @@ -17,7 +17,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Import; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.test.context.ActiveProfiles; import java.util.ArrayList; import java.util.List; @@ -29,7 +28,6 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -@ActiveProfiles("test") @SpringBootTest @ExtendWith({RedisTestContainerConfig.class, MySQLTestContainerConfig.class, TestEnvironmentConfig.class}) @Import(IntegrationTestConfig.class) diff --git a/src/test/java/com/knu/ddip/location/infrastructure/repository/LocationReaderImplTest.java b/src/test/java/com/knu/ddip/location/infrastructure/repository/LocationReaderImplTest.java index 3c1b23f..ec8dad1 100644 --- a/src/test/java/com/knu/ddip/location/infrastructure/repository/LocationReaderImplTest.java +++ b/src/test/java/com/knu/ddip/location/infrastructure/repository/LocationReaderImplTest.java @@ -7,14 +7,12 @@ import com.knu.ddip.location.exception.LocationNotFoundException; import com.knu.ddip.location.infrastructure.entity.LocationEntity; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Import; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.test.context.ActiveProfiles; import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -25,7 +23,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; -@ActiveProfiles("test") @Transactional @SpringBootTest @ExtendWith({RedisTestContainerConfig.class, MySQLTestContainerConfig.class, TestEnvironmentConfig.class}) diff --git a/src/test/java/com/knu/ddip/location/infrastructure/repository/LocationWriterImplTest.java b/src/test/java/com/knu/ddip/location/infrastructure/repository/LocationWriterImplTest.java index b7531d3..ba4f33b 100644 --- a/src/test/java/com/knu/ddip/location/infrastructure/repository/LocationWriterImplTest.java +++ b/src/test/java/com/knu/ddip/location/infrastructure/repository/LocationWriterImplTest.java @@ -12,7 +12,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Import; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.test.context.ActiveProfiles; import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -21,7 +20,6 @@ import static com.knu.ddip.location.application.util.LocationKeyFactory.*; import static org.assertj.core.api.Assertions.assertThat; -@ActiveProfiles("test") @Transactional @SpringBootTest @ExtendWith({RedisTestContainerConfig.class, MySQLTestContainerConfig.class, TestEnvironmentConfig.class})