Merge pull request #130 from benluiwj/branch-storageTests

Storage tests

src/main/java/seedu/address/model/client/Client.java

@@ -108,11 +108,11 @@ public boolean equals(Object other) {
         }
 
         Client otherClient = (Client) other;
-        return id.equals(otherClient.id)
+        return (id.equals(otherClient.id)
                        && name.equals(otherClient.name)
                        && phoneNumber.equals(otherClient.phoneNumber)
                        && email.equals(otherClient.email)
-                       && address.equals(otherClient.address);
+                       && address.equals(otherClient.address));
     }
 
     @Override

src/main/java/seedu/address/storage/JsonSerializableAddressBook.java

@@ -34,8 +34,12 @@ class JsonSerializableAddressBook {
     @JsonCreator
     public JsonSerializableAddressBook(@JsonProperty("clients") List<JsonAdaptedClient> clients,
                                        @JsonProperty("products") List<JsonAdaptedProduct> products) {
-        this.clients.addAll(clients);
-        this.products.addAll(products);
+        if (clients != null) {
+            this.clients.addAll(clients);
+        }
+        if (products != null) {
+            this.products.addAll(products);
+        }
     }
 
     /**

src/test/data/JsonAddressBookStorageTest/invalidAndValidClientsAddressBook.json

@@ -0,0 +1,13 @@
+{
+  "clients": [ {
+    "name" : "Elle Meyer",
+    "phoneNumber": "9482224",
+    "email" : "[email protected]",
+    "address" : "michegan ave"
+  },{
+    "name": "Hans Muster",
+    "phone": "9482424",
+    "email": "invalid@email!3e",
+    "address": "4th street"
+  } ]
+}

src/test/data/JsonAddressBookStorageTest/invalidAndValidProductsAddressBook.json

@@ -0,0 +1,11 @@
+{
+  "products" : [    {
+    "name": "IPhone 13",
+    "unitPrice": "1",
+    "quantity" : "1"
+  }, {
+      "name": "IPhone 13",
+      "unitPrice": "-1",
+      "quantity" : "1"
+    } ]
+}

src/test/data/JsonAddressBookStorageTest/invalidClientsAddressBook.json

@@ -0,0 +1,8 @@
+{
+  "clients": [ {
+    "name": "Hans Muster",
+    "phone": "9482424",
+    "email": "invalid@email!3e",
+    "address": "4th street"
+  } ]
+}

src/test/data/JsonAddressBookStorageTest/invalidProductsAddressBook.json

@@ -0,0 +1,8 @@
+{
+  "products" : [
+    {
+      "name": "IPhone 13",
+      "unitPrice": "-1",
+      "quantity" : "1"
+    } ]
+}

src/test/data/JsonSerializableAddressBookTest/duplicateClientsAddressBook.json

@@ -0,0 +1,13 @@
+{
+  "clients": [ {
+    "name": "Alice Pauline",
+    "phoneNumber": "94351253",
+    "email": "[email protected]",
+    "address": "123, Jurong West Ave 6, #08-111"
+  }, {
+    "name" : "Alice Pauline",
+    "phoneNumber" : "94351253",
+    "email" : "[email protected]",
+    "address" : "123, Jurong West Ave 6, #08-111"
+  } ]
+}

src/test/data/JsonSerializableAddressBookTest/duplicateProductsAddressBook.json

@@ -0,0 +1,13 @@
+{
+  "products" : [
+    {
+      "name": "IPhone 13",
+      "unitPrice": "1",
+      "quantity" : "1"
+    }, {
+      "name": "IPhone 13",
+      "unitPrice": "1",
+      "quantity" : "1"
+    }
+  ]
+}

src/test/data/JsonSerializableAddressBookTest/invalidClientsAddressBook.json

@@ -0,0 +1,8 @@
+{
+  "clients": [ {
+    "name": "Hans Muster",
+    "phone": "9482424",
+    "email": "invalid@email!3e",
+    "address": "4th street"
+  } ]
+}

src/test/data/JsonSerializableAddressBookTest/invalidProductsAddressBook.json

@@ -0,0 +1,8 @@
+{
+  "products" : [
+    {
+      "name": "IPhone 13",
+      "unitPrice": "-1",
+      "quantity" : "1"
+    } ]
+}

src/test/data/JsonSerializableAddressBookTest/typicalClientsAddressBook.json

@@ -0,0 +1,40 @@
+{
+  "clients": [
+    {
+      "name": "Alice Pauline",
+      "phoneNumber": "94351253",
+      "email" : "[email protected]",
+      "address" : "123, Jurong West Ave 6, #08-111"
+    }, {
+      "name": "Benson Meier",
+      "phoneNumber": "98765432",
+      "email" : "[email protected]",
+      "address" : "311, Clementi Ave 2, #02-25"
+    }, {
+      "name" : "Carl Kurz",
+      "phoneNumber": "95352563",
+      "email" : "[email protected]",
+      "address" : "wall street"
+    }, {
+      "name" : "Daniel Meier",
+      "phoneNumber": "87652533",
+      "email" : "[email protected]",
+      "address" : "10th street"
+    }, {
+      "name" : "Elle Meyer",
+      "phoneNumber": "9482224",
+      "email" : "[email protected]",
+      "address" : "michegan ave"
+    }, {
+      "name" : "Fiona Kunz",
+      "phoneNumber": "9482427",
+      "email" : "[email protected]",
+      "address" : "little tokyo"
+    }, {
+      "name" : "George Best",
+      "phoneNumber": "9482442",
+      "email" : "[email protected]",
+      "address" : "4th street"
+    }
+  ]
+}

src/test/data/JsonSerializableAddressBookTest/typicalProductsAddressBook.json

@@ -0,0 +1,33 @@
+{
+  "products" : [
+    {
+      "name": "IPhone 13",
+      "unitPrice": "1",
+      "quantity" : "1"
+    }, {
+      "name": "IPad Pro",
+      "unitPrice": "1",
+      "quantity" : "5"
+    }, {
+      "name": "Air Pods Pro",
+      "unitPrice": "200",
+      "quantity" : "20"
+    }, {
+      "name": "MacBook Pro",
+      "unitPrice": "2500",
+      "quantity" : "15"
+    }, {
+      "name": "Mechanical Keyboard",
+      "unitPrice": "250",
+      "quantity" : "30"
+    }, {
+      "name": "Panadol",
+      "unitPrice": "8",
+      "quantity" : "50"
+    }, {
+      "name": "Mask",
+      "unitPrice": "0",
+      "quantity" : "1000"
+    }
+  ]
+}

src/test/java/seedu/address/storage/JsonAddressBookStorageTest.java

@@ -3,10 +3,12 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static seedu.address.testutil.Assert.assertThrows;
-import static seedu.address.testutil.TypicalPersons.ALICE;
-import static seedu.address.testutil.TypicalPersons.HOON;
-import static seedu.address.testutil.TypicalPersons.IDA;
-import static seedu.address.testutil.TypicalPersons.getTypicalAddressBook;
+import static seedu.address.testutil.TypicalClients.ALICE;
+import static seedu.address.testutil.TypicalClients.HOON;
+import static seedu.address.testutil.TypicalClients.IDA;
+import static seedu.address.testutil.TypicalProducts.CALCULATOR;
+import static seedu.address.testutil.TypicalProducts.IPHONE;
+import static seedu.address.testutil.TypicalProducts.TISSUE;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -18,6 +20,10 @@
 import seedu.address.commons.exceptions.DataConversionException;
 import seedu.address.model.AddressBook;
 import seedu.address.model.ReadOnlyAddressBook;
+import seedu.address.model.client.Client;
+import seedu.address.model.product.Product;
+import seedu.address.testutil.TypicalClients;
+import seedu.address.testutil.TypicalProducts;
 
 public class JsonAddressBookStorageTest {
     private static final Path TEST_DATA_FOLDER = Paths.get("src", "test", "data", "JsonAddressBookStorageTest");
@@ -51,16 +57,135 @@ public void read_notJsonFormat_exceptionThrown() {
     }
 
     @Test
-    public void readAddressBook_invalidPersonAddressBook_throwDataConversionException() {
-        assertThrows(DataConversionException.class, () -> readAddressBook("invalidPersonAddressBook.json"));
+    public void readAddressBook_invalidClientsAddressBook_throwDataConversionException() {
+        assertThrows(DataConversionException.class, ()->readAddressBook("invalidClientsAddressBook.json"));
     }
 
     @Test
-    public void readAddressBook_invalidAndValidPersonAddressBook_throwDataConversionException() {
-        assertThrows(DataConversionException.class, () -> readAddressBook("invalidAndValidPersonAddressBook.json"));
+    public void readAddressBook_invalidProductAddressBook_throwDataConversionException() {
+        assertThrows(DataConversionException.class, ()->readAddressBook("invalidProductsAddressBook.json"));
     }
 
     @Test
+    public void readAddressBook_invalidAndValidClientsAddressBook_throwDataConversionException() {
+        assertThrows(DataConversionException.class, () -> readAddressBook("invalidAndValidClientsAddressBook.json"));
+    }
+
+    @Test
+    public void readAddressBook_invalidAndValidProductsAddressBook_throwDataConversionException() {
+        assertThrows(DataConversionException.class, () -> readAddressBook("invalidAndValidProductsAddressBook.json"));
+    }
+
+    @Test
+    public void readAndSaveClientAddressBook_allInOrder_success() throws Exception {
+        Path filePath = testFolder.resolve("TempClientAddressBook.json");
+        AddressBook original = TypicalClients.getTypicalAddressBook();
+        JsonAddressBookStorage jsonAddressBookStorage = new JsonAddressBookStorage(filePath);
+
+        // Save in new file and read back
+        jsonAddressBookStorage.saveAddressBook(original, filePath);
+        ReadOnlyAddressBook readBack = jsonAddressBookStorage.readAddressBook(filePath).get();
+        AddressBook compare = new AddressBook();
+        for (int i = 0; i < original.getClientList().size(); i++) {
+            compare.addClient(Client.updateClient(
+                    original.getClientList().get(i),
+                    readBack.getClientList().get(i).getName(),
+                    readBack.getClientList().get(i).getPhoneNumber(),
+                    readBack.getClientList().get(i).getEmail(),
+                    readBack.getClientList().get(i).getAddress()
+            ));
+        }
+        assertEquals(original, compare);
+
+        //Modify data, overwrite exiting file, and read back
+        original.addClient(HOON);
+        original.removeClient(ALICE);
+        jsonAddressBookStorage.saveAddressBook(original, filePath);
+        readBack = jsonAddressBookStorage.readAddressBook(filePath).get();
+        compare = new AddressBook();
+        for (int i = 0; i < original.getClientList().size(); i++) {
+            compare.addClient(Client.updateClient(
+                    original.getClientList().get(i),
+                    readBack.getClientList().get(i).getName(),
+                    readBack.getClientList().get(i).getPhoneNumber(),
+                    readBack.getClientList().get(i).getEmail(),
+                    readBack.getClientList().get(i).getAddress()
+            ));
+        }
+        assertEquals(original, compare);
+
+        //Save and read without specifying file path
+        original.addClient(IDA);
+        jsonAddressBookStorage.saveAddressBook(original); // file path not specified
+        readBack = jsonAddressBookStorage.readAddressBook().get(); // file path not specified
+        compare = new AddressBook();
+        for (int i = 0; i < original.getClientList().size(); i++) {
+            compare.addClient(Client.updateClient(
+                    original.getClientList().get(i),
+                    readBack.getClientList().get(i).getName(),
+                    readBack.getClientList().get(i).getPhoneNumber(),
+                    readBack.getClientList().get(i).getEmail(),
+                    readBack.getClientList().get(i).getAddress()
+            ));
+        }
+        assertEquals(original, compare);
+
+    }
+
+    @Test
+    public void readAndSaveProductAddressBook_allInOrder_success() throws Exception {
+        Path filePath = testFolder.resolve("TempProductAddressBook.json");
+        AddressBook original = TypicalProducts.getTypicalAddressBook();
+        JsonAddressBookStorage jsonAddressBookStorage = new JsonAddressBookStorage(filePath);
+
+        // Save in new file and read back
+        jsonAddressBookStorage.saveAddressBook(original, filePath);
+        ReadOnlyAddressBook readBack = jsonAddressBookStorage.readAddressBook(filePath).get();
+        AddressBook compare = new AddressBook();
+        for (int i = 0; i < original.getProductList().size(); i++) {
+            compare.addProduct(Product.updateProduct(
+                    original.getProductList().get(i),
+                    readBack.getProductList().get(i).getName(),
+                    readBack.getProductList().get(i).getUnitPrice(),
+                    readBack.getProductList().get(i).getQuantity()
+            ));
+        }
+        assertEquals(original, compare);
+
+        //Modify data, overwrite exiting file, and read back
+        original.addProduct(CALCULATOR);
+        original.removeProduct(IPHONE);
+        jsonAddressBookStorage.saveAddressBook(original, filePath);
+        readBack = jsonAddressBookStorage.readAddressBook(filePath).get();
+        compare = new AddressBook();
+        for (int i = 0; i < original.getProductList().size(); i++) {
+            compare.addProduct(Product.updateProduct(
+                    original.getProductList().get(i),
+                    readBack.getProductList().get(i).getName(),
+                    readBack.getProductList().get(i).getUnitPrice(),
+                    readBack.getProductList().get(i).getQuantity()
+            ));
+        }
+        assertEquals(original, compare);
+
+        //Save and read without specifying file path
+        original.addProduct(TISSUE);
+        jsonAddressBookStorage.saveAddressBook(original); // file path not specified
+        readBack = jsonAddressBookStorage.readAddressBook().get(); // file path not specified
+        compare = new AddressBook();
+        for (int i = 0; i < original.getProductList().size(); i++) {
+            compare.addProduct(Product.updateProduct(
+                    original.getProductList().get(i),
+                    readBack.getProductList().get(i).getName(),
+                    readBack.getProductList().get(i).getUnitPrice(),
+                    readBack.getProductList().get(i).getQuantity()
+            ));
+        }
+        assertEquals(original, compare);
+
+    }
+
+    /*@Test
     public void readAndSaveAddressBook_allInOrder_success() throws Exception {
         Path filePath = testFolder.resolve("TempAddressBook.json");
         AddressBook original = getTypicalAddressBook();
@@ -84,7 +209,7 @@ public void readAndSaveAddressBook_allInOrder_success() throws Exception {
         readBack = jsonAddressBookStorage.readAddressBook().get(); // file path not specified
         assertEquals(original, new AddressBook(readBack));
 
-    }
+    }*/
 
     @Test
     public void saveAddressBook_nullAddressBook_throwsNullPointerException() {