From 1ccf1140a37e9ad4eb6c171c8fafb88208095621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lkd9125=28=EC=9D=B4=EA=B2=BD=EB=8F=84=29?= Date: Wed, 7 Feb 2024 17:41:14 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20[=EC=9E=84=EC=8B=9C]=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=82=BD?= =?UTF-8?q?=EC=9E=85=20=ED=9B=84=20=EC=82=AD=EC=A0=9C=20=EC=A1=B0=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kac/com/code/ComnCodeControllerTest.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/kac-app/src/test/java/kr/co/palnet/kac/com/code/ComnCodeControllerTest.java b/app/kac-app/src/test/java/kr/co/palnet/kac/com/code/ComnCodeControllerTest.java index df2033f..012c478 100644 --- a/app/kac-app/src/test/java/kr/co/palnet/kac/com/code/ComnCodeControllerTest.java +++ b/app/kac-app/src/test/java/kr/co/palnet/kac/com/code/ComnCodeControllerTest.java @@ -9,10 +9,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import java.util.List; - import kr.co.palnet.kac.BaseTest; -import kr.co.palnet.kac.api.v1.com.code.model.CodeRS; import kr.co.palnet.kac.api.v1.com.code.model.FormCodeGroupRQ; import kr.co.palnet.kac.api.v1.com.code.model.FormCodeLangRQ; import kr.co.palnet.kac.api.v1.com.code.model.FormCodeRQ; @@ -21,16 +18,15 @@ import kr.co.palnet.kac.api.v1.com.code.service.ComCodeService; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; import org.springframework.restdocs.RestDocumentationExtension; import org.springframework.restdocs.payload.JsonFieldType; +import org.springframework.test.annotation.Rollback; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -39,7 +35,6 @@ import kr.co.palnet.kac.app.KacAppApplication; @SpringBootTest(classes = KacAppApplication.class) @ExtendWith({RestDocumentationExtension.class}) @RequiredArgsConstructor -@Transactional(propagation = Propagation.SUPPORTS) public class ComnCodeControllerTest extends BaseTest { @Autowired @@ -468,7 +463,7 @@ public class ComnCodeControllerTest extends BaseTest { @DisplayName("모든 코드 조회") @Test - @Transactional + @Transactional(propagation = Propagation.SUPPORTS) public void getAllCodeByGroup() throws Exception{ String randomNm = "NEW_GROUP_" + System.currentTimeMillis(); @@ -483,12 +478,12 @@ public class ComnCodeControllerTest extends BaseTest { FormCodeLangRQ langRq = FormCodeLangRQ.builder().groupCd(randomNm).cdId("NEW_CODE001").langDivCd("ko_KR").cdNm("신규코드001").rm("비고....").build(); comCodeService.createCodeLang(langRq); - String groupCd = "NEW_GROUP1002"; + String groupCd = randomNm; String langDivCd = "ko_KR"; this.mockMvc.perform( get(this.BASE_URL + "/code") - .param("groupCd", groupCd) + .param("groupCd", randomNm) .param("langDivCd", langDivCd) .contentType(MediaType.APPLICATION_JSON_VALUE) .accept(MediaType.APPLICATION_JSON_VALUE) @@ -514,6 +509,10 @@ public class ComnCodeControllerTest extends BaseTest { ) ) .andExpect(status().isOk()); + +// comCodeService.deleteLang(randomNm, "NEW_CODE001", "ko_KR"); +// comCodeService.deleteCode(randomNm, "NEW_CODE001"); + comCodeService.deleteCodeGroup(randomNm); } @DisplayName("모든 그룹과 코드 조회")