[김대겸] Step1 PR #651
Merged
[김대겸] Step1 PR #651
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 13 commits
December 9, 2022 21:12
limwoobin
approved these changes
Dec 10, 2022
Comment on lines
+9
to
+20
| @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) | ||
| @Sql("/sql/truncate.sql") | ||
| public class AcceptanceTest { | ||
|
|
||
| @LocalServerPort | ||
| int port; | ||
|
|
||
| @BeforeEach | ||
| public void setUp() { | ||
| RestAssured.port = port; | ||
| } | ||
| } |
There was a problem hiding this comment.
인수테스트 정말 꼼꼼하게 잘 작성해주셧네요 ㅎㅎ
호출, 검증기능에 대해서도 잘 분리되어있으니 보기 편하네요!
Comment on lines
+21
to
+23
| @DisplayName("메뉴 그룹 서비스 테스트") | ||
| @ExtendWith(MockitoExtension.class) | ||
| public class MenuGroupServiceTest { |
There was a problem hiding this comment.
서비스에 대한 단위 테스트도 정말 잘 작성해주셨습니다 ㅎㅎ
단위테스트에서 public 접근제어자는 없어도 될것같아요!
There was a problem hiding this comment.
접근제어자는 없어도 될것 같네요 ㅎㅎ 수정하도록 하겠습니다~!
Comment on lines
+105
to
+154
| @DisplayName("가격이 0원 미만인 메뉴를 생성하면 IllegalArgumentException을 반환한다.") | ||
| @Test | ||
| void createWithException() { | ||
| // given | ||
| Menu menu = createMenu(1L, "짜장면_탕수육_1인_메뉴_세트", BigDecimal.valueOf(-1000L), | ||
| 짜장면_탕수육_1인_메뉴_세트.getId(), Arrays.asList(짜장면상품, 탕수육상품, 단무지상품)); | ||
|
|
||
| // when & then | ||
| assertThatIllegalArgumentException().isThrownBy(() -> menuService.create(menu)); | ||
| } | ||
|
|
||
| @DisplayName("존재하지 않는 메뉴그룹이 포함된 메뉴를 생성하면 IllegalArgumentException을 반환한다.") | ||
| @Test | ||
| void createWithException2() { | ||
| // given | ||
| Menu menu = createMenu(1L, "짜장면_탕수육_1인_메뉴_세트", BigDecimal.valueOf(20000L), 10L, | ||
| Arrays.asList(짜장면상품, 탕수육상품, 단무지상품)); | ||
| when(menuGroupDao.existsById(10L)).thenReturn(false); | ||
|
|
||
| // when & then | ||
| assertThatIllegalArgumentException().isThrownBy(() -> menuService.create(menu)); | ||
| } | ||
|
|
||
| @DisplayName("존재하지 않는 상품이 포함된 메뉴를 생성하면 IllegalArgumentException을 반환한다.") | ||
| @Test | ||
| void createWithException3() { | ||
| // given | ||
| Menu menu = createMenu(1L, "짜장면_탕수육_1인_메뉴_세트", BigDecimal.valueOf(20000L), 중국집_1인_메뉴_세트.getId(), | ||
| singletonList(짜장면상품)); | ||
| when(menuGroupDao.existsById(짜장면_탕수육_1인_메뉴_세트.getMenuGroupId())).thenReturn(true); | ||
| when(productDao.findById(짜장면상품.getProductId())).thenReturn(Optional.empty()); | ||
|
|
||
| // when & then | ||
| assertThatIllegalArgumentException().isThrownBy(() -> menuService.create(menu)); | ||
| } | ||
|
|
||
| @DisplayName("메뉴의 가격이 메뉴 상품들의 가격의 합보다 큰 메뉴를 생성하면 IllegalArgumentException을 반환한다.") | ||
| @Test | ||
| void createWithException4() { | ||
| // given | ||
| Menu menu = createMenu(1L, "짜장면_탕수육_1인_메뉴_세트", BigDecimal.valueOf(21000L), 중국집_1인_메뉴_세트.getId(), | ||
| Arrays.asList(짜장면상품, 탕수육상품, 단무지상품)); | ||
| when(menuGroupDao.existsById(짜장면_탕수육_1인_메뉴_세트.getMenuGroupId())).thenReturn(true); | ||
| when(productDao.findById(짜장면상품.getProductId())).thenReturn(Optional.of(짜장면)); | ||
| when(productDao.findById(탕수육상품.getProductId())).thenReturn(Optional.of(탕수육)); | ||
| when(productDao.findById(단무지상품.getProductId())).thenReturn(Optional.of(단무지)); | ||
|
|
||
| // when & then | ||
| assertThatIllegalArgumentException().isThrownBy(() -> menuService.create(menu)); | ||
| } |
Comment on lines
+75
to
+91
| 중국집_1인_메뉴_세트 = createMenuGroup(1L, "중국집_1인_메뉴_세트"); | ||
| 짜장면 = createProduct(1L, "짜장면", BigDecimal.valueOf(8000L)); | ||
| 탕수육 = createProduct(2L, "탕수육", BigDecimal.valueOf(12000L)); | ||
| 짬뽕 = createProduct(3L, "짬뽕", BigDecimal.valueOf(9000L)); | ||
| 단무지 = createProduct(4L, "단무지", BigDecimal.valueOf(0L)); | ||
| 짜장면상품 = createMenuProduct(1L, null, 짜장면.getId(), 1L); | ||
| 탕수육상품 = createMenuProduct(2L, null, 탕수육.getId(), 1L); | ||
| 짬뽕상품 = createMenuProduct(3L, null, 짬뽕.getId(), 1L); | ||
| 단무지상품 = createMenuProduct(4L, null, 단무지.getId(), 1L); | ||
| 짜장면_탕수육_1인_메뉴_세트 = createMenu(1L, "짜장면_탕수육_1인_메뉴_세트", BigDecimal.valueOf(20000L), 중국집_1인_메뉴_세트.getId(), Arrays.asList(짜장면상품, 탕수육상품, 단무지상품)); | ||
| 짬뽕_탕수육_1인_메뉴_세트 = createMenu(2L, "짬뽕_탕수육_1인_메뉴_세트", BigDecimal.valueOf(21000L), 중국집_1인_메뉴_세트.getId(), Arrays.asList(짬뽕상품, 탕수육상품, 단무지상품)); | ||
| 주문테이블1 = createOrderTable(1L, null, 10, false); | ||
| 주문테이블2 = createOrderTable(2L, null, 20, false); | ||
| 짜장면_탕수육_1인_메뉴_세트주문 = createOrderLineItem(1L, null, 짜장면_탕수육_1인_메뉴_세트.getId(), 1); | ||
| 짬뽕_탕수육_1인_메뉴_세트주문 = createOrderLineItem(2L, null, 짬뽕_탕수육_1인_메뉴_세트.getId(), 1); | ||
| 주문1 = createOrder(주문테이블1.getId(), null, null, Arrays.asList(짜장면_탕수육_1인_메뉴_세트주문, 짬뽕_탕수육_1인_메뉴_세트주문)); | ||
| 주문2 = createOrder(주문테이블2.getId(), null, null, singletonList(짜장면_탕수육_1인_메뉴_세트주문)); |
There was a problem hiding this comment.
setUp에 대해 반복적으로 fixture로 객체를 생성하는 부분이 보여지는데요 ㅎㅎ
재사용이 빈번한 객체에 대해서는 객체 자체를 fixture로 올려놓는것도 고려해보면 좋을것같아요 :)
There was a problem hiding this comment.
재사용이 빈번한 객체는 fixture로 올려놓으면 더 관리하기가 용이하겠네요 👍
Comment on lines
+24
to
+47
| public static void 주문_목록_응답됨(ExtractableResponse<Response> response) { | ||
| assertThat(response.statusCode()).isEqualTo(HttpStatus.OK.value()); | ||
| } | ||
|
|
||
| public static void 주문_목록_포함됨(ExtractableResponse<Response> response, List<ExtractableResponse<Response>> createdResponses) { | ||
| List<Long> expectedOrderIds = createdResponses.stream() | ||
| .map(it -> Long.parseLong(it.header("Location").split("/")[3])) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| List<Long> resultOrderIds = response.jsonPath().getList(".", Order.class).stream() | ||
| .map(Order::getId) | ||
| .collect(Collectors.toList()); | ||
|
|
||
| assertThat(resultOrderIds).containsAll(expectedOrderIds); | ||
| } | ||
|
|
||
| public static void 주문_상태_변경됨(ExtractableResponse<Response> response, String expectOrderStatus) { | ||
| String actualOrderStatus = response.jsonPath().getString("orderStatus"); | ||
|
|
||
| assertAll( | ||
| () -> assertThat(response.statusCode()).isEqualTo(HttpStatus.OK.value()), | ||
| () -> assertThat(actualOrderStatus).isEqualTo(expectOrderStatus) | ||
| ); | ||
| } |
There was a problem hiding this comment.
해당 메소드는 fixture 클래스 내에 있는 이유가 혹시 있을까요??
OrderAcceptanceStep 클래스에 있어야할것같아서 여쭤봅니다!
There was a problem hiding this comment.
OrderAcceptanceTest.java 클래스에서 먼저 작성하고 리팩토링 하는 과정에서 잘못 옮긴것같네요 😢
이 부분도 수정하도록 하겠습니다 :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
안녕하세요 리뷰어님,
1단계 - 테스트를 통한 코드 보호 리뷰 요청 드립니다.
잘 부탁드립니다 :)