refactor: 테스트 검증 로직 변경

lvalentine6 · lvalentine6 · commit ffcc67ab015d · 2025-06-25T00:58:09.000+09:00
diff --git a/src/test/java/timeeat/domain/bookmark/BookmarkTest.java b/src/test/java/timeeat/domain/bookmark/BookmarkTest.java
@@ -1,8 +1,8 @@
 package timeeat.domain.bookmark;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.time.LocalTime;
 
@@ -60,18 +60,18 @@ class CreateBookmark {
                     null,
                     "강남구");
 
-            assertThatThrownBy(() -> new Bookmark(null, store))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.BOOKMARK_MEMBER_REQUIRED);
+            BusinessException exception = assertThrows(BusinessException.class, () -> new Bookmark(null, store));
+
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.BOOKMARK_MEMBER_REQUIRED);
         }
 
         @Test
         void 가게가_null이면_예외를_던진다() {
             Member member = new Member("socialId123");
 
-            assertThatThrownBy(() -> new Bookmark(member, null))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.BOOKMARK_STORE_REQUIRED);
+            BusinessException exception = assertThrows(BusinessException.class, () -> new Bookmark(member, null));
+
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.BOOKMARK_STORE_REQUIRED);
         }
     }
 }
diff --git a/src/test/java/timeeat/domain/member/MemberTest.java b/src/test/java/timeeat/domain/member/MemberTest.java
@@ -1,8 +1,8 @@
 package timeeat.domain.member;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -37,9 +37,9 @@ class CreateOauthMember {
         void socialId가_null이면_예외가_발생한다() {
             String socialId = null;
 
-            assertThatThrownBy(() -> new Member(socialId))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_SOCIAL_ID);
+            BusinessException exception = assertThrows(BusinessException.class, () -> new Member(socialId));
+
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_SOCIAL_ID);
         }
     }
 
@@ -91,9 +91,9 @@ class CreateMemberTest {
             String interestArea = "강남구";
             Boolean optInMarketing = null;
 
-            assertThatThrownBy(() -> new Member(socialId, nickname, mobilePhoneNumber, interestArea, optInMarketing))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_MARKETING_CONSENT);
+            BusinessException exception = assertThrows(BusinessException.class, () -> new Member(socialId, nickname, mobilePhoneNumber, interestArea, optInMarketing));
+
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_MARKETING_CONSENT);
         }
 
         @Test
@@ -104,9 +104,9 @@ class CreateMemberTest {
             String interestArea = "부산";
             Boolean optInMarketing = true;
 
-            assertThatThrownBy(() -> new Member(socialId, nickname, mobilePhoneNumber, interestArea, optInMarketing))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_INTEREST_AREA);
+            BusinessException exception = assertThrows(BusinessException.class, () -> new Member(socialId, nickname, mobilePhoneNumber, interestArea, optInMarketing));
+
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_INTEREST_AREA);
         }
     }
 }
diff --git a/src/test/java/timeeat/domain/member/MobilePhoneNumberTest.java b/src/test/java/timeeat/domain/member/MobilePhoneNumberTest.java
@@ -1,7 +1,7 @@
 package timeeat.domain.member;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -39,9 +39,9 @@ class CreateMobilePhoneNumberTest {
         @ParameterizedTest
         @ValueSource(strings = {"0101234567", "010123456789", "010-1234-5678", "abcdefghijk"})
         void 번호_형식이_올바르지_않으면_예외를_던진다(String invalidNumber) {
-            assertThatThrownBy(() -> new MobilePhoneNumber(invalidNumber))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_MOBILE_PHONE_NUMBER);
+            BusinessException exception = assertThrows(BusinessException.class, () -> new MobilePhoneNumber(invalidNumber));
+
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_MOBILE_PHONE_NUMBER);
         }
     }
 }
diff --git a/src/test/java/timeeat/domain/menu/DiscountTest.java b/src/test/java/timeeat/domain/menu/DiscountTest.java
@@ -1,7 +1,7 @@
 package timeeat.domain.menu;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.time.LocalDateTime;
 
@@ -52,37 +52,37 @@ class CreateDiscount {
         void 할인_가격이_원가보다_비싸면_예외를_던진다() {
             Integer invalidDiscountPrice = 12000;
 
-            assertThatThrownBy(() -> new Discount(originalPrice, invalidDiscountPrice, null, null))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_MENU_DISCOUNT_PRICE);
+            BusinessException exception = assertThrows(BusinessException.class, () -> new Discount(originalPrice, invalidDiscountPrice, null, null));
+
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_MENU_DISCOUNT_PRICE);
         }
 
         @Test
         void 할인_가격이_원가와_같으면_예외를_던진다() {
             Integer sameDiscountPrice = 10000;
 
-            assertThatThrownBy(() -> new Discount(originalPrice, sameDiscountPrice, null, null))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_MENU_DISCOUNT_PRICE);
+            BusinessException exception = assertThrows(BusinessException.class, () -> new Discount(originalPrice, sameDiscountPrice, null, null));
+
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_MENU_DISCOUNT_PRICE);
         }
 
         @Test
         void 할인_가격이_0원이면_예외를_던진다() {
             Integer zeroDiscountPrice = 0;
 
-            assertThatThrownBy(() -> new Discount(originalPrice, zeroDiscountPrice, null, null))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_MENU_DISCOUNT_PRICE);
+            BusinessException exception = assertThrows(BusinessException.class, () -> new Discount(originalPrice, zeroDiscountPrice, null, null));
+
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_MENU_DISCOUNT_PRICE);
         }
 
         @Test
         void 시작_시간이_종료_시간보다_늦으면_예외를_던진다() {
             LocalDateTime startTime = LocalDateTime.now();
             LocalDateTime endTime = startTime.minusHours(2);
 
-            assertThatThrownBy(() -> new Discount(originalPrice, 8000, startTime, endTime))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_MENU_DISCOUNT_TIME);
+            BusinessException exception = assertThrows(BusinessException.class, () -> new Discount(originalPrice, 8000, startTime, endTime));
+
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_MENU_DISCOUNT_TIME);
         }
     }
 }
diff --git a/src/test/java/timeeat/domain/menu/MenuTest.java b/src/test/java/timeeat/domain/menu/MenuTest.java
@@ -1,8 +1,8 @@
 package timeeat.domain.menu;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.time.LocalDateTime;
 
@@ -37,28 +37,31 @@ class CreateMenu {
 
         @Test
         void 이름이_null이면_예외를_던진다() {
-            assertThatThrownBy(() -> new Menu(null, "설명", 10000, "url", null, null, null))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_MENU_NAME);
+            BusinessException exception = assertThrows(BusinessException.class,
+                    () -> new Menu(null, "설명", 10000, "url", null, null, null));
+
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_MENU_NAME);
         }
 
         @Test
         void 할인_가격이_원가보다_비싸면_예외를_던진다() {
             Integer price = 10000;
             Integer invalidDiscountPrice = 12000;
 
-            assertThatThrownBy(() -> new Menu("이름", "설명", price, "url", invalidDiscountPrice, null, null))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_MENU_DISCOUNT_PRICE);
+            BusinessException exception = assertThrows(BusinessException.class,
+                    () -> new Menu("이름", "설명", price, "url", invalidDiscountPrice, null, null));
+
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_MENU_DISCOUNT_PRICE);
         }
 
         @Test
         void 이름이_최대_길이를_초과하면_예외를_던진다() {
             String overflowName = "t".repeat(255 + 1);
 
-            assertThatThrownBy(() -> new Menu(overflowName, "설명", 10000, "url", null, null, null))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_MENU_LENGTH);
+            BusinessException exception = assertThrows(BusinessException.class,
+                    () -> new Menu(overflowName, "설명", 10000, "url", null, null, null));
+
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_MENU_LENGTH);
         }
     }
 }
diff --git a/src/test/java/timeeat/domain/menu/PriceTest.java b/src/test/java/timeeat/domain/menu/PriceTest.java
@@ -1,7 +1,7 @@
 package timeeat.domain.menu;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -27,16 +27,14 @@ class CreatePrice {
 
         @Test
         void 가격이_null이면_예외를_던진다() {
-            assertThatThrownBy(() -> new Price(null))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_MENU_PRICE);
+            BusinessException exception = assertThrows(BusinessException.class, () -> new Price(null));
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_MENU_PRICE);
         }
 
         @Test
         void 가격이_0원_이하이면_예외를_던진다() {
-            assertThatThrownBy(() -> new Price(0))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_MENU_PRICE);
+            BusinessException exception = assertThrows(BusinessException.class, () -> new Price(0));
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_MENU_PRICE);
         }
     }
 }
diff --git a/src/test/java/timeeat/domain/store/CoordinatesTest.java b/src/test/java/timeeat/domain/store/CoordinatesTest.java
@@ -1,7 +1,6 @@
 package timeeat.domain.store;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.api.DisplayName;
@@ -33,19 +32,19 @@ class CreateCoordinates {
             Double nullLatitude = null;
             Double longitude = 126.9780;
 
-            assertThatThrownBy(() -> new Coordinates(nullLatitude, longitude))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_STORE_COORDINATES_NULL);
+            BusinessException exception = assertThrows(BusinessException.class, () -> new Coordinates(nullLatitude, longitude));
+
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_STORE_COORDINATES_NULL);
         }
 
         @Test
         void 경도_값이_null이면_예외를_던진다() {
             Double latitude = 37.5665;
             Double nullLongitude = null;
 
-            assertThatThrownBy(() -> new Coordinates(latitude, nullLongitude))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_STORE_COORDINATES_NULL);
+            BusinessException exception = assertThrows(BusinessException.class, () -> new Coordinates(latitude, nullLongitude));
+
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_STORE_COORDINATES_NULL);
         }
 
         @Test
diff --git a/src/test/java/timeeat/domain/store/StoreHoursTest.java b/src/test/java/timeeat/domain/store/StoreHoursTest.java
@@ -1,7 +1,7 @@
 package timeeat.domain.store;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.time.LocalTime;
 
@@ -33,28 +33,28 @@ class CreateStoreHours {
         void openTime이_null이면_예외를_던진다() {
             LocalTime close = LocalTime.of(18, 0);
 
-            assertThatThrownBy(() -> new StoreHours(null, close))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_STORE_TIME_NULL);
+            BusinessException exception = assertThrows(BusinessException.class, () -> new StoreHours(null, close));
+
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_STORE_TIME_NULL);
         }
 
         @Test
         void closeTime이_null이면_예외를_던진다() {
             LocalTime open = LocalTime.of(9, 0);
 
-            assertThatThrownBy(() -> new StoreHours(open, null))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_STORE_TIME_NULL);
+            BusinessException exception = assertThrows(BusinessException.class, () -> new StoreHours(open, null));
+
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_STORE_TIME_NULL);
         }
 
         @Test
         void openTime이_closeTime보다_늦으면_예외를_던진다() {
             LocalTime open = LocalTime.of(20, 0);
             LocalTime close = LocalTime.of(9, 0);
 
-            assertThatThrownBy(() -> new StoreHours(open, close))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_STORE_TIME_ORDER);
+            BusinessException exception = assertThrows(BusinessException.class, () -> new StoreHours(open, close));
+
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_STORE_TIME_ORDER);
         }
     }
 }
diff --git a/src/test/java/timeeat/domain/store/StorePhoneNumberTest.java b/src/test/java/timeeat/domain/store/StorePhoneNumberTest.java
@@ -1,7 +1,7 @@
 package timeeat.domain.store;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -38,9 +38,8 @@ class CreateStorePhoneNumber {
         @ParameterizedTest
         @ValueSource(strings = {"1234567", "1234567890123", "02-1234-5678", "abcdefghij"})
         void 번호_형식이_올바르지_않으면_예외를_던진다(String invalidNumber) {
-            assertThatThrownBy(() -> new StorePhoneNumber(invalidNumber))
-                    .isInstanceOf(BusinessException.class)
-                    .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_STORE_PHONE_NUMBER);
+            BusinessException exception = assertThrows(BusinessException.class, () -> new StorePhoneNumber(invalidNumber));
+            assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_STORE_PHONE_NUMBER);
         }
     }
 }
diff --git a/src/test/java/timeeat/domain/store/StoreTest.java b/src/test/java/timeeat/domain/store/StoreTest.java
diff --git a/src/test/java/timeeat/enums/InterestAreaTest.java b/src/test/java/timeeat/enums/InterestAreaTest.java
diff --git a/src/test/java/timeeat/enums/StoreCategoryTest.java b/src/test/java/timeeat/enums/StoreCategoryTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package timeeat.domain.member;`
`2`	`2`
`3`	`3`	`import static org.assertj.core.api.Assertions.assertThat;`
`4`		`-import static org.assertj.core.api.Assertions.assertThatThrownBy;`
	`4`	`+import static org.junit.jupiter.api.Assertions.assertThrows;`
`5`	`5`
`6`	`6`	`import org.junit.jupiter.api.DisplayName;`
`7`	`7`	`import org.junit.jupiter.api.Nested;`
`@@ -39,9 +39,9 @@ class CreateMobilePhoneNumberTest {`
`39`	`39`	`@ParameterizedTest`
`40`	`40`	`@ValueSource(strings = {"0101234567", "010123456789", "010-1234-5678", "abcdefghijk"})`
`41`	`41`	`void 번호_형식이_올바르지_않으면_예외를_던진다(String invalidNumber) {`
`42`		`- assertThatThrownBy(() -> new MobilePhoneNumber(invalidNumber))`
`43`		`- .isInstanceOf(BusinessException.class)`
`44`		`- .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_MOBILE_PHONE_NUMBER);`
	`42`	`+ BusinessException exception = assertThrows(BusinessException.class, () -> new MobilePhoneNumber(invalidNumber));`
	`43`	`+`
	`44`	`+ assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_MOBILE_PHONE_NUMBER);`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package timeeat.domain.store;`
`2`	`2`
`3`	`3`	`import static org.assertj.core.api.Assertions.assertThat;`
`4`		`-import static org.assertj.core.api.Assertions.assertThatThrownBy;`
	`4`	`+import static org.junit.jupiter.api.Assertions.assertThrows;`
`5`	`5`
`6`	`6`	`import org.junit.jupiter.api.DisplayName;`
`7`	`7`	`import org.junit.jupiter.api.Nested;`
`@@ -38,9 +38,8 @@ class CreateStorePhoneNumber {`
`38`	`38`	`@ParameterizedTest`
`39`	`39`	`@ValueSource(strings = {"1234567", "1234567890123", "02-1234-5678", "abcdefghij"})`
`40`	`40`	`void 번호_형식이_올바르지_않으면_예외를_던진다(String invalidNumber) {`
`41`		`- assertThatThrownBy(() -> new StorePhoneNumber(invalidNumber))`
`42`		`- .isInstanceOf(BusinessException.class)`
`43`		`- .hasFieldOrPropertyWithValue("errorCode", BusinessErrorCode.INVALID_STORE_PHONE_NUMBER);`
	`41`	`+ BusinessException exception = assertThrows(BusinessException.class, () -> new StorePhoneNumber(invalidNumber));`
	`42`	`+ assertThat(exception.getErrorCode()).isEqualTo(BusinessErrorCode.INVALID_STORE_PHONE_NUMBER);`
`44`	`43`	`}`
`45`	`44`	`}`
`46`	`45`	`}`