♻️ :: (#12) refactor all-kind of code-smells

CNS-DGSW · Feb 23, 2023 · 823078b · 823078b
1 parent c3a512a
commit 823078b
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 98 deletions.
diff --git a/User-Domain/src/test/java/com/dgsw/cns/user/api/UserParentApiTest.java b/User-Domain/src/test/java/com/dgsw/cns/user/api/UserParentApiTest.java
@@ -26,7 +26,7 @@
 import static org.mockito.Mockito.verify;
 
 @ExtendWith(MockitoExtension.class)
-public class UserParentApiTest {
+class UserParentApiTest {
 
     @Mock
     private QueryUserSpi queryUserSpi;

diff --git a/User-Domain/src/test/java/com/dgsw/cns/user/api/UserRecoveryApiTest.java b/User-Domain/src/test/java/com/dgsw/cns/user/api/UserRecoveryApiTest.java
@@ -22,7 +22,7 @@
 import static org.assertj.core.api.ThrowableAssert.ThrowingCallable;
 
 @ExtendWith(MockitoExtension.class)
-public class UserRecoveryApiTest {
+class UserRecoveryApiTest {
 
     @Mock
     private QueryUserSpi queryUserSpi;

diff --git a/User-Domain/src/test/java/com/dgsw/cns/user/api/UserRegistrationApiTest.java b/User-Domain/src/test/java/com/dgsw/cns/user/api/UserRegistrationApiTest.java
@@ -18,7 +18,7 @@
 import static org.assertj.core.api.ThrowableAssert.ThrowingCallable;
 
 @ExtendWith(MockitoExtension.class)
-public class UserRegistrationApiTest {
+class UserRegistrationApiTest {
 
     @Mock
     private EmailCertificationSpi emailCertificationSpi;

diff --git a/User-Domain/src/test/java/com/dgsw/cns/user/api/UserVeteranApiTest.java b/User-Domain/src/test/java/com/dgsw/cns/user/api/UserVeteranApiTest.java
@@ -16,7 +16,7 @@
 import static org.assertj.core.api.ThrowableAssert.ThrowingCallable;
 
 @ExtendWith(MockitoExtension.class)
-public class UserVeteranApiTest {
+class UserVeteranApiTest {
 
     @Mock
     private QueryUserSpi queryUserSpi;

diff --git a/User-Domain/src/test/java/com/dgsw/cns/user/external/EmailRegexTest.java b/User-Domain/src/test/java/com/dgsw/cns/user/external/EmailRegexTest.java
@@ -7,6 +7,8 @@
 import jakarta.validation.constraints.Email;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import java.util.Set;
 
@@ -31,88 +33,18 @@ public Data(String email) {
         }
     }
 
-    @Test
-    void gmailTest() {
-        // given
-        final Data data = new Data("1@gmail.com");
-
-        // when
-        Set<ConstraintViolation<Data>> violations = validator.validate(data);
-
-        // then
-        assertThat(violations.size()).isEqualTo(0);
-    }
-
-    @Test
-    void naverTest() {
-        // given
-        final Data data = new Data("1@naver.com");
-
-        // when
-        Set<ConstraintViolation<Data>> violations = validator.validate(data);
-
-        // then
-        assertThat(violations.size()).isEqualTo(0);
-    }
-
-    @Test
-    void daumTest() {
-        // given
-        final Data data = new Data("1@daum.com");
-
-        // when
-        Set<ConstraintViolation<Data>> violations = validator.validate(data);
-
-        // then
-        assertThat(violations.size()).isEqualTo(0);
-    }
-
-    @Test
-    void yahooTest() {
-        // given
-        final Data data = new Data("1@yahoo.com");
-
-        // when
-        Set<ConstraintViolation<Data>> violations = validator.validate(data);
-
-        // then
-        assertThat(violations.size()).isEqualTo(0);
-    }
-
-    @Test
-    void nateTest() {
-        // given
-        final Data data = new Data("1@nate.com");
-
-        // when
-        Set<ConstraintViolation<Data>> violations = validator.validate(data);
-
-        // then
-        assertThat(violations.size()).isEqualTo(0);
-    }
-
-    @Test
-    void koreaTest() {
-        // given
-        final Data data = new Data("1@korea.com");
-
-        // when
-        Set<ConstraintViolation<Data>> violations = validator.validate(data);
-
-        // then
-        assertThat(violations.size()).isEqualTo(0);
-    }
-
-    @Test
-    void dgswTest() {
+    @ParameterizedTest
+    @ValueSource(strings = {"1@gmail.com", "1@naver.com", "1@daum.com", "1@yahoo.com",
+            "1@nate.com", "1@korea.com", "1@dgsw.hs.kr"})
+    void emailRegexTest(final String email) {
         // given
-        final Data data = new Data("1@dgsw.hs.kr");
+        final Data data = new Data(email);
 
         // when
         Set<ConstraintViolation<Data>> violations = validator.validate(data);
 
         // then
-        assertThat(violations.size()).isEqualTo(0);
+        assertThat(violations.size()).isZero();
     }
 
     @Test
@@ -124,7 +56,7 @@ void failTest() {
         Set<ConstraintViolation<Data>> violations = validator.validate(data);
 
         // then
-        assertThat(violations.size()).isEqualTo(1);
+        assertThat(violations).hasSize(1);
     }
 
 }
diff --git a/User-Domain/src/test/java/com/dgsw/cns/user/external/RegexTest.java b/User-Domain/src/test/java/com/dgsw/cns/user/external/RegexTest.java
@@ -14,7 +14,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class RegexTest {
+class RegexTest {
 
     private Validator validator;
 
@@ -34,7 +34,7 @@ void emailIsNullTest() {
         Set<ConstraintViolation<MemberRegistrationVO>> violations = validator.validate(vo);
 
         // then
-        assertThat(violations.size()).isEqualTo(1);
+        assertThat(violations).hasSize(1);
     }
 
     @Test
@@ -47,7 +47,7 @@ void emailIsEmptyTest() {
         Set<ConstraintViolation<MemberRegistrationVO>> violations = validator.validate(vo);
 
         // then
-        assertThat(violations.size()).isEqualTo(1);
+        assertThat(violations).hasSize(1);
     }
 
     @Test
@@ -60,7 +60,7 @@ void emailIsBlankTest() {
         Set<ConstraintViolation<MemberRegistrationVO>> violations = validator.validate(vo);
 
         // then
-        assertThat(violations.size()).isEqualTo(1);
+        assertThat(violations).hasSize(1);
     }
 
     @Test
@@ -73,7 +73,7 @@ void emailIsInvalidTest() {
         Set<ConstraintViolation<MemberRegistrationVO>> violations = validator.validate(vo);
 
         // then
-        assertThat(violations.size()).isEqualTo(1);
+        assertThat(violations).hasSize(1);
     }
 
     @Test
@@ -86,7 +86,7 @@ void passwordLengthIsTooShortTest() {
         Set<ConstraintViolation<MemberRegistrationVO>> violations = validator.validate(vo);
 
         // then
-        assertThat(violations.size()).isEqualTo(1);
+        assertThat(violations).hasSize(1);
     }
 
     @Test
@@ -99,7 +99,7 @@ void passwordIsEmpty() {
         Set<ConstraintViolation<MemberRegistrationVO>> violations = validator.validate(vo);
 
         // then
-        assertThat(violations.size()).isEqualTo(1);
+        assertThat(violations).hasSize(1);
     }
 
     @Test
@@ -112,7 +112,7 @@ void codeLengthIsTooShortTest() {
         Set<ConstraintViolation<MemberRegistrationVO>> violations = validator.validate(vo);
 
         // then
-        assertThat(violations.size()).isEqualTo(1);
+        assertThat(violations).hasSize(1);
     }
 
     @Test
@@ -125,7 +125,7 @@ void codeLengthIsTooLongTest() {
         Set<ConstraintViolation<MemberRegistrationVO>> violations = validator.validate(vo);
 
         // then
-        assertThat(violations.size()).isEqualTo(1);
+        assertThat(violations).hasSize(1);
     }
 
     @Test
@@ -138,7 +138,7 @@ void codeIsEmptyTest() {
         Set<ConstraintViolation<MemberRegistrationVO>> violations = validator.validate(vo);
 
         // then
-        assertThat(violations.size()).isEqualTo(1);
+        assertThat(violations).hasSize(1);
     }
 
     @Test
@@ -151,7 +151,7 @@ void departmentIsEmptyTest() {
         Set<ConstraintViolation<MemberVeteranVO>> violations = validator.validate(vo);
 
         // then
-        assertThat(violations.size()).isEqualTo(1);
+        assertThat(violations).hasSize(1);
     }
 
     @Test
@@ -164,7 +164,7 @@ void meritCodeIsEmptyTest() {
         Set<ConstraintViolation<MemberVeteranVO>> violations = validator.validate(vo);
 
         // then
-        assertThat(violations.size()).isEqualTo(2);     // size, pattern
+        assertThat(violations).hasSize(2);              // size, pattern
     }
 
     @Test
@@ -177,7 +177,7 @@ void meritCodeLengthIsTooShortTest() {
         Set<ConstraintViolation<MemberVeteranVO>> violations = validator.validate(vo);
 
         // then
-        assertThat(violations.size()).isEqualTo(2);     // size, pattern
+        assertThat(violations).hasSize(2);              // size, pattern
     }
 
     @Test
@@ -190,7 +190,7 @@ void meritCodeLengthIsTooLongTest() {
         Set<ConstraintViolation<MemberVeteranVO>> violations = validator.validate(vo);
 
         // then
-        assertThat(violations.size()).isEqualTo(2);     // size, pattern
+        assertThat(violations).hasSize(2);              // size, pattern
     }
 
     @Test
@@ -203,7 +203,7 @@ void meritCodeIsMismatchTest() {
         Set<ConstraintViolation<MemberVeteranVO>> violations = validator.validate(vo);
 
         // then
-        assertThat(violations.size()).isEqualTo(2);     // size, pattern
+        assertThat(violations).hasSize(2);              // size, pattern
     }
 
     @Test
@@ -216,7 +216,7 @@ void meritCodeIsAllNumber() {
         Set<ConstraintViolation<MemberVeteranVO>> violations = validator.validate(vo);
 
         // then
-        assertThat(violations.size()).isEqualTo(1);     // pattern
+        assertThat(violations).hasSize(1);              // pattern
     }
 
     @Test
@@ -229,7 +229,7 @@ void meritCodeIsCorrect() {
         Set<ConstraintViolation<MemberVeteranVO>> violations = validator.validate(vo);
 
         // then
-        assertThat(violations.size()).isEqualTo(0);
+        assertThat(violations.size()).isZero();
     }
 
 }