Merge pull request AY2324S1-CS2103T-T09-2#222 from Mahidharah/Branch-…

…Tests Edit test files for storage, util, model and some command and parser files
Mahidharah · Nov 8, 2023 · 6ef2183 · 6ef2183
2 parents ddf9630 + dfbb5e0
commit 6ef2183
Show file tree

Hide file tree

Showing 42 changed files with 777 additions and 370 deletions.
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidAndValidDeveloperAddressBook.json b/src/test/data/JsonAddressBookStorageTest/invalidAndValidDeveloperAddressBook.json
@@ -0,0 +1,26 @@
+{
+  "developers" : [ {
+    "name" : "Alex Yeoh",
+    "phone" : "87438807",
+    "email" : "alexyeoh@example.com",
+    "address" : "Blk 30 Geylang Street 29, #06-40",
+    "dateJoined" : "15-12-2019",
+    "role" : "Developer",
+    "salary" : "5000",
+    "projects" : [ "TeamTrekker", "CodeContact" ],
+    "githubId" : "mahidharah",
+    "rating" : "5.0"
+  },{
+    "name" : "Person with invalid name field: Ha!ns Mu@ster",
+    "phone" : "9482424",
+    "email" : "hans@example.com",
+    "address" : "4th street",
+    "dateJoined" : "15-12-2019",
+    "role" : "Developer",
+    "salary" : "5000",
+    "projects" : [ "TeamTrekker", "CodeContact" ],
+    "githubId" : "mahidharah",
+    "rating" : "5.0"
+  }
+  ]
+}
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json b/src/test/data/JsonAddressBookStorageTest/invalidAndValidPersonAddressBook.json
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidDeveloperAddressBook.json b/src/test/data/JsonAddressBookStorageTest/invalidDeveloperAddressBook.json
@@ -0,0 +1,15 @@
+{
+  "developers" : [ {
+      "name" : "Person with invalid name field: Ha!ns Mu@ster",
+      "phone" : "9482424",
+      "email" : "hans@example.com",
+      "address" : "4th street",
+      "dateJoined" : "15-12-2019",
+      "role" : "Developer",
+      "salary" : "5000",
+      "projects" : [ "TeamTrekker", "CodeContact" ],
+      "githubId" : "mahidharah",
+      "rating" : "5.0"
+    }
+  ]
+}
diff --git a/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json b/src/test/data/JsonAddressBookStorageTest/invalidPersonAddressBook.json
diff --git a/src/test/data/JsonSerializableAddressBookTest/duplicateDeveloperAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/duplicateDeveloperAddressBook.json
@@ -0,0 +1,26 @@
+{
+  "developers" : [ {
+      "name" : "Alex Yeoh",
+      "phone" : "87438807",
+      "email" : "alexyeohz@example.com",
+      "address" : "Blk 15 Geylang Street 29, #06-40",
+      "dateJoined" : "15-12-2019",
+      "role" : "Developer",
+      "salary" : "4000",
+      "projects" : [ "TeamTrekkers", "CodeContact" ],
+      "githubId" : "mahidharah1",
+      "rating" : "4.0"
+    },{
+      "name" : "Alex Yeoh",
+      "phone" : "87438807",
+      "email" : "alexyeoh@example.com",
+      "address" : "Blk 30 Geylang Street 29, #06-40",
+      "dateJoined" : "15-12-2019",
+      "role" : "Developer",
+      "salary" : "5000",
+      "projects" : [ "TeamTrekker", "CodeContact" ],
+      "githubId" : "mahidharah",
+      "rating" : "5.0"
+    }
+  ]
+}
diff --git a/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/duplicatePersonAddressBook.json
diff --git a/src/test/data/JsonSerializableAddressBookTest/invalidDeveloperAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/invalidDeveloperAddressBook.json
@@ -0,0 +1,15 @@
+{
+  "developers" : [ {
+      "name" : "Alex Yeoh",
+      "phone" : "87438807",
+      "email" : "invalid@email!3e",
+      "address" : "Blk 30 Geylang Street 29, #06-40",
+      "dateJoined" : "15-12-2019",
+      "role" : "Developer",
+      "salary" : "5000",
+      "projects" : [ "TeamTrekker", "CodeContact" ],
+      "githubId" : "mahidharah",
+      "rating" : "5.0"
+   }
+  ]
+}
diff --git a/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/invalidPersonAddressBook.json
diff --git a/src/test/data/JsonSerializableAddressBookTest/typicalDevelopersAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/typicalDevelopersAddressBook.json
@@ -0,0 +1,81 @@
+{
+  "_comment": "AddressBook save file which contains the same Person values as in TypicalPersons#getTypicalAddressBook()",
+  "developers" : [ {
+    "name" : "Alex Yeoh",
+    "phone" : "87438807",
+    "email" : "alexyeoh@example.com",
+    "address" : "Blk 30 Geylang Street 29, #06-40",
+    "dateJoined" : "15-12-2019",
+    "role" : "Developer",
+    "salary" : "5000",
+    "projects" : [ "TeamTrekker", "CodeContact" ],
+    "githubId" : "mahidharah",
+    "rating" : "5.0"
+  }, {
+    "name" : "Bernice Yu",
+    "phone" : "99272758",
+    "email" : "berniceyu@example.com",
+    "address" : "Blk 30 Lorong 3 Serangoon Gardens, #07-18",
+    "dateJoined" : "16-11-2020",
+    "role" : "Developer",
+    "salary" : "6000",
+    "projects" : [ "Appollo", "Orbital" ],
+    "githubId" : "mahidharah1",
+    "rating" : "5.0"
+  }, {
+    "name" : "Charlotte Oliveiro",
+    "phone" : "93210283",
+    "email" : "charlotte@example.com",
+    "address" : "Blk 11 Ang Mo Kio Street 74, #11-04",
+    "dateJoined" : "20-10-2020",
+    "role" : "Developer",
+    "salary" : "4500",
+    "projects" : [ "CodeContact" ],
+    "githubId" : "mahidharah2",
+    "rating" : "5.0"
+  }, {
+    "name" : "David Li",
+    "phone" : "91031282",
+    "email" : "lidavid@example.com",
+    "address" : "Blk 436 Serangoon Gardens Street 26, #16-43",
+    "dateJoined" : "23-09-2021",
+    "role" : "Developer",
+    "salary" : "5500",
+    "projects" : [ "TeamTrekker", "Appollo" ],
+    "githubId" : "mahidharah3",
+    "rating" : "5.0"
+  }, {
+    "name" : "Mahidharah",
+    "phone" : "81256788",
+    "email" : "aunus@nus.com",
+    "address" : "Blk 88 Lorong 8 Serangoon Gardens, #08-88",
+    "dateJoined" : "20-10-2020",
+    "role" : "Developer",
+    "salary" : "8880",
+    "projects" : [ "Appollo", "Orbital" ],
+    "githubId" : "mahidharah88",
+    "rating" : "5.0"
+  }, {
+    "name" : "Mahidharah2",
+    "phone" : "81256788",
+    "email" : "aunus@nus.com",
+    "address" : "Blk 88 Lorong 8 Serangoon Gardens, #08-88",
+    "dateJoined" : "20-10-2020",
+    "role" : "Developer",
+    "salary" : "8880",
+    "projects" : [ "Appollo", "Orbital" ],
+    "githubId" : "mahidharah88",
+    "rating" : "5.0"
+  }, {
+    "name" : "Mahidharah3",
+    "phone" : "81256788",
+    "email" : "mahidharah@gmail.com",
+    "address" : "Blk 88 Lorong 8 Serangoon Gardens, #08-88",
+    "dateJoined" : "20-10-2020",
+    "role" : "Developer",
+    "salary" : "8880",
+    "projects" : [ "Appollo", "Orbital" ],
+    "githubId" : "mahidharah88",
+    "rating" : "5.0"
+  } ]
+}
diff --git a/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json b/src/test/data/JsonSerializableAddressBookTest/typicalPersonsAddressBook.json
diff --git a/src/test/java/seedu/address/logic/LogicManagerTest.java b/src/test/java/seedu/address/logic/LogicManagerTest.java
@@ -8,7 +8,7 @@
 import static seedu.address.logic.commands.CommandTestUtil.NAME_DESC_AMY;
 import static seedu.address.logic.commands.CommandTestUtil.PHONE_DESC_AMY;
 import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalPersons.AMY;
+import static seedu.address.testutil.TypicalDevelopers.AMY;
 
 import java.io.IOException;
 import java.nio.file.AccessDeniedException;

diff --git a/src/test/java/seedu/address/logic/commands/AddDeveloperCommandIntegrationTest.java b/src/test/java/seedu/address/logic/commands/AddDeveloperCommandIntegrationTest.java
@@ -2,7 +2,7 @@
 
 import static seedu.address.logic.commands.CommandTestUtil.assertCommandFailure;
 import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalDevelopers.getTypicalAddressBook;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

diff --git a/src/test/java/seedu/address/logic/commands/AddDeveloperCommandTest.java b/src/test/java/seedu/address/logic/commands/AddDeveloperCommandTest.java
@@ -5,7 +5,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalPersons.ALICE;
+import static seedu.address.testutil.TypicalDevelopers.ALICE;
 
 import java.nio.file.Path;
 import java.util.ArrayList;

diff --git a/src/test/java/seedu/address/logic/commands/ClearCommandTest.java b/src/test/java/seedu/address/logic/commands/ClearCommandTest.java
@@ -1,7 +1,7 @@
 package seedu.address.logic.commands;
 
 import static seedu.address.logic.commands.CommandTestUtil.assertCommandSuccess;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalDevelopers.getTypicalAddressBook;
 
 import org.junit.jupiter.api.Test;