fixed error in GroupBuilder, using wrong valid default values

AY1920S1-CS2103T-F12-3 · Oct 22, 2019 · 6d265fa · 6d265fa
1 parent 4b8d0a3
commit 6d265fa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/src/test/java/tagline/model/group/GroupNameTest.java b/src/test/java/tagline/model/group/GroupNameTest.java
@@ -26,16 +26,22 @@ public void isValidGroupName() {
 
         // invalid name
         assertFalse(GroupName.isValidGroupName("")); // empty string
+        assertFalse(GroupName.isValidGroupName(" ")); // spaces only
+        assertFalse(GroupName.isValidGroupName("  ")); // spaces only
+        // has whitespace
+        assertFalse(GroupName.isValidGroupName("peter jack")); // alphabets only
+        assertFalse(GroupName.isValidGroupName("peter\nthe 2nd")); // with newline
+        assertFalse(GroupName.isValidGroupName("Capital Tan")); // with capital letters and tab
+        assertFalse(GroupName.isValidGroupName("David Roger Jackson Ray Jr 2nd")); // whitespace
 
         // valid name
-        assertTrue(GroupName.isValidGroupName(" ")); // spaces only
-        assertTrue(GroupName.isValidGroupName("  ")); // spaces only
         assertTrue(GroupName.isValidGroupName("^")); // only non-alphanumeric characters
         assertTrue(GroupName.isValidGroupName("peter*")); // contains non-alphanumeric characters
-        assertTrue(GroupName.isValidGroupName("peter jack")); // alphabets only
         assertTrue(GroupName.isValidGroupName("12345")); // numbers only
-        assertTrue(GroupName.isValidGroupName("peter the 2nd")); // alphanumeric characters
-        assertTrue(GroupName.isValidGroupName("Capital Tan")); // with capital letters
-        assertTrue(GroupName.isValidGroupName("David Roger Jackson Ray Jr 2nd")); // long names
+        assertTrue(GroupName.isValidGroupName("peters123jac12k@asd")); // alphanumeric
+        assertTrue(GroupName.isValidGroupName("peterjack")); // alphabets only
+        assertTrue(GroupName.isValidGroupName("peter_the_2nd")); // with underscore
+        assertTrue(GroupName.isValidGroupName("Capital-Tan")); // with dash
+        assertTrue(GroupName.isValidGroupName("DavidRogerJacksonRayJr2nd")); // long names
     }
 }
diff --git a/src/test/java/tagline/testutil/GroupBuilder.java b/src/test/java/tagline/testutil/GroupBuilder.java
@@ -17,18 +17,14 @@ public class GroupBuilder {
     public static final String DEFAULT_GROUPNAME = "SHIELD";
     public static final String DEFAULT_GROUPDESCRIPTION = "Strategic Homeland Intervention "
         + "Enforcement Logistics Divison";
-    public static final String DEFAULT_NAME = "Alice Pauline";
-    public static final String DEFAULT_PHONE = "85355255";
-    public static final String DEFAULT_EMAIL = "alice@gmail.com";
-    public static final String DEFAULT_ADDRESS = "123, Jurong West Ave 6, #08-111";
 
     private GroupName groupName;
     private GroupDescription groupDescription;
     private Set<MemberId> memberIds;
 
     public GroupBuilder() {
-        groupName = new GroupName(DEFAULT_NAME);
-        groupDescription = new GroupDescription(DEFAULT_NAME);
+        groupName = new GroupName(DEFAULT_GROUPNAME);
+        groupDescription = new GroupDescription(DEFAULT_GROUPDESCRIPTION);
         memberIds = new HashSet<>();
     }