Merge pull request #555 from woowacourse-teams/refactor/544-test-perf…

…ormance 테스트코드 리팩토링 메인 merge
woowacourse-teams · Oct 10, 2023 · f80eb00 · f80eb00
2 parents e93ed58 + 82cee80
commit f80eb00
Show file tree

Hide file tree

Showing 35 changed files with 1,558 additions and 1,553 deletions.
diff --git a/server/src/main/resources/application-test.yaml b/server/src/main/resources/application-test.yaml
@@ -1,3 +1,5 @@
+log: &log-option false
+
 spring:
   auth:
     key: testtesttesttesttesttesttesttesttesttesttesttesttesttesttest
@@ -33,8 +35,8 @@ spring:
     properties:
       hibernate:
         default_batch_fetch_size: 1000
-        format_sql: true
-    show-sql: true
+        format_sql: *log-option
+    show-sql: *log-option
 
 s3:
   bucket: 2023-team-project/2023-yozm-cafe/test/images
diff --git a/server/src/test/java/com/project/yozmcafe/controller/AuthControllerTest.java b/server/src/test/java/com/project/yozmcafe/controller/AuthControllerTest.java
diff --git a/server/src/test/java/com/project/yozmcafe/controller/BaseControllerTest.java b/server/src/test/java/com/project/yozmcafe/controller/BaseControllerTest.java
@@ -1,25 +1,42 @@
 package com.project.yozmcafe.controller;
 
-import com.project.yozmcafe.BaseTest;
-import io.restassured.RestAssured;
-import io.restassured.builder.RequestSpecBuilder;
-import io.restassured.specification.RequestSpecification;
+import static io.restassured.RestAssured.given;
+import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.documentationConfiguration;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.restdocs.RestDocumentationContextProvider;
 import org.springframework.restdocs.RestDocumentationExtension;
 
-import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.documentationConfiguration;
+import com.project.yozmcafe.BaseTest;
+import com.project.yozmcafe.domain.S3Client;
+import com.project.yozmcafe.service.auth.JwtTokenProvider;
+
+import io.restassured.RestAssured;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.filter.Filter;
+import io.restassured.specification.RequestSpecification;
 
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @ExtendWith(RestDocumentationExtension.class)
 public abstract class BaseControllerTest extends BaseTest {
 
     @LocalServerPort
     private int port;
+
+    @SpyBean
+    protected S3Client s3Client;
+    @SpyBean
+    protected JwtTokenProvider jwtTokenProvider;
+
+    @Value("${log}")
+    private boolean showLog;
+
     protected RequestSpecification spec;
 
     @BeforeEach
@@ -28,4 +45,20 @@ void setUp(RestDocumentationContextProvider restDocumentation) {
         this.spec = new RequestSpecBuilder().addFilter(documentationConfiguration(restDocumentation))
                 .build();
     }
+
+    protected RequestSpecification customGiven() {
+        final RequestSpecification customGiven = given();
+        if (showLog) {
+            return customGiven.log().all();
+        }
+        return customGiven;
+    }
+
+    protected RequestSpecification customGivenWithDocs(Filter document) {
+        final RequestSpecification customGiven = given(spec).filter(document);
+        if (showLog) {
+            return customGiven.log().all();
+        }
+        return customGiven;
+    }
 }