officer/egovframe-msa-edu
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: reformat code(menu)

Browse Source
This commit is contained in:
shinmj
2021-12-30 15:36:03 +09:00
parent de4fb43472
commit 016cb069a9
14 changed files with 315 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/attachment/AttachmentApiControllerTest.java
View File

@@ -34,7 +34,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;

18
backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/menu/MenuApiControllerTest.java
View File

@@ -77,7 +77,7 @@ class MenuApiControllerTest {
Menu childMenu = Menu.builder()
.menuKorName("child_" + i)
.site(site)
.parent(parentMenu)
.parent(Optional.of(parentMenu))
.sortSeq(i + 1)
.build();
childMenu.setParentMenu(parentMenu);
@@ -141,7 +141,7 @@ class MenuApiControllerTest {
Menu childMenu1 = Menu.builder()
.menuKorName("child_1_" + i)
.site(site)
.parent(parentMenu1)
.parent(Optional.of(parentMenu1))
.sortSeq(i + 1)
.build();
childMenu1.setParentMenu(parentMenu1);
@@ -150,7 +150,7 @@ class MenuApiControllerTest {
Menu childChildMenu = Menu.builder()
.menuKorName("child_child_1")
.site(site)
.parent(childMenu1)
.parent(Optional.of(childMenu1))
.sortSeq(1)
.build();
childChildMenu.setParentMenu(childMenu1);
@@ -158,7 +158,7 @@ class MenuApiControllerTest {
Menu childChildMenu2 = Menu.builder()
.menuKorName("child_child_1")
.site(site)
.parent(childMenu1)
.parent(Optional.of(childMenu1))
.sortSeq(2)
.build();
childChildMenu2.setParentMenu(childMenu1);
@@ -168,7 +168,7 @@ class MenuApiControllerTest {
Menu childMenu2 = Menu.builder()
.menuKorName("child_2_" + i)
.site(site)
.parent(parentMenu2)
.parent(Optional.of(parentMenu2))
.sortSeq(i + 1)
.build();
childMenu1.setParentMenu(parentMenu2);
@@ -259,7 +259,7 @@ class MenuApiControllerTest {
Menu childMenu1 = Menu.builder()
.menuKorName("child_1_" + i)
.site(site)
.parent(parentMenu1)
.parent(Optional.of(parentMenu1))
.sortSeq(i + 1)
.build();
childMenu1.setParentMenu(parentMenu1);
@@ -306,7 +306,7 @@ class MenuApiControllerTest {
Menu childMenu1 = Menu.builder()
.menuKorName("child_1_" + i)
.site(site)
.parent(parentMenu1)
.parent(Optional.of(parentMenu1))
.sortSeq(i + 1)
.build();
childMenu1.setParentMenu(parentMenu1);
@@ -380,7 +380,7 @@ class MenuApiControllerTest {
Menu childMenu1 = Menu.builder()
.menuKorName("child_1_" + i)
.site(site)
.parent(parentMenu1)
.parent(Optional.of(parentMenu1))
.sortSeq(i + 1)
.build();
childMenu1.setParentMenu(parentMenu1);
@@ -414,7 +414,7 @@ class MenuApiControllerTest {
Menu childMenu1 = Menu.builder()
.menuKorName("child_1_" + i)
.site(site)
.parent(parentMenu1)
.parent(Optional.of(parentMenu1))
.sortSeq(i + 1)
.build();
childMenu1.setParentMenu(parentMenu1);

5
backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/api/menu/MenuRoleApiControllerTest.java
View File

@@ -4,6 +4,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import org.egovframe.cloud.portalservice.api.menu.dto.MenuRoleRequestDto;
@@ -69,7 +70,7 @@ class MenuRoleApiControllerTest {
Menu childMenu = Menu.builder()
.menuKorName("child_" + i)
.site(site)
.parent(parentMenu)
.parent(Optional.of(parentMenu))
.sortSeq(i + 1)
.build();
childMenu.setParentMenu(parentMenu);
@@ -219,7 +220,7 @@ class MenuRoleApiControllerTest {
Menu childMenu = Menu.builder()
.menuKorName("child-any_" + i)
.site(site)
.parent(parentMenu)
.parent(Optional.of(parentMenu))
.sortSeq(i + 1)
.isUse(true)
.build();

5
backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/domain/menu/MenuRepositoryTest.java
View File

@@ -1,5 +1,6 @@
package org.egovframe.cloud.portalservice.domain.menu;
import java.util.Optional;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -90,7 +91,7 @@ class MenuRepositoryTest {
Menu child = Menu.builder()
.menuKorName("child_" + i)
.site(site)
.parent(parentMenu)
.parent(Optional.of(parentMenu))
.sortSeq(i + 1)
.build();
child.setParentMenu(parentMenu);
@@ -125,7 +126,7 @@ class MenuRepositoryTest {
Menu childMenu = Menu.builder()
.menuKorName("child_" + i)
.site(site)
.parent(parentMenu)
.parent(Optional.of(parentMenu))
.sortSeq(i + 1)
.build();
childMenu.setParentMenu(parentMenu);

3
backend/portal-service/src/test/java/org/egovframe/cloud/portalservice/domain/menu/MenuRoleRepositoryTest.java
View File

@@ -1,5 +1,6 @@
package org.egovframe.cloud.portalservice.domain.menu;
import java.util.Optional;
import org.assertj.core.api.Assertions;
import org.egovframe.cloud.portalservice.api.menu.dto.MenuRoleResponseDto;
import org.junit.jupiter.api.AfterEach;
@@ -75,7 +76,7 @@ class MenuRoleRepositoryTest {
Menu child = Menu.builder()
.menuKorName("child_" + i)
.site(site)
.parent(parent)
.parent(Optional.of(parent))
.sortSeq(i + 1)
.level(2)
.build();