From 15f2d4c6937e66157bffd358466ffc6b82319bf3 Mon Sep 17 00:00:00 2001 From: seungsje Date: Tue, 23 Jul 2024 12:10:59 +0900 Subject: [PATCH] =?UTF-8?q?[Refactoring]=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EA=B0=9D=EC=B2=B4=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agendateam/AgendaTeamControllerTest.java | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/gg-agenda-api/src/test/java/gg/agenda/api/user/agendateam/AgendaTeamControllerTest.java b/gg-agenda-api/src/test/java/gg/agenda/api/user/agendateam/AgendaTeamControllerTest.java index c00a21de6..722bbe5ed 100644 --- a/gg-agenda-api/src/test/java/gg/agenda/api/user/agendateam/AgendaTeamControllerTest.java +++ b/gg-agenda-api/src/test/java/gg/agenda/api/user/agendateam/AgendaTeamControllerTest.java @@ -35,7 +35,6 @@ import gg.data.agenda.AgendaProfile; import gg.data.agenda.AgendaTeam; import gg.data.agenda.AgendaTeamProfile; -import gg.data.agenda.Ticket; import gg.data.agenda.type.AgendaStatus; import gg.data.agenda.type.AgendaTeamStatus; import gg.data.user.User; @@ -92,7 +91,7 @@ void beforeEach() { public void addNewTeamStatusSeoul() throws Exception { //given Agenda agenda = agendaMockData.createAgenda(SEOUL); - Ticket ticket = agendaMockData.createTicket(seoulUserAgendaProfile); + agendaMockData.createTicket(seoulUserAgendaProfile); TeamCreateReqDto req = new TeamCreateReqDto("teamName", true, "SEOUL", "teamContent"); String content = objectMapper.writeValueAsString(req); @@ -120,7 +119,7 @@ public void addNewTeamStatusSeoul() throws Exception { public void addNewTeamStatusGyeongsan() throws Exception { //given Agenda agenda = agendaMockData.createAgenda(GYEONGSAN); - Ticket ticket = agendaMockData.createTicket(gyeongsanUserAgendaProfile); + agendaMockData.createTicket(gyeongsanUserAgendaProfile); TeamCreateReqDto req = new TeamCreateReqDto("teamName", true, "GYEONGSAN", "teamContent"); String content = objectMapper.writeValueAsString(req); @@ -148,7 +147,7 @@ public void addNewTeamStatusGyeongsan() throws Exception { public void addNewTeamStatusMixFromSeoul() throws Exception { //given Agenda agenda = agendaMockData.createAgenda(MIX); - Ticket ticket = agendaMockData.createTicket(seoulUserAgendaProfile); + agendaMockData.createTicket(seoulUserAgendaProfile); TeamCreateReqDto req = new TeamCreateReqDto("teamName", true, "SEOUL", "teamContent"); String content = objectMapper.writeValueAsString(req); @@ -176,7 +175,7 @@ public void addNewTeamStatusMixFromSeoul() throws Exception { public void addNewTeamStatusMixFromGyeongsan() throws Exception { //given Agenda agenda = agendaMockData.createAgenda(MIX); - Ticket ticket = agendaMockData.createTicket(gyeongsanUserAgendaProfile); + agendaMockData.createTicket(gyeongsanUserAgendaProfile); TeamCreateReqDto req = new TeamCreateReqDto("teamName", true, "GYEONGSAN", "teamContent"); String content = objectMapper.writeValueAsString(req); @@ -204,7 +203,7 @@ public void addNewTeamStatusMixFromGyeongsan() throws Exception { public void addNewTeamStatusMixFromMixToSeoul() throws Exception { //given Agenda agenda = agendaMockData.createAgenda(MIX); - Ticket ticket = agendaMockData.createTicket(seoulUserAgendaProfile); + agendaMockData.createTicket(seoulUserAgendaProfile); TeamCreateReqDto req = new TeamCreateReqDto("teamName", true, "MIX", "teamContent"); String content = objectMapper.writeValueAsString(req); @@ -232,7 +231,7 @@ public void addNewTeamStatusMixFromMixToSeoul() throws Exception { public void addNewTeamStatusMixFromMixToGyeongsan() throws Exception { //given Agenda agenda = agendaMockData.createAgenda(MIX); - Ticket ticket = agendaMockData.createTicket(gyeongsanUserAgendaProfile); + agendaMockData.createTicket(gyeongsanUserAgendaProfile); TeamCreateReqDto req = new TeamCreateReqDto("teamName", true, "MIX", "teamContent"); String content = objectMapper.writeValueAsString(req); @@ -260,7 +259,7 @@ public void addNewTeamStatusMixFromMixToGyeongsan() throws Exception { public void noAgendaFail() throws Exception { //given UUID noAgendaKey = UUID.randomUUID(); - Ticket ticket = agendaMockData.createTicket(seoulUserAgendaProfile); + agendaMockData.createTicket(seoulUserAgendaProfile); TeamCreateReqDto req = new TeamCreateReqDto("teamName", true, "SEOUL", "teamContent"); String content = objectMapper.writeValueAsString(req); @@ -279,7 +278,7 @@ public void noAgendaFail() throws Exception { public void notValidAgendaLocation() throws Exception { //given Agenda agenda = agendaMockData.createAgenda(SEOUL); - Ticket ticket = agendaMockData.createTicket(gyeongsanUserAgendaProfile); + agendaMockData.createTicket(gyeongsanUserAgendaProfile); TeamCreateReqDto req = new TeamCreateReqDto("teamName", true, "GYEONGSAN", "teamContent"); String content = objectMapper.writeValueAsString(req); @@ -298,7 +297,7 @@ public void notValidAgendaLocation() throws Exception { public void notValidAgendaStatus() throws Exception { //given Agenda agenda = agendaMockData.createAgenda(AgendaStatus.CONFIRM); - Ticket ticket = agendaMockData.createTicket(seoulUserAgendaProfile); + agendaMockData.createTicket(seoulUserAgendaProfile); TeamCreateReqDto req = new TeamCreateReqDto("teamName", true, "SEOUL", "teamContent"); String content = objectMapper.writeValueAsString(req); @@ -317,7 +316,7 @@ public void notValidAgendaStatus() throws Exception { public void notValidAgendaTeam() throws Exception { //given Agenda agenda = agendaMockData.createAgenda(5); - Ticket ticket = agendaMockData.createTicket(seoulUserAgendaProfile); + agendaMockData.createTicket(seoulUserAgendaProfile); TeamCreateReqDto req = new TeamCreateReqDto("teamName", true, "SEOUL", "teamContent"); String content = objectMapper.writeValueAsString(req); @@ -336,7 +335,7 @@ public void notValidAgendaTeam() throws Exception { public void notValidAgendaDeadline() throws Exception { //given Agenda agenda = agendaMockData.createAgenda(SEOUL); - Ticket ticket = agendaMockData.createTicket(gyeongsanUserAgendaProfile); + agendaMockData.createTicket(gyeongsanUserAgendaProfile); TeamCreateReqDto req = new TeamCreateReqDto("teamName", true, "GYEONGSAN", "teamContent"); String content = objectMapper.writeValueAsString(req); @@ -355,7 +354,7 @@ public void notValidAgendaDeadline() throws Exception { public void agendaHostFail() throws Exception { //given Agenda agenda = agendaMockData.createAgenda(seoulUser.getIntraId()); - Ticket ticket = agendaMockData.createTicket(seoulUserAgendaProfile); + agendaMockData.createTicket(seoulUserAgendaProfile); TeamCreateReqDto req = new TeamCreateReqDto("teamName", true, "SEOUL", "teamContent"); String content = objectMapper.writeValueAsString(req); @@ -374,7 +373,7 @@ public void agendaHostFail() throws Exception { public void notValidUserLocation() throws Exception { //given Agenda agenda = agendaMockData.createAgenda(SEOUL); - Ticket ticket = agendaMockData.createTicket(gyeongsanUserAgendaProfile); + agendaMockData.createTicket(gyeongsanUserAgendaProfile); TeamCreateReqDto req = new TeamCreateReqDto("teamName", true, "SEOUL", "teamContent"); String content = objectMapper.writeValueAsString(req); @@ -393,7 +392,7 @@ public void notValidUserLocation() throws Exception { public void alreadyTeamNameExist() throws Exception { //given Agenda agenda = agendaMockData.createAgenda(SEOUL); - Ticket ticket = agendaMockData.createTicket(seoulUserAgendaProfile); + agendaMockData.createTicket(seoulUserAgendaProfile); AgendaTeam team = agendaMockData.createAgendaTeam(agenda); TeamCreateReqDto req = new TeamCreateReqDto(team.getName(), true, "SEOUL", "teamContent"); @@ -413,9 +412,9 @@ public void alreadyTeamNameExist() throws Exception { public void alreadyTeamExistForAgenda() throws Exception { //given Agenda agenda = agendaMockData.createAgenda(SEOUL); - Ticket ticket = agendaMockData.createTicket(seoulUserAgendaProfile); + agendaMockData.createTicket(seoulUserAgendaProfile); AgendaTeam team = agendaMockData.createAgendaTeam(agenda, seoulUser); - AgendaTeamProfile agendaTeamProfile = agendaMockData.createAgendaTeamProfile(team, seoulUserAgendaProfile); + agendaMockData.createAgendaTeamProfile(team, seoulUserAgendaProfile); TeamCreateReqDto req = new TeamCreateReqDto("newName", true, "SEOUL", "teamContent"); String content = objectMapper.writeValueAsString(req); @@ -1104,8 +1103,7 @@ void beforeEach() { public void confirmTeamGetSuccess(int page) throws Exception { //given Agenda agenda = agendaMockData.createAgenda(SEOUL); - List teams = new ArrayList<>(); - teams.addAll(agendaMockData.createAgendaTeamList(agenda, 23, AgendaTeamStatus.CONFIRM)); + List teams = agendaMockData.createAgendaTeamList(agenda, 23, AgendaTeamStatus.CONFIRM); PageRequestDto req = new PageRequestDto(page, 5); String content = objectMapper.writeValueAsString(req); // when