[refactor/InhaBas#179] SignUp 완료로 이전 주석처리한 Menu 코드 수정

whitem4rk · Dec 13, 2023 · 5030a8c · 5030a8c
1 parent c7502fa
commit 5030a8c
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 37 deletions.
diff --git a/resource-server/src/test/java/com/inhabas/api/domain/menu/repository/MenuRepositoryTest.java b/resource-server/src/test/java/com/inhabas/api/domain/menu/repository/MenuRepositoryTest.java
@@ -34,35 +34,34 @@ public void setUp() {
 
     }
 
-//    @DisplayName("새로운 메뉴를 만든다.")
-//    @Test
-//    public void CreateNewMenu() {
-//        //given
-//        MenuGroup menuGroup1 = em.persist(new MenuGroup("IBAS"));
-//        Menu activityBoardMenu = new Menu(menuGroup1, 1, MenuType.LIST, "동아리 활동", "동아리원의 활동을 기록하는 게시판입니다.");
-//
-//        //when
-//        Menu saveActivityMenu = menuRepository.save(activityBoardMenu);
-//        em.flush();
-//
-//        //then
-//        assertThat(saveActivityMenu.getId()).isNotNull();
-//        assertThat(saveActivityMenu.getDateCreated()).isNotNull();
-//        assertThat(saveActivityMenu.getDateUpdated()).isNotNull();
-//        assertThat(saveActivityMenu)
-//                .usingRecursiveComparison()
-//                .ignoringFields("id", "dateCreated", "dateUpdated")
-//                .isEqualTo(activityBoardMenu);
-//    }
+    @DisplayName("새로운 메뉴를 만든다.")
+    @Test
+    public void CreateNewMenu() {
+        //given
+        MenuGroup menuGroup1 = em.persist(new MenuGroup("IBAS"));
+        Menu activityBoardMenu = new Menu(menuGroup1, 1, MenuType.LIST, "동아리 활동", "동아리원의 활동을 기록하는 게시판입니다.");
+
+        //when
+        Menu saveActivityMenu = menuRepository.save(activityBoardMenu);
+        em.flush();
+
+        //then
+        assertThat(saveActivityMenu.getId()).isNotNull();
+        assertThat(saveActivityMenu.getDateCreated()).isNotNull();
+        assertThat(saveActivityMenu.getDateUpdated()).isNotNull();
+        assertThat(saveActivityMenu)
+                .usingRecursiveComparison()
+                .ignoringFields("id", "dateCreated", "dateUpdated")
+                .isEqualTo(activityBoardMenu);
+    }
 
     @Disabled
     @DisplayName("메뉴 이름을 수정한다.")
     @Test
     public void updateMenuName() {
         //given
-        MenuGroup menuGroup1 = em.persist(new MenuGroup("IBAS"));
-        MenuGroup menuGroup2 = em.persist(new MenuGroup("게시판 목록"));
-        Menu noticeMenu = menuRepository.save(new Menu(menuGroup2, 1, MenuType.LIST, "공지사항", "동아리 공지를 게시하는 게시판입니다."));
+        MenuGroup menuGroup = em.persist(new MenuGroup("게시판 목록"));
+        Menu noticeMenu = menuRepository.save(new Menu(menuGroup, 1, MenuType.LIST, "공지사항", "동아리 공지를 게시하는 게시판입니다."));
 
         //when
         String newName = "공지 사항";

diff --git a/resource-server/src/test/java/com/inhabas/api/web/MenuControllerTest.java b/resource-server/src/test/java/com/inhabas/api/web/MenuControllerTest.java
@@ -31,20 +31,20 @@ public class MenuControllerTest {
     @Autowired
     private MockMvc mvc;
 
-//    @DisplayName("모든 메뉴 정보를 조회한다.")
-//    @Test
-//    public void getTotalMenuInfoTest() throws Exception {
-//        given(menuService.getAllMenuInfo()).willReturn(
-//                List.of(new MenuGroupDto(1, "IBAS", List.of(new MenuDto(new MenuId(6),1,"동아리 소개",MenuType.INTRODUCE, "")))));
-//
-//        mvc.perform(get("/menus"))
-//                .andDo(print())
-//                .andExpect(status().isOk())
-//                .andExpect(content().string("[{\"id\":1,\"groupName\":\"IBAS\",\"menuList\":[{\"menuId\":6,\"priority\":1,\"name\":\"ë\u008F\u0099ì\u0095\u0084ë¦¬ ì\u0086\u008Cê°\u009C\",\"type\":\"INTRODUCE\",\"description\":\"\"}]}]"))
-//                .andReturn();
-//
-//        then(menuService).should(times(1)).getAllMenuInfo();
-//    }
+    @DisplayName("모든 메뉴 정보를 조회한다.")
+    @Test
+    public void getTotalMenuInfoTest() throws Exception {
+        given(menuService.getAllMenuInfo()).willReturn(
+                List.of(new MenuGroupDto(1, "IBAS", List.of(new MenuDto(new MenuId(6),1,"동아리 소개",MenuType.INTRODUCE, "")))));
+
+        mvc.perform(get("/menus"))
+                .andDo(print())
+                .andExpect(status().isOk())
+                .andExpect(content().string("[{\"id\":1,\"groupName\":\"IBAS\",\"menuList\":[{\"menuId\":6,\"priority\":1,\"name\":\"ë\u008F\u0099ì\u0095\u0084ë¦¬ ì\u0086\u008Cê°\u009C\",\"type\":\"INTRODUCE\",\"description\":\"\"}]}]"))
+                .andReturn();
+
+        then(menuService).should(times(1)).getAllMenuInfo();
+    }
 
     @DisplayName("단일 메뉴 정보를 조회한다.")
     @Test