User class adjustments

shaundodd-diffblue · shaundodd-diffblue · commit f6106aebbbfd · 2025-02-07T13:53:05.000Z
diff --git a/account-service/src/main/java/com/piggymetrics/account/domain/User.java b/account-service/src/main/java/com/piggymetrics/account/domain/User.java
@@ -19,9 +19,6 @@ public String getUsername() {
 	}
 
 	public void setUsername(String username) {
-		if (username.length() < 3) {
-			throw new IllegalArgumentException();
-		}
 		this.username = username;
 	}
 
@@ -30,9 +27,6 @@ public String getPassword() {
 	}
 
 	public void setPassword(String password) {
-		if (password.length() < 6) {
-			throw new IllegalArgumentException();
-		}
 		this.password = password;
 	}
-}
+}
diff --git a/account-service/src/main/java/com/piggymetrics/account/domain/UserValidator.java b/account-service/src/main/java/com/piggymetrics/account/domain/UserValidator.java
@@ -4,7 +4,7 @@
 
 public class UserValidator {
 
-    public static void validate(User user) {
+    public static boolean validate(User user) {
         if (user == null) {
             throw new IllegalArgumentException("User cannot be null");
         }
@@ -19,6 +19,9 @@ public static void validate(User user) {
         if (!isUsernameValid && !isPasswordValid) {
             throw new IllegalArgumentException("Credentials Invalid");
         }
+
+        return true;
+
     }
 
     public static boolean validateUsername(String username) throws IllegalArgumentException {
@@ -34,7 +37,7 @@ public static boolean validateUsername(String username) throws IllegalArgumentEx
 
     public static boolean validatePassword(String password) throws IllegalArgumentException {
     /*public static boolean validatePassword(
-            //@InTestsUseStrings({"qwerty", "123"}) String password)
+            @InTestsUseStrings({"qwerty", "123"}) String password)
             throws IllegalArgumentException {*/
         if (password == null || password.length() < 6 || password.length() > 40) {
             return false;
diff --git a/account-service/src/test/java/com/piggymetrics/account/domain/UserValidatorDiffblueTest.java b/account-service/src/test/java/com/piggymetrics/account/domain/UserValidatorDiffblueTest.java
@@ -4,42 +4,55 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 class UserValidatorDiffblueTest {
-
     /**
      * Test {@link UserValidator#validate(User)}.
      * <ul>
-     *   <li>Given {@code abc}.</li>
-     *   <li>When {@link User} (default constructor) Password is {@code abc}.</li>
+     *   <li>Given {@code null}.</li>
+     *   <li>When {@link User} (default constructor) Username is {@code null}.</li>
+     *   <li>Then throw {@link IllegalArgumentException}.</li>
      * </ul>
      * <p>
      * Method under test: {@link UserValidator#validate(User)}
      */
     @Test
-    @DisplayName("Test validate(User); given 'abc'; when User (default constructor) Password is 'abc'")
-    @Disabled("TODO: Complete this test")
+    @DisplayName("Test validate(User); given 'null'; when User (default constructor) Username is 'null'; then throw IllegalArgumentException")
     @Tag("MaintainedByDiffblue")
-    void testValidate_givenAbc_whenUserPasswordIsAbc() {
-        // TODO: Diffblue Cover was only able to create a partial test for this method:
-        //   Reason: No inputs found that don't throw a trivial exception.
-        //   Diffblue Cover tried to run the arrange/act section, but the method under
-        //   test threw
-        //   java.lang.IllegalArgumentException
-        //       at com.piggymetrics.account.domain.User.setPassword(User.java:34)
-        //   See https://diff.blue/R013 to resolve this issue.
+    void testValidate_givenNull_whenUserUsernameIsNull_thenThrowIllegalArgumentException() {
+        // Arrange
+        User user = new User();
+        user.setUsername(null);
+        user.setPassword(null);
+
+        // Act and Assert
+        assertThrows(IllegalArgumentException.class, () -> UserValidator.validate(user));
+    }
 
+    /**
+     * Test {@link UserValidator#validate(User)}.
+     * <ul>
+     *   <li>Given {@code qw}.</li>
+     *   <li>When {@link User} (default constructor) Username is {@code qw}.</li>
+     *   <li>Then throw {@link IllegalArgumentException}.</li>
+     * </ul>
+     * <p>
+     * Method under test: {@link UserValidator#validate(User)}
+     */
+    @Test
+    @DisplayName("Test validate(User); given 'qw'; when User (default constructor) Username is 'qw'; then throw IllegalArgumentException")
+    @Tag("MaintainedByDiffblue")
+    void testValidate_givenQw_whenUserUsernameIsQw_thenThrowIllegalArgumentException() {
         // Arrange
         User user = new User();
         user.setPassword("abc");
-        user.setUsername("Smith");
+        user.setUsername("qw");
 
-        // Act
-        UserValidator.validate(user);
+        // Act and Assert
+        assertThrows(IllegalArgumentException.class, () -> UserValidator.validate(user));
     }
 
     /**
@@ -48,24 +61,99 @@ void testValidate_givenAbc_whenUserPasswordIsAbc() {
      *   <li>Given {@code qwertyuio}.</li>
      *   <li>When {@link User} (default constructor) Password is
      * {@code qwertyuio}.</li>
+     *   <li>Then return {@code true}.</li>
      * </ul>
      * <p>
      * Method under test: {@link UserValidator#validate(User)}
      */
     @Test
-    @DisplayName("Test validate(User); given 'qwertyuio'; when User (default constructor) Password is 'qwertyuio'")
+    @DisplayName("Test validate(User); given 'qwertyuio'; when User (default constructor) Password is 'qwertyuio'; then return 'true'")
     @Tag("MaintainedByDiffblue")
-    void testValidate_givenQwertyuio_whenUserPasswordIsQwertyuio() {
-        // TODO: Diffblue Cover was only able to create a partial test for this method:
-        //   Diffblue AI was unable to find a test
-
+    void testValidate_givenQwertyuio_whenUserPasswordIsQwertyuio_thenReturnTrue() {
         // Arrange
         User user = new User();
         user.setPassword("qwertyuio");
         user.setUsername("Smith");
 
-        // Act
-        UserValidator.validate(user);
+        // Act and Assert
+        assertTrue(UserValidator.validate(user));
+    }
+
+    /**
+     * Test {@link UserValidator#validate(User)}.
+     * <ul>
+     *   <li>Given {@code SmithCredentials Invalid}.</li>
+     * </ul>
+     * <p>
+     * Method under test: {@link UserValidator#validate(User)}
+     */
+    @Test
+    @DisplayName("Test validate(User); given 'SmithCredentials Invalid'")
+    @Tag("MaintainedByDiffblue")
+    void testValidate_givenSmithCredentialsInvalid() {
+        // Arrange
+        User user = new User();
+        user.setPassword("abc");
+        user.setUsername("SmithCredentials Invalid");
+
+        // Act and Assert
+        assertThrows(IllegalArgumentException.class, () -> UserValidator.validate(user));
+    }
+
+    /**
+     * Test {@link UserValidator#validate(User)}.
+     * <ul>
+     *   <li>Given {@code Smith}.</li>
+     *   <li>When {@link User} (default constructor) Username is {@code Smith}.</li>
+     * </ul>
+     * <p>
+     * Method under test: {@link UserValidator#validate(User)}
+     */
+    @Test
+    @DisplayName("Test validate(User); given 'Smith'; when User (default constructor) Username is 'Smith'")
+    @Tag("MaintainedByDiffblue")
+    void testValidate_givenSmith_whenUserUsernameIsSmith() {
+        // Arrange
+        User user = new User();
+        user.setPassword("abc");
+        user.setUsername("Smith");
+
+        // Act and Assert
+        assertThrows(IllegalArgumentException.class, () -> UserValidator.validate(user));
+    }
+
+    /**
+     * Test {@link UserValidator#validate(User)}.
+     * <ul>
+     *   <li>When {@code null}.</li>
+     *   <li>Then throw {@link IllegalArgumentException}.</li>
+     * </ul>
+     * <p>
+     * Method under test: {@link UserValidator#validate(User)}
+     */
+    @Test
+    @DisplayName("Test validate(User); when 'null'; then throw IllegalArgumentException")
+    @Tag("MaintainedByDiffblue")
+    void testValidate_whenNull_thenThrowIllegalArgumentException() {
+        // Arrange, Act and Assert
+        assertThrows(IllegalArgumentException.class, () -> UserValidator.validate(null));
+    }
+
+    /**
+     * Test {@link UserValidator#validateUsername(String)}.
+     * <ul>
+     *   <li>When {@code null}.</li>
+     *   <li>Then return {@code false}.</li>
+     * </ul>
+     * <p>
+     * Method under test: {@link UserValidator#validateUsername(String)}
+     */
+    @Test
+    @DisplayName("Test validateUsername(String); when 'null'; then return 'false'")
+    @Tag("MaintainedByDiffblue")
+    void testValidateUsername_whenNull_thenReturnFalse() throws IllegalArgumentException {
+        // Arrange, Act and Assert
+        assertFalse(UserValidator.validateUsername(null));
     }
 
     /**
@@ -85,6 +173,40 @@ void testValidateUsername_whenQw_thenReturnFalse() throws IllegalArgumentExcepti
         assertFalse(UserValidator.validateUsername("qw"));
     }
 
+    /**
+     * Test {@link UserValidator#validateUsername(String)}.
+     * <ul>
+     *   <li>When {@code SmithUsernameUsername}.</li>
+     *   <li>Then return {@code false}.</li>
+     * </ul>
+     * <p>
+     * Method under test: {@link UserValidator#validateUsername(String)}
+     */
+    @Test
+    @DisplayName("Test validateUsername(String); when 'SmithUsernameUsername'; then return 'false'")
+    @Tag("MaintainedByDiffblue")
+    void testValidateUsername_whenSmithUsernameUsername_thenReturnFalse() throws IllegalArgumentException {
+        // Arrange, Act and Assert
+        assertFalse(UserValidator.validateUsername("SmithUsernameUsername"));
+    }
+
+    /**
+     * Test {@link UserValidator#validateUsername(String)}.
+     * <ul>
+     *   <li>When {@code Smith}.</li>
+     *   <li>Then return {@code true}.</li>
+     * </ul>
+     * <p>
+     * Method under test: {@link UserValidator#validateUsername(String)}
+     */
+    @Test
+    @DisplayName("Test validateUsername(String); when 'Smith'; then return 'true'")
+    @Tag("MaintainedByDiffblue")
+    void testValidateUsername_whenSmith_thenReturnTrue() throws IllegalArgumentException {
+        // Arrange, Act and Assert
+        assertTrue(UserValidator.validateUsername("Smith"));
+    }
+
     /**
      * Test {@link UserValidator#validatePassword(String)}.
      * <ul>
@@ -102,6 +224,23 @@ void testValidatePassword_whenAbc_thenReturnFalse() throws IllegalArgumentExcept
         assertFalse(UserValidator.validatePassword("abc"));
     }
 
+    /**
+     * Test {@link UserValidator#validatePassword(String)}.
+     * <ul>
+     *   <li>When {@code null}.</li>
+     *   <li>Then return {@code false}.</li>
+     * </ul>
+     * <p>
+     * Method under test: {@link UserValidator#validatePassword(String)}
+     */
+    @Test
+    @DisplayName("Test validatePassword(String); when 'null'; then return 'false'")
+    @Tag("MaintainedByDiffblue")
+    void testValidatePassword_whenNull_thenReturnFalse() throws IllegalArgumentException {
+        // Arrange, Act and Assert
+        assertFalse(UserValidator.validatePassword(null));
+    }
+
     /**
      * Test {@link UserValidator#validatePassword(String)}.
      * <ul>
@@ -118,5 +257,4 @@ void testValidatePassword_whenQwertyuio_thenReturnTrue() throws IllegalArgumentE
         // Arrange, Act and Assert
         assertTrue(UserValidator.validatePassword("qwertyuio"));
     }
-
 }

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,6 @@ public String getUsername() {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public void setUsername(String username) {`
`22`		`- if (username.length() < 3) {`
`23`		`- throw new IllegalArgumentException();`
`24`		`- }`
`25`	`22`	`this.username = username;`
`26`	`23`	`}`
`27`	`24`
`@@ -30,9 +27,6 @@ public String getPassword() {`
`30`	`27`	`}`
`31`	`28`
`32`	`29`	`public void setPassword(String password) {`
`33`		`- if (password.length() < 6) {`
`34`		`- throw new IllegalArgumentException();`
`35`		`- }`
`36`	`30`	`this.password = password;`
`37`	`31`	`}`
`38`		`-}`
	`32`	`+}`