From 53cfcf0e6ce7a342cd1967e53b17bbd905ba14be Mon Sep 17 00:00:00 2001 From: shinmj Date: Thu, 28 Oct 2021 11:17:55 +0900 Subject: [PATCH] =?UTF-8?q?=E2=9C=85=20update=20test=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/menu/MenuApiControllerTest.java | 250 +++++++++--------- .../api/menu/MenuRoleApiControllerTest.java | 108 ++++---- .../api/policy/PolicyApiControllerTest.java | 71 +++-- .../StatisticsApiControllerTest.java | 26 +- 4 files changed, 228 insertions(+), 227 deletions(-) diff --git a/backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/menu/MenuApiControllerTest.java b/backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/menu/MenuApiControllerTest.java index dd49ac0..9121e00 100644 --- a/backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/menu/MenuApiControllerTest.java +++ b/backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/menu/MenuApiControllerTest.java @@ -37,7 +37,6 @@ import org.springframework.test.context.TestPropertySource; @ActiveProfiles(profiles = "test") class MenuApiControllerTest { - @Autowired private TestRestTemplate restTemplate; @@ -51,9 +50,9 @@ class MenuApiControllerTest { @BeforeEach public void setup() throws Exception { siteRepository.save(Site.builder() - .name("site") - .isUse(true) - .build() + .name("site") + .isUse(true) + .build() ); } @@ -68,24 +67,24 @@ class MenuApiControllerTest { Site site = siteRepository.findAll().get(0); Menu parentMenu = menuRepository.save(Menu.builder() - .menuKorName("parent") - .sortSeq(1) - .site(site) - .build()); + .menuKorName("parent") + .sortSeq(1) + .site(site) + .build()); for (int i = 0; i < 3; i++) { Menu childMenu = Menu.builder() - .menuKorName("child_" + i) - .site(site) - .parent(parentMenu) - .sortSeq(i + 1) - .build(); + .menuKorName("child_" + i) + .site(site) + .parent(parentMenu) + .sortSeq(i + 1) + .build(); childMenu.setParentMenu(parentMenu); menuRepository.save(childMenu); } //when - ResponseEntity> responseEntity = restTemplate.exchange("/api/v1/"+site.getId()+"/menus", HttpMethod.GET, null, new ParameterizedTypeReference>(){}); + ResponseEntity> responseEntity = restTemplate.exchange("/api/v1/menus/"+site.getId()+"/tree", HttpMethod.GET, null, new ParameterizedTypeReference>(){}); //then assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); @@ -102,14 +101,14 @@ class MenuApiControllerTest { public void 메뉴관리_사이트콤보_목록_조회한다() throws Exception { //given siteRepository.save(Site.builder() - .name("portal") - .isUse(true) - .build() + .name("portal") + .isUse(true) + .build() ); siteRepository.save(Site.builder() - .name("admin") - .isUse(true) - .build() + .name("admin") + .isUse(true) + .build() ); //when @@ -127,50 +126,50 @@ class MenuApiControllerTest { Site site = siteRepository.findAll().get(0); Menu parentMenu1 = menuRepository.save(Menu.builder() - .menuKorName("parent_1") - .sortSeq(1) - .site(site) - .build()); + .menuKorName("parent_1") + .sortSeq(1) + .site(site) + .build()); Menu parentMenu2 = menuRepository.save(Menu.builder() - .menuKorName("parent_2") - .sortSeq(2) - .site(site) - .build()); + .menuKorName("parent_2") + .sortSeq(2) + .site(site) + .build()); for (int i = 0; i < 3; i++) { Menu childMenu1 = Menu.builder() - .menuKorName("child_1_" + i) - .site(site) - .parent(parentMenu1) - .sortSeq(i + 1) - .build(); + .menuKorName("child_1_" + i) + .site(site) + .parent(parentMenu1) + .sortSeq(i + 1) + .build(); childMenu1.setParentMenu(parentMenu1); menuRepository.save(childMenu1); if (i == 1) { Menu childChildMenu = Menu.builder() - .menuKorName("child_child_1") - .site(site) - .parent(childMenu1) - .sortSeq(1) - .build(); + .menuKorName("child_child_1") + .site(site) + .parent(childMenu1) + .sortSeq(1) + .build(); childChildMenu.setParentMenu(childMenu1); menuRepository.save(childChildMenu); Menu childChildMenu2 = Menu.builder() - .menuKorName("child_child_1") - .site(site) - .parent(childMenu1) - .sortSeq(2) - .build(); + .menuKorName("child_child_1") + .site(site) + .parent(childMenu1) + .sortSeq(2) + .build(); childChildMenu2.setParentMenu(childMenu1); menuRepository.save(childChildMenu2); } Menu childMenu2 = Menu.builder() - .menuKorName("child_2_" + i) - .site(site) - .parent(parentMenu2) - .sortSeq(i + 1) - .build(); + .menuKorName("child_2_" + i) + .site(site) + .parent(parentMenu2) + .sortSeq(i + 1) + .build(); childMenu1.setParentMenu(parentMenu2); menuRepository.save(childMenu2); } @@ -197,18 +196,19 @@ class MenuApiControllerTest { Site site = siteRepository.findAll().get(0); Menu parentMenu = menuRepository.save(Menu.builder() - .menuKorName("parent") - .sortSeq(1) - .site(site) - .build()); + .menuKorName("parent") + .menuKorName("parenteng") + .sortSeq(1) + .site(site) + .build()); //when - String url = "/api/v1/manager/menus/"+parentMenu.getId(); + String url = "/api/v1/menus/"+parentMenu.getId(); ResponseEntity responseEntity = restTemplate.getForEntity(url, MenuResponseDto.class); //then assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(responseEntity.getBody()).extracting("name").isEqualTo(parentMenu.getMenuKorName()); + assertThat(responseEntity.getBody()).extracting("menuKorName").isEqualTo(parentMenu.getMenuKorName()); System.out.println(responseEntity.getBody()); } @@ -219,11 +219,11 @@ class MenuApiControllerTest { Site site = siteRepository.findAll().get(0); MenuTreeRequestDto menuTreeRequestDto = MenuTreeRequestDto.builder() - .parentId(null) - .siteId(site.getId()) - .name("parent") - .sortSeq(1) - .build(); + .parentId(null) + .siteId(site.getId()) + .name("parent") + .sortSeq(1) + .build(); String url = "/api/v1/menus"; @@ -237,35 +237,30 @@ class MenuApiControllerTest { } - /** - * @TODO - * bulk update 수정 필요 - * @throws Exception - */ @Test public void 메뉴관리_트리_드래그앤드랍_순서_및_부모메뉴_변경() throws Exception { //given Site site = siteRepository.findAll().get(0); Menu parentMenu1 = menuRepository.save(Menu.builder() - .menuKorName("parent_1") - .sortSeq(1) - .site(site) - .build()); + .menuKorName("parent_1") + .sortSeq(1) + .site(site) + .build()); Menu parentMenu2 = menuRepository.save(Menu.builder() - .menuKorName("parent_2") - .sortSeq(2) - .site(site) - .build()); + .menuKorName("parent_2") + .sortSeq(2) + .site(site) + .build()); Long menuId = 0L; for (int i = 0; i < 3; i++) { Menu childMenu1 = Menu.builder() - .menuKorName("child_1_" + i) - .site(site) - .parent(parentMenu1) - .sortSeq(i + 1) - .build(); + .menuKorName("child_1_" + i) + .site(site) + .parent(parentMenu1) + .sortSeq(i + 1) + .build(); childMenu1.setParentMenu(parentMenu1); Menu save = menuRepository.save(childMenu1); menuId = save.getId(); @@ -274,25 +269,24 @@ class MenuApiControllerTest { List updateList = new ArrayList<>(); updateList.add(MenuDnDRequestDto.builder() - .menuId(menuId) - .sortSeq(1) - .parentId(parentMenu2.getId()) - .build()); + .menuId(menuId) + .sortSeq(1) + .parentId(parentMenu2.getId()) + .build()); HttpEntity> httpEntity = new HttpEntity<>( - updateList + updateList ); String url = "/api/v1/menus/"+site.getId()+"/tree"; //when - ResponseEntity> responseEntity = - restTemplate.exchange(url, HttpMethod.PUT, httpEntity, new ParameterizedTypeReference>(){}); + ResponseEntity responseEntity = + restTemplate.exchange(url, HttpMethod.PUT, httpEntity, Long.class); //then assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); - responseEntity.getBody().stream().forEach(System.out::println); } @@ -301,19 +295,19 @@ class MenuApiControllerTest { Site site = siteRepository.findAll().get(0); Menu parentMenu1 = menuRepository.save(Menu.builder() - .menuKorName("parent_1") - .sortSeq(1) - .site(site) - .build()); + .menuKorName("parent_1") + .sortSeq(1) + .site(site) + .build()); Long menuId = 0L; for (int i = 0; i < 3; i++) { Menu childMenu1 = Menu.builder() - .menuKorName("child_1_" + i) - .site(site) - .parent(parentMenu1) - .sortSeq(i + 1) - .build(); + .menuKorName("child_1_" + i) + .site(site) + .parent(parentMenu1) + .sortSeq(i + 1) + .build(); childMenu1.setParentMenu(parentMenu1); Menu save = menuRepository.save(childMenu1); menuId = save.getId(); @@ -323,7 +317,7 @@ class MenuApiControllerTest { //when ResponseEntity responseEntity = - restTemplate.exchange(url, HttpMethod.PUT, null, MenuTreeResponseDto.class); + restTemplate.exchange(url, HttpMethod.PUT, null, MenuTreeResponseDto.class); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(responseEntity.getBody().getName()).isEqualTo("updateName"); @@ -336,31 +330,31 @@ class MenuApiControllerTest { Site site = siteRepository.findAll().get(0); Menu parentMenu1 = menuRepository.save(Menu.builder() - .menuKorName("parent_1") - .sortSeq(1) - .site(site) - .build()); + .menuKorName("parent_1") + .sortSeq(1) + .site(site) + .build()); String url = "/api/v1/menus/"+parentMenu1.getId(); HttpEntity httpEntity = new HttpEntity<>( - MenuUpdateRequestDto.builder() - .description("상위메뉴") - .connectId(1) - .menuType("menuType") - .urlPath("/index") - .subName("subname") - .isUse(true) - .isShow(true) - .isBlank(false) - .icon("icon") + MenuUpdateRequestDto.builder() + .description("상위메뉴") + .connectId(1) + .menuType("menuType") + .urlPath("/index") + .subName("subname") + .isUse(true) + .isShow(true) + .isBlank(false) + .icon("icon") .build() ); //when ResponseEntity responseEntity = - restTemplate.exchange(url, HttpMethod.PUT, httpEntity, MenuResponseDto.class); + restTemplate.exchange(url, HttpMethod.PUT, httpEntity, MenuResponseDto.class); //then assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); @@ -375,19 +369,19 @@ class MenuApiControllerTest { Site site = siteRepository.findAll().get(0); Menu parentMenu1 = menuRepository.save(Menu.builder() - .menuKorName("parent_1") - .sortSeq(1) - .site(site) - .build()); + .menuKorName("parent_1") + .sortSeq(1) + .site(site) + .build()); Long menuId = 0L; for (int i = 0; i < 3; i++) { Menu childMenu1 = Menu.builder() - .menuKorName("child_1_" + i) - .site(site) - .parent(parentMenu1) - .sortSeq(i + 1) - .build(); + .menuKorName("child_1_" + i) + .site(site) + .parent(parentMenu1) + .sortSeq(i + 1) + .build(); childMenu1.setParentMenu(parentMenu1); Menu save = menuRepository.save(childMenu1); menuId = save.getId(); @@ -409,19 +403,19 @@ class MenuApiControllerTest { Site site = siteRepository.findAll().get(0); Menu parentMenu1 = menuRepository.save(Menu.builder() - .menuKorName("parent_1") - .sortSeq(1) - .site(site) - .build()); + .menuKorName("parent_1") + .sortSeq(1) + .site(site) + .build()); Long menuId = 0L; for (int i = 0; i < 3; i++) { Menu childMenu1 = Menu.builder() - .menuKorName("child_1_" + i) - .site(site) - .parent(parentMenu1) - .sortSeq(i + 1) - .build(); + .menuKorName("child_1_" + i) + .site(site) + .parent(parentMenu1) + .sortSeq(i + 1) + .build(); childMenu1.setParentMenu(parentMenu1); Menu save = menuRepository.save(childMenu1); menuId = save.getId(); diff --git a/backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/menu/MenuRoleApiControllerTest.java b/backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/menu/MenuRoleApiControllerTest.java index 933fa40..4480b0b 100644 --- a/backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/menu/MenuRoleApiControllerTest.java +++ b/backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/menu/MenuRoleApiControllerTest.java @@ -15,6 +15,7 @@ import org.egovframe.cloud.portalservice.domain.menu.MenuRole; import org.egovframe.cloud.portalservice.domain.menu.MenuRoleRepository; import org.egovframe.cloud.portalservice.domain.menu.Site; import org.egovframe.cloud.portalservice.domain.menu.SiteRepository; +import org.egovframe.cloud.portalservice.domain.user.Role; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -36,7 +37,6 @@ import org.springframework.test.context.TestPropertySource; @ActiveProfiles(profiles = "test") class MenuRoleApiControllerTest { - @Autowired private TestRestTemplate restTemplate; @@ -52,24 +52,24 @@ class MenuRoleApiControllerTest { @BeforeEach public void setup() throws Exception { Site site = Site.builder() - .name("site") - .isUse(true) - .build(); + .name("site") + .isUse(true) + .build(); siteRepository.save(site); Menu parentMenu = menuRepository.save(Menu.builder() - .menuKorName("parent") - .sortSeq(1) - .site(site) - .build()); + .menuKorName("parent") + .sortSeq(1) + .site(site) + .build()); for (int i = 0; i < 3; i++) { Menu childMenu = Menu.builder() - .menuKorName("child_" + i) - .site(site) - .parent(parentMenu) - .sortSeq(i + 1) - .build(); + .menuKorName("child_" + i) + .site(site) + .parent(parentMenu) + .sortSeq(i + 1) + .build(); childMenu.setParentMenu(parentMenu); menuRepository.save(childMenu); } @@ -87,7 +87,7 @@ class MenuRoleApiControllerTest { Site site = siteRepository.findAll().get(0); //when ResponseEntity> responseEntity = - restTemplate.exchange("/api/v1/menu-roles/role/"+site.getId(), HttpMethod.GET, null, new ParameterizedTypeReference>(){}); + restTemplate.exchange("/api/v1/menu-roles/role/"+site.getId(), HttpMethod.GET, null, new ParameterizedTypeReference>(){}); //then assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); @@ -108,22 +108,25 @@ class MenuRoleApiControllerTest { Menu child1 = menus.stream().filter(menu -> menu.getMenuKorName().equals("child_1")).collect(Collectors.toList()).get(0); List menuRoles = new ArrayList<>(); - menuRoles.add(MenuRole.builder().roleId("role").menu(parent).build()); - menuRoles.add(MenuRole.builder().roleId("role").menu(child1).build()); + MenuRole menuRole1 = MenuRole.builder().roleId("ROLE").menu(parent).build(); + menuRoles.add(menuRole1); + MenuRole menuRole2 = MenuRole.builder().roleId("ROLE").menu(child1).build(); + menuRoles.add(menuRole2); + menuRoleRepository.saveAll(menuRoles); Site site = siteRepository.findAll().get(0); //when ResponseEntity> responseEntity = - restTemplate.exchange("/api/v1/menu-roles/role/"+site.getId(), HttpMethod.GET, null, new ParameterizedTypeReference>(){}); + restTemplate.exchange("/api/v1/menu-roles/role/"+site.getId(), HttpMethod.GET, null, new ParameterizedTypeReference>(){}); //then assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); List body = responseEntity.getBody(); assertThat(body.size()).isEqualTo(1); - assertThat(body.get(0).getIsChecked()).isTrue(); body.stream().forEach(System.out::println); + assertThat(body.get(0).getIsChecked()).isTrue(); assertThat(body.get(0).getChildren().size()).isEqualTo(3); body.stream().forEach(menuTreeResponseDto -> { menuTreeResponseDto.getChildren().stream().forEach(child -> { @@ -149,38 +152,39 @@ class MenuRoleApiControllerTest { list.get(0).getChildren().stream().forEach(menuRoleResponseDto -> { if (menuRoleResponseDto.getKorName().equals("child_1")) { children.add(MenuRoleRequestDto.builder() - .menuRoleId(menuRoleResponseDto.getMenuRoleId()) - .isChecked(true) - .roleId("role") - .id(menuRoleResponseDto.getId()) - .build()); + .menuRoleId(menuRoleResponseDto.getMenuRoleId()) + .isChecked(true) + .roleId("ROLE") + .id(menuRoleResponseDto.getId()) + .build()); }else { children.add(MenuRoleRequestDto.builder() - .menuRoleId(menuRoleResponseDto.getMenuRoleId()) - .isChecked(false) - .roleId("role") - .id(menuRoleResponseDto.getId()) - .build()); + .menuRoleId(menuRoleResponseDto.getMenuRoleId()) + .isChecked(false) + .roleId("ROLE") + .id(menuRoleResponseDto.getId()) + .build()); } }); requestDtoList.add(MenuRoleRequestDto.builder() - .menuRoleId(list.get(0).getMenuRoleId()) - .isChecked(true) - .id(list.get(0).getId()) - .children(children) - .build()); + .menuRoleId(list.get(0).getMenuRoleId()) + .isChecked(true) + .roleId("ROLE") + .id(list.get(0).getId()) + .children(children) + .build()); HttpEntity> httpEntity = new HttpEntity<>( - requestDtoList + requestDtoList ); //when ResponseEntity responseEntity = - restTemplate.exchange("/api/v1/menu-roles", HttpMethod.POST, httpEntity, String.class); + restTemplate.exchange("/api/v1/menu-roles", HttpMethod.POST, httpEntity, String.class); //then assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); @@ -197,36 +201,38 @@ class MenuRoleApiControllerTest { //given Site site = siteRepository.findAll().get(0); Menu parentMenu = menuRepository.save(Menu.builder() - .menuKorName("parent-any") - .sortSeq(1) - .site(site) - .build()); + .menuKorName("parent-any") + .sortSeq(1) + .site(site) + .isUse(true) + .build()); MenuRole parentMenuRole = MenuRole.builder() - .roleId("ROLE_ANONYMOUS") - .menu(parentMenu) - .build(); + .roleId(Role.ANONYMOUS.getKey()) + .menu(parentMenu) + .build(); parentMenuRole.setMenu(parentMenu); menuRoleRepository.save(parentMenuRole); for (int i = 0; i < 3; i++) { Menu childMenu = Menu.builder() - .menuKorName("child-any_" + i) - .site(site) - .parent(parentMenu) - .sortSeq(i + 1) - .build(); + .menuKorName("child-any_" + i) + .site(site) + .parent(parentMenu) + .sortSeq(i + 1) + .isUse(true) + .build(); childMenu.setParentMenu(parentMenu); menuRepository.save(childMenu); MenuRole role_any = MenuRole.builder() - .roleId("ROLE_ANONYMOUS") - .menu(childMenu) - .build(); + .roleId(Role.ANONYMOUS.getKey()) + .menu(childMenu) + .build(); role_any.setMenu(childMenu); menuRoleRepository.save(role_any); } //when ResponseEntity> responseEntity = - restTemplate.exchange("/api/v1/menu-roles/"+site.getId(), HttpMethod.GET, null, new ParameterizedTypeReference>(){}); + restTemplate.exchange("/api/v1/menu-roles/"+site.getId(), HttpMethod.GET, null, new ParameterizedTypeReference>(){}); //then diff --git a/backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/policy/PolicyApiControllerTest.java b/backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/policy/PolicyApiControllerTest.java index 855f5d9..5598313 100644 --- a/backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/policy/PolicyApiControllerTest.java +++ b/backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/policy/PolicyApiControllerTest.java @@ -59,12 +59,12 @@ class PolicyApiControllerTest { } policyRepository.save(Policy.builder() - .type(type) - .title(title) - .isUse(true) - .regDate(ZonedDateTime.now()) - .contents(contents) - .build()); + .type(type) + .title(title) + .isUse(true) + .regDate(ZonedDateTime.now()) + .contents(contents) + .build()); } } @@ -81,17 +81,16 @@ class PolicyApiControllerTest { String contents = "test contents"; PolicySaveRequestDto requestDto = PolicySaveRequestDto.builder() - .type(type) - .title(title) - .isUse(true) - .regDate(ZonedDateTime.now()) - .contents(contents) - .build(); + .type(type) + .title(title) + .isUse(true) + .regDate(ZonedDateTime.now()) + .contents(contents) + .build(); - String url = "http://localhost:"+port+API_URL; //when - ResponseEntity responseEntity = restTemplate.postForEntity(url, requestDto, Long.class); + ResponseEntity responseEntity = restTemplate.postForEntity(API_URL, requestDto, Long.class); //then assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); @@ -104,10 +103,10 @@ class PolicyApiControllerTest { @Test public void 목록조회한다() throws Exception { - String url = "http://localhost:"+port+API_URL+"?size=3%page=0"; + String url = API_URL+"?size=3%page=0"; //when ResponseEntity> responseEntity = - restTemplate.exchange(url, HttpMethod.GET, null, new ParameterizedTypeReference>() {}); + restTemplate.exchange(url, HttpMethod.GET, null, new ParameterizedTypeReference>() {}); //then assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); @@ -134,7 +133,7 @@ class PolicyApiControllerTest { @Test public void ID로_한건조회_정상() throws Exception { - String url = "http://localhost:"+port+API_URL +"/9"; + String url = API_URL +"/9"; //when ResponseEntity responseEntity = restTemplate.getForEntity(url, PolicyResponseDto.class); @@ -148,17 +147,17 @@ class PolicyApiControllerTest { public void 이용약관_수정_된다() throws Exception { //given Long id = policyRepository.save(Policy.builder() - .type("TOS") - .title("title") - .contents("contents!!!!") - .build() + .type("TOS") + .title("title") + .contents("contents!!!!") + .build() ).getId(); - String url = "http://localhost:"+port+API_URL +"/"+id; + String url = API_URL +"/"+id; PolicyUpdateRequestDto requestDto = PolicyUpdateRequestDto.builder() - .title("update title") - .contents("update Details") - .build(); + .title("update title") + .contents("update Details") + .build(); //when HttpEntity requestEntity = new HttpEntity<>(requestDto); @@ -178,12 +177,12 @@ class PolicyApiControllerTest { public void 이용약관_삭제_한다() { //given Long id = policyRepository.save(Policy.builder() - .type("TOS") - .title("title") - .contents("contents!!!!") - .build() + .type("TOS") + .title("title") + .contents("contents!!!!") + .build() ).getId(); - String url = "http://localhost:"+port+API_URL +"/"+id; + String url = API_URL +"/"+id; //when restTemplate.delete(url); @@ -197,13 +196,13 @@ class PolicyApiControllerTest { public void 사용여부_수정_한다() throws Exception { //given Long id = policyRepository.save(Policy.builder() - .type("TOS") - .title("title") - .isUse(true) - .contents("contents!!!") - .build() + .type("TOS") + .title("title") + .isUse(true) + .contents("contents!!!") + .build() ).getId(); - String url = "http://localhost:"+port+API_URL +"/"+id+"/"+false; + String url = API_URL +"/"+id+"/"+false; //when ResponseEntity responseEntity = restTemplate.exchange(url, HttpMethod.PUT, null, Long.class); diff --git a/backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/statistics/StatisticsApiControllerTest.java b/backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/statistics/StatisticsApiControllerTest.java index 7da28b8..3bfb56b 100644 --- a/backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/statistics/StatisticsApiControllerTest.java +++ b/backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/statistics/StatisticsApiControllerTest.java @@ -2,6 +2,7 @@ package org.egovframe.cloud.portalservice.api.statistics; import static org.assertj.core.api.Assertions.assertThat; +import java.time.LocalDate; import java.util.List; import org.egovframe.cloud.portalservice.api.statistics.dto.StatisticsResponseDto; @@ -33,14 +34,13 @@ class StatisticsApiControllerTest { @Autowired private StatisticsRepository statisticsRepository; - @BeforeEach public void setup() { for (int i = 0; i < 10; i++) { statisticsRepository.save(Statistics.builder() - .siteId(1L) - .remoteIp("testip") - .build()); + .siteId(1L) + .remoteIp("testip") + .build()); } } @@ -55,10 +55,10 @@ class StatisticsApiControllerTest { Long siteId = 1L; // when ResponseEntity< List> responseEntity = - restTemplate.exchange("/api/v1/statistics/monthly/"+siteId, - HttpMethod.GET, - null, - new ParameterizedTypeReference>(){}); + restTemplate.exchange("/api/v1/statistics/monthly/"+siteId, + HttpMethod.GET, + null, + new ParameterizedTypeReference>(){}); responseEntity.getBody().forEach(System.out::println); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); @@ -70,12 +70,14 @@ class StatisticsApiControllerTest { public void 일별접속통계_조회_성공() throws Exception { Long siteId = 1L; + LocalDate now = LocalDate.now(); + // when ResponseEntity< List> responseEntity = - restTemplate.exchange("/api/v1/statistics/daily/"+siteId+"?year=2021&month=9", - HttpMethod.GET, - null, - new ParameterizedTypeReference>(){}); + restTemplate.exchange("/api/v1/statistics/daily/"+siteId+"?year="+now.getYear()+"&month="+now.getMonthValue(), + HttpMethod.GET, + null, + new ParameterizedTypeReference>(){}); responseEntity.getBody().forEach(System.out::println); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);