Skip to content

Commit 8448e98

Browse files
committed
chore: test용 환경 분리
1 parent 5dae0ff commit 8448e98

File tree

8 files changed

+78
-15
lines changed

8 files changed

+78
-15
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,13 @@ on:
77
jobs:
88
build:
99
runs-on: ubuntu-latest
10-
timeout-minutes: 10
1110
permissions:
1211
contents: read
1312
checks: write
1413

1514
steps:
1615
- name: Checkout the code
1716
uses: actions/checkout@v4
18-
with:
19-
token: ${{ secrets.SUBMODULE_ACCESS_TOKEN }}
20-
submodules: true
2117

2218
- name: Set up JDK 17
2319
uses: actions/setup-java@v4

src/main/java/com/example/solidconnection/SolidConnectionApplication.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
88
import org.springframework.scheduling.annotation.EnableScheduling;
99

10+
import java.util.Arrays;
11+
1012
@ConfigurationPropertiesScan
1113
@EnableScheduling
1214
@EnableJpaAuditing
@@ -15,7 +17,10 @@
1517
public class SolidConnectionApplication {
1618

1719
public static void main(String[] args) {
20+
System.out.println("시작");
21+
System.out.println(String.join("\n", Arrays.stream(System.getProperty("java.class.path").split(":")).toList()));
1822
SpringApplication.run(SolidConnectionApplication.class, args);
23+
System.out.println(System.getProperty("java.class.path"));
24+
System.out.println("끝");
1925
}
20-
2126
}

src/test/java/com/example/solidconnection/database/DatabaseConnectionTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
99
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
1010
import org.springframework.jdbc.core.JdbcTemplate;
11-
import org.springframework.test.context.ActiveProfiles;
1211

1312
import java.sql.DatabaseMetaData;
1413
import java.sql.SQLException;
@@ -20,7 +19,6 @@
2019

2120
@Disabled
2221
@AutoConfigureTestDatabase(connection = EmbeddedDatabaseConnection.H2, replace = AutoConfigureTestDatabase.Replace.ANY)
23-
@ActiveProfiles("test")
2422
@DataJpaTest
2523
class DatabaseConnectionTest {
2624

src/test/java/com/example/solidconnection/database/RedisConnectionTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@
66
import org.springframework.beans.factory.annotation.Autowired;
77
import org.springframework.boot.test.context.SpringBootTest;
88
import org.springframework.data.redis.core.RedisTemplate;
9-
import org.springframework.test.context.ActiveProfiles;
109

1110
import static org.assertj.core.api.Assertions.assertThat;
1211

1312
@Disabled
14-
@ActiveProfiles("test")
1513
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
1614
class RedisConnectionTest {
1715

src/test/java/com/example/solidconnection/support/DatabaseCleaner.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
import org.springframework.beans.factory.annotation.Autowired;
66
import org.springframework.data.redis.core.RedisTemplate;
77
import org.springframework.stereotype.Component;
8-
import org.springframework.test.context.ActiveProfiles;
98
import org.springframework.transaction.annotation.Transactional;
109

1110
import java.util.List;
1211
import java.util.Objects;
1312

14-
@ActiveProfiles("test")
1513
@Component
1614
public class DatabaseCleaner {
1715

src/test/java/com/example/solidconnection/support/TestContainerDataJpaTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
44
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
55
import org.springframework.context.annotation.Import;
6-
import org.springframework.test.context.ActiveProfiles;
76
import org.testcontainers.junit.jupiter.Testcontainers;
87

98
import java.lang.annotation.ElementType;
@@ -13,7 +12,6 @@
1312

1413
@DataJpaTest
1514
@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
16-
@ActiveProfiles("test")
1715
@Testcontainers
1816
@Import(MySQLTestContainer.class)
1917
@Target(ElementType.TYPE)

src/test/java/com/example/solidconnection/support/TestContainerSpringBootTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
55
import org.springframework.boot.test.context.SpringBootTest;
66
import org.springframework.context.annotation.Import;
7-
import org.springframework.test.context.ActiveProfiles;
87
import org.testcontainers.junit.jupiter.Testcontainers;
98

109
import java.lang.annotation.ElementType;
@@ -15,7 +14,6 @@
1514
@ExtendWith({DatabaseClearExtension.class})
1615
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
1716
@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
18-
@ActiveProfiles("test")
1917
@Testcontainers
2018
@Import({MySQLTestContainer.class, RedisTestContainer.class})
2119
@Target(ElementType.TYPE)

src/test/resources/application.yml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
spring:
2+
3+
# db
4+
data:
5+
redis:
6+
host: localhost
7+
port: 6379
8+
jpa:
9+
hibernate:
10+
ddl-auto: create-drop
11+
generate-ddl: true
12+
show-sql: true
13+
database: mysql
14+
properties:
15+
hibernate:
16+
format_sql: true
17+
flyway:
18+
enabled: false
19+
20+
# cloud
21+
cloud:
22+
aws:
23+
credentials:
24+
access-key: access-key
25+
secret-key: access-key
26+
region:
27+
static: ap-northeast-2
28+
stack:
29+
auto: false
30+
s3:
31+
bucket: solid-connection-uploaded
32+
url:
33+
default: default-url
34+
uploaded: uploaded-url
35+
cloudFront:
36+
url:
37+
default: default-url
38+
uploaded: uploaded-url
39+
40+
# variable
41+
view:
42+
count:
43+
scheduling:
44+
delay: 3000
45+
oauth:
46+
apple:
47+
token-url: "https://appleid.apple.com/auth/token"
48+
client-secret-audience-url: "https://appleid.apple.com"
49+
public-key-url: "https://appleid.apple.com/auth/keys"
50+
client-id: client-id
51+
team-id: team-id
52+
key-id: key-id
53+
redirect-url: "https://localhost:8080/auth/apple"
54+
kakao:
55+
redirect-url: "http://localhost:8080/auth/kakao"
56+
client-id: client-id
57+
token-url: "https://kauth.kakao.com/oauth/token"
58+
user-info_url: "https://kapi.kakao.com/v2/user/me"
59+
sentry:
60+
environment: test
61+
dsn: "https://test-public-key@sentry.test-domain.io/123456"
62+
send-default-pii: true
63+
traces-sample-rate: 1.0
64+
exception-resolver-order: -2147483647
65+
university:
66+
term: 2024-1
67+
jwt:
68+
secret:
69+
1234567-1234-1234-1234-12345678901
70+
cors:
71+
allowed-origins:
72+
- "http://localhost:8080"

0 commit comments

Comments
 (0)