Style: 테스트 코드

Mini-Team-6 · Nov 30, 2023 · 58d8f39 · 58d8f39
1 parent c72a00d
commit 58d8f39
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 50 deletions.
diff --git a/src/test/java/ybe/mini/travelserver/domain/accommodation/DummyAccommodation.java b/src/test/java/ybe/mini/travelserver/domain/accommodation/DummyAccommodation.java
@@ -14,7 +14,7 @@ protected Accommodation dummyAccommodation() {
                         .latitude(37.7940780970)
                         .longitude(128.9186301059)
                         .build())
-                .image("http://tong.visitkorea.or.kr/cms/resource/54/2603354_image2_1.jpg")
+                .image("https://tong.visitkorea.or.kr/cms/resource/54/2603354_image2_1.jpg")
                 .description("푸른 해송숲과 청정 바다가 펼쳐진 강문해변에서의 자연 휴양과...")
                 .build();
     }

diff --git a/...est/java/ybe/mini/travelserver/domain/accommodation/service/AccommodationServiceTest.java b/...est/java/ybe/mini/travelserver/domain/accommodation/service/AccommodationServiceTest.java
@@ -1,13 +1,10 @@
 package ybe.mini.travelserver.domain.accommodation.service;
 
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.mockito.junit.jupiter.MockitoExtension;
 import ybe.mini.travelserver.domain.accommodation.DummyAccommodation;
 import ybe.mini.travelserver.domain.accommodation.dto.AccommodationDetailGetResponse;
@@ -21,9 +18,11 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.BDDMockito.then;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.eq;
 
 @ExtendWith(MockitoExtension.class)
 class AccommodationServiceTest extends DummyAccommodation {
@@ -42,7 +41,7 @@ void SearchAccommodations_success() {
         List<AccommodationGetResponse> responseDto = expectedAccommodations.stream()
                 .map(AccommodationGetResponse::fromEntity)
                 .toList();
-        given(tourAPIService.bringAccommodations(eq(1), eq(10), eq("호텔"), eq("1")))
+        given(tourAPIService.bringAccommodations(anyInt(), anyInt(), anyString(), anyString()))
                 .willReturn(expectedAccommodations);
 
         // when
@@ -64,7 +63,7 @@ void SearchAccommodation_success() {
         Accommodation expectedAccommodation = dummyAccommodation();
         AccommodationDetailGetResponse responseDto =
                 AccommodationDetailGetResponse.fromEntity(expectedAccommodation);
-        given(tourAPIService.bringAccommodation(eq("호텔"), eq("1")))
+        given(tourAPIService.bringAccommodation(anyString(), anyString()))
                 .willReturn(expectedAccommodation);
 
         // when

diff --git a/src/test/java/ybe/mini/travelserver/domain/cart/service/CartServiceTest.java b/src/test/java/ybe/mini/travelserver/domain/cart/service/CartServiceTest.java
@@ -51,7 +51,7 @@ class CartServiceTest implements DummyPrincipal, DummyCart {
 
     @Test
     @DisplayName("장바구니 생성")
-    void createCart_success(){
+    void createCart_success() {
         // given
         CartCreateRequest cartCreateRequest =
                 CartCreateRequest.builder()

diff --git a/src/test/java/ybe/mini/travelserver/domain/member/controller/MemberControllerTest.java b/src/test/java/ybe/mini/travelserver/domain/member/controller/MemberControllerTest.java
@@ -72,7 +72,7 @@ void testBringMember() {
     @DisplayName("회원정보 수정 테스트")
     void testUpdateMember() {
         // given
-        given(memberService.updateMemberProfile(any(),any())).willReturn(dummyMypageUpdateResponse());
+        given(memberService.updateMemberProfile(any(), any())).willReturn(dummyMypageUpdateResponse());
 
         // when
         var actual = memberController.updateMember(

diff --git a/src/test/java/ybe/mini/travelserver/domain/reservation/dummy/DummyReservation.java b/src/test/java/ybe/mini/travelserver/domain/reservation/dummy/DummyReservation.java
@@ -13,7 +13,7 @@ default Reservation dummyReservation() {
                 .id(1L)
                 .member(dummyMember())
                 .paymentType(PaymentType.KAKAO_PAY)
-                .createdAt(LocalDateTime.of(2022,1,1,0,0))
+                .createdAt(LocalDateTime.of(2022, 1, 1, 0, 0))
                 .build();
     }
 }
diff --git a/src/test/java/ybe/mini/travelserver/domain/reservation/dummy/DummyReservationDTO.java b/src/test/java/ybe/mini/travelserver/domain/reservation/dummy/DummyReservationDTO.java
@@ -28,7 +28,7 @@ default ReservationCreateRequest dummyReservationCreateReq() {
     default ReservationGetResponse dummyReservationGetRes() {
         return ReservationGetResponse.builder()
                 .id(1L)
-                .createdAt(LocalDateTime.of(2022,1,1,0,0))
+                .createdAt(LocalDateTime.of(2022, 1, 1, 0, 0))
                 .paymentType(KAKAO_PAY)
                 .reservationRooms(List.of(dummyReservationRoomGetRes()))
                 .build();

diff --git a/...est/java/ybe/mini/travelserver/domain/reservation_room/dummy/DummyReservationRoomDTO.java b/...est/java/ybe/mini/travelserver/domain/reservation_room/dummy/DummyReservationRoomDTO.java
@@ -1,13 +1,11 @@
 package ybe.mini.travelserver.domain.reservation_room.dummy;
 
-import ybe.mini.travelserver.domain.reservation.dto.ReservationGetResponse;
 import ybe.mini.travelserver.domain.reservation_room.dto.ReservationRoomCreateRequest;
 import ybe.mini.travelserver.domain.reservation_room.dto.ReservationRoomGetResponse;
 import ybe.mini.travelserver.domain.reservation_room.entity.ReservationRoomStatus;
 import ybe.mini.travelserver.domain.room.DummyObjectForRoom;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 public interface DummyReservationRoomDTO extends DummyObjectForRoom {
 
@@ -36,8 +34,8 @@ default ReservationRoomCreateRequest dummyReservationRoomCreateReq2() {
     default ReservationRoomGetResponse dummyReservationRoomGetRes() {
         return ReservationRoomGetResponse.builder()
                 .id(1L)
-                .checkIn(LocalDate.of(2024,1,1))
-                .checkOut(LocalDate.of(2024,1,2))
+                .checkIn(LocalDate.of(2024, 1, 1))
+                .checkOut(LocalDate.of(2024, 1, 2))
                 .guestNumber(2)
                 .status(ReservationRoomStatus.RESERVED)
                 .room(dummyRoomGetResponse())

diff --git a/src/test/java/ybe/mini/travelserver/domain/room/DummyObjectForControllerAndService.java b/src/test/java/ybe/mini/travelserver/domain/room/DummyObjectForControllerAndService.java
@@ -1,23 +1,9 @@
 package ybe.mini.travelserver.domain.room;
 
-import ybe.mini.travelserver.domain.accommodation.entity.Location;
 import ybe.mini.travelserver.domain.accommodation.entity.Accommodation;
 import ybe.mini.travelserver.domain.room.entity.Room;
 
-public class DummyObjectForControllerAndService implements DummyObjectForRoom{
-
-    public Room dummyRoom(Accommodation accommodation) {
-        return Room.builder()
-                .capacity(2)
-                .description("객실 설명 1")
-                .image("이미지 1")
-                .name("객실 이름 1")
-                .price(100000)
-                .roomTypeId(1L)
-                .stock(50)
-                .accommodation(accommodation)
-                .build();
-    }
+public class DummyObjectForControllerAndService implements DummyObjectForRoom {
 
     public Room dummyRoom1(Accommodation accommodation) {
         return Room.builder()
@@ -31,20 +17,4 @@ public Room dummyRoom1(Accommodation accommodation) {
                 .accommodation(accommodation)
                 .build();
     }
-
-    public Accommodation dummyAccommodation() {
-        return Accommodation.builder()
-                .id(1L)
-                .name("세인트존스 호텔")
-                .location(Location.builder()
-                        .address("강원특별자치도 강릉시 창해로 307 ")
-                        .phone("033-660-9000")
-                        .areaCode("32")
-                        .latitude(37.7940780970)
-                        .longitude(128.9186301059)
-                        .build())
-                .image("http://tong.visitkorea.or.kr/cms/resource/54/2603354_image2_1.jpg")
-                .description("푸른 해송숲과 청정 바다가 펼쳐진 강문해변에서의 자연 휴양과...")
-                .build();
-    }
 }
diff --git a/src/test/java/ybe/mini/travelserver/domain/room/DummyObjectForRoom.java b/src/test/java/ybe/mini/travelserver/domain/room/DummyObjectForRoom.java
@@ -1,7 +1,7 @@
 package ybe.mini.travelserver.domain.room;
 
-import ybe.mini.travelserver.domain.accommodation.entity.Location;
 import ybe.mini.travelserver.domain.accommodation.entity.Accommodation;
+import ybe.mini.travelserver.domain.accommodation.entity.Location;
 import ybe.mini.travelserver.domain.room.dto.RoomGetResponse;
 import ybe.mini.travelserver.domain.room.entity.Room;
 
@@ -44,7 +44,7 @@ default Accommodation dummyAccommodation() {
                         .latitude(37.7940780970)
                         .longitude(128.9186301059)
                         .build())
-                .image("http://tong.visitkorea.or.kr/cms/resource/54/2603354_image2_1.jpg")
+                .image("https://tong.visitkorea.or.kr/cms/resource/54/2603354_image2_1.jpg")
                 .description("푸른 해송숲과 청정 바다가 펼쳐진 강문해변에서의 자연 휴양과...")
                 .build();
     }

diff --git a/src/test/java/ybe/mini/travelserver/domain/room/controller/RoomControllerTest.java b/src/test/java/ybe/mini/travelserver/domain/room/controller/RoomControllerTest.java
@@ -18,12 +18,13 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.BDDMockito.then;
 
 @ExtendWith(MockitoExtension.class)
-public class RoomControllerTest extends DummyObjectForControllerAndService {
+class RoomControllerTest extends DummyObjectForControllerAndService {
 
     @Mock
     private RoomService roomService;