Skip to content

Commit 35c3161

Browse files
committed
[Fix] GitHub runner에서 testcontainers가 docker를 찾지 못하는 문제 해결 (#294)
* chore: testcontainers의 버전을 최신 버전으로 수정 * fix: testcontainers의 버전 변경에 따른 ArrayUtils의 import 수정 * refactor: SonarQube가 제안된 코드로 수정 * chore: Testcontainers 버전을 BOM 적용 * fix: Testcontainers의 BOM을 1.21.4 버전으로 변경 * fix: BOM 제거 * fix: java 배포판을 temurin으로 변경
1 parent 0dddf42 commit 35c3161

14 files changed

Lines changed: 30 additions & 41 deletions

File tree

.github/workflows/pr-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: JDK 17 설치
2929
uses: actions/setup-java@v4
3030
with:
31-
distribution: 'oracle'
31+
distribution: 'temurin'
3232
java-version: '17'
3333
cache: 'gradle'
3434

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ dependencies {
5858
// Test
5959
testImplementation 'org.springframework.boot:spring-boot-starter-test'
6060
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
61-
testImplementation 'org.springframework.boot:spring-boot-testcontainers'
62-
testImplementation 'org.testcontainers:testcontainers'
63-
testImplementation 'org.testcontainers:junit-jupiter'
64-
testImplementation "org.testcontainers:mariadb:1.19.7"
6561
testImplementation 'org.springframework.security:spring-security-test'
62+
testImplementation 'org.springframework.boot:spring-boot-testcontainers'
63+
testImplementation 'org.testcontainers:testcontainers:2.0.3'
64+
testImplementation 'org.testcontainers:junit-jupiter:1.21.4'
65+
testImplementation 'org.testcontainers:mariadb:1.21.4'
6666

6767
// Hibernate-spatial
6868
implementation 'org.hibernate:hibernate-spatial:6.6.3.Final'

src/test/java/org/programmers/signalbuddyfinal/domain/admin/controller/AdminFeedbackControllerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.Arrays;
2525
import java.util.List;
2626
import java.util.stream.Stream;
27+
import org.apache.commons.lang3.ArrayUtils;
2728
import org.junit.jupiter.api.DisplayName;
2829
import org.junit.jupiter.api.Test;
2930
import org.programmers.signalbuddyfinal.domain.admin.service.AdminFeedbackService;
@@ -49,7 +50,6 @@
4950
import org.springframework.restdocs.payload.JsonFieldType;
5051
import org.springframework.test.context.bean.override.mockito.MockitoBean;
5152
import org.springframework.test.web.servlet.ResultActions;
52-
import org.testcontainers.shaded.org.apache.commons.lang3.ArrayUtils;
5353

5454
@WebMvcTest(AdminFeedbackController.class)
5555
class AdminFeedbackControllerTest extends ControllerTest {

src/test/java/org/programmers/signalbuddyfinal/domain/admin/controller/AdminMemberControllerTest.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
import static com.epages.restdocs.apispec.MockMvcRestDocumentationWrapper.document;
44
import static com.epages.restdocs.apispec.ResourceDocumentation.resource;
55
import static org.mockito.ArgumentMatchers.any;
6+
import static org.mockito.BDDMockito.given;
67
import static org.programmers.signalbuddyfinal.global.support.RestDocsFormatGenerators.pageResponseFormat;
8+
import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessRequest;
79
import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessResponse;
810
import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
911
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
@@ -15,6 +17,7 @@
1517
import com.epages.restdocs.apispec.ResourceSnippetParameters;
1618
import java.time.LocalDateTime;
1719
import java.util.List;
20+
import org.apache.commons.lang3.ArrayUtils;
1821
import org.junit.jupiter.api.DisplayName;
1922
import org.junit.jupiter.api.Test;
2023
import org.programmers.signalbuddyfinal.domain.admin.dto.AdminMemberResponse;
@@ -30,12 +33,6 @@
3033
import org.springframework.data.domain.PageRequest;
3134
import org.springframework.data.domain.Pageable;
3235
import org.springframework.test.context.bean.override.mockito.MockitoBean;
33-
import org.springframework.test.web.servlet.ResultActions;
34-
import org.testcontainers.shaded.org.apache.commons.lang3.ArrayUtils;
35-
36-
import static org.mockito.BDDMockito.*;
37-
38-
import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessRequest;
3936

4037
@WebMvcTest(AdminMemberController.class)
4138
class AdminMemberControllerTest extends ControllerTest {
@@ -100,7 +97,7 @@ void getAllMember() throws Exception {
10097

10198
@DisplayName("회원 필터링 조회")
10299
@Test
103-
public void FilteredMember() throws Exception {
100+
void FilteredMember() throws Exception {
104101
final MemberFilterRequest filter = MemberFilterRequest.builder()
105102
.role(MemberRole.USER)
106103
.status(MemberStatus.ACTIVITY)

src/test/java/org/programmers/signalbuddyfinal/domain/admin/controller/AdminPostItControllerTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import com.epages.restdocs.apispec.SimpleType;
2828
import java.time.LocalDateTime;
2929
import java.util.List;
30+
import org.apache.commons.lang3.ArrayUtils;
3031
import org.junit.jupiter.api.DisplayName;
3132
import org.junit.jupiter.api.Test;
3233
import org.programmers.signalbuddyfinal.domain.admin.dto.AdminPostItResponse;
@@ -47,10 +48,9 @@
4748
import org.springframework.restdocs.payload.JsonFieldType;
4849
import org.springframework.test.context.bean.override.mockito.MockitoBean;
4950
import org.springframework.test.web.servlet.ResultActions;
50-
import org.testcontainers.shaded.org.apache.commons.lang3.ArrayUtils;
5151

5252
@WebMvcTest(AdminPostItController.class)
53-
public class AdminPostItControllerTest extends ControllerTest {
53+
class AdminPostItControllerTest extends ControllerTest {
5454

5555
private final String tag = "Admin API";
5656

@@ -233,8 +233,8 @@ void FilteredPostIt() throws Exception {
233233
.param("startDate", filter.getStartDate().toString())
234234
.param("endDate", filter.getEndDate().toString())
235235
.param("search", filter.getSearch())
236-
.param("danger", filter.getSearch().toString())
237-
.param("deleted", filter.getSearch().toString())
236+
.param("danger", filter.getSearch())
237+
.param("deleted", filter.getSearch())
238238
.header("Accept", "application/json"))
239239
.andExpect(status().isOk())
240240
.andDo(print())

src/test/java/org/programmers/signalbuddyfinal/domain/air_quality/controller/AirQualityControllerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
1414

1515
import com.epages.restdocs.apispec.ResourceSnippetParameters;
16+
import org.apache.commons.lang3.ArrayUtils;
1617
import org.junit.jupiter.api.DisplayName;
1718
import org.junit.jupiter.api.Test;
1819
import org.programmers.signalbuddyfinal.domain.air_quality.dto.AirQualityResponse;
1920
import org.programmers.signalbuddyfinal.domain.air_quality.service.AirQualityService;
2021
import org.programmers.signalbuddyfinal.global.support.ControllerTest;
2122
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
2223
import org.springframework.test.context.bean.override.mockito.MockitoBean;
23-
import org.testcontainers.shaded.org.apache.commons.lang3.ArrayUtils;
2424
@WebMvcTest(AirQualityController.class)
25-
public class AirQualityControllerTest extends ControllerTest {
25+
class AirQualityControllerTest extends ControllerTest {
2626

2727
private final String tag = "AirQuality API";
2828

src/test/java/org/programmers/signalbuddyfinal/domain/comment/controller/CommentControllerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.time.LocalDateTime;
2929
import java.util.ArrayList;
3030
import java.util.List;
31+
import org.apache.commons.lang3.ArrayUtils;
3132
import org.junit.jupiter.api.DisplayName;
3233
import org.junit.jupiter.api.Test;
3334
import org.programmers.signalbuddyfinal.domain.comment.dto.CommentRequest;
@@ -49,7 +50,6 @@
4950
import org.springframework.restdocs.payload.JsonFieldType;
5051
import org.springframework.test.context.bean.override.mockito.MockitoBean;
5152
import org.springframework.test.web.servlet.ResultActions;
52-
import org.testcontainers.shaded.org.apache.commons.lang3.ArrayUtils;
5353

5454
@WebMvcTest(CommentController.class)
5555
class CommentControllerTest extends ControllerTest {

src/test/java/org/programmers/signalbuddyfinal/domain/feedback_report/controller/FeedbackReportControllerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.time.LocalDateTime;
3030
import java.util.ArrayList;
3131
import java.util.List;
32+
import org.apache.commons.lang3.ArrayUtils;
3233
import org.junit.jupiter.api.DisplayName;
3334
import org.junit.jupiter.api.Test;
3435
import org.programmers.signalbuddyfinal.domain.feedback_report.dto.FeedbackReportRequest;
@@ -56,7 +57,6 @@
5657
import org.springframework.restdocs.payload.JsonFieldType;
5758
import org.springframework.test.context.bean.override.mockito.MockitoBean;
5859
import org.springframework.test.web.servlet.ResultActions;
59-
import org.testcontainers.shaded.org.apache.commons.lang3.ArrayUtils;
6060

6161
@WebMvcTest(FeedbackReportController.class)
6262
class FeedbackReportControllerTest extends ControllerTest {

src/test/java/org/programmers/signalbuddyfinal/domain/feedback_summary/controller/FeedbackSummaryControllerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.time.LocalDateTime;
2323
import java.util.ArrayList;
2424
import java.util.List;
25+
import org.apache.commons.lang3.ArrayUtils;
2526
import org.junit.jupiter.api.DisplayName;
2627
import org.junit.jupiter.api.Test;
2728
import org.programmers.signalbuddyfinal.domain.feedback.entity.enums.FeedbackCategory;
@@ -36,7 +37,6 @@
3637
import org.springframework.restdocs.payload.JsonFieldType;
3738
import org.springframework.test.context.bean.override.mockito.MockitoBean;
3839
import org.springframework.test.web.servlet.ResultActions;
39-
import org.testcontainers.shaded.org.apache.commons.lang3.ArrayUtils;
4040

4141
@WebMvcTest(FeedbackSummaryController.class)
4242
class FeedbackSummaryControllerTest extends ControllerTest {

src/test/java/org/programmers/signalbuddyfinal/domain/like/controller/LikeControllerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import com.epages.restdocs.apispec.ResourceSnippetParameters;
2323
import com.epages.restdocs.apispec.SimpleType;
24+
import org.apache.commons.lang3.ArrayUtils;
2425
import org.junit.jupiter.api.DisplayName;
2526
import org.junit.jupiter.api.Test;
2627
import org.programmers.signalbuddyfinal.domain.like.dto.LikeExistResponse;
@@ -33,7 +34,6 @@
3334
import org.springframework.restdocs.payload.JsonFieldType;
3435
import org.springframework.test.context.bean.override.mockito.MockitoBean;
3536
import org.springframework.test.web.servlet.ResultActions;
36-
import org.testcontainers.shaded.org.apache.commons.lang3.ArrayUtils;
3737

3838
@WebMvcTest(LikeController.class)
3939
class LikeControllerTest extends ControllerTest {

0 commit comments

Comments
 (0)