Merge pull request #13 from CS2103JAN2018-T11-B1/master

Updating my repo
CS2103JAN2018-T11-B1 · Apr 15, 2018 · f304121 · f304121
2 parents fc0ee5e + eb2305e
commit f304121
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 6 deletions.
diff --git a/src/test/data/XmlAddressBookStorageTest/invalidAndValidTaskAddressBook.xml b/src/test/data/XmlAddressBookStorageTest/invalidAndValidTaskAddressBook.xml
@@ -1 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><!-- @@author a-shakra --><addressbook>    <!-- Valid Task -->    <tasks>        <description>exampleTask1</description>        <duration>3h20m</duration>        <dateandtime>05/02/2018 3:20</dateandtime>    </tasks>    <!-- Task with invalid duration field -->    <tasks>        <description>exampleTask1</description>        <duration>3h2m</duration>        <dateAndTime>05/03/2018 3:20</dateAndTime>    </tasks></addressbook>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- @@author a-shakra -->
+<addressbook>
+    <!-- Valid Task -->
+    <tasks>
+        <description>exampleTask1</description>
+        <duration>3h20m</duration>
+        <dateandtime>05/02/2018 3:20</dateandtime>
+    </tasks>
+    <!-- Task with invalid duration field -->
+    <tasks>
+        <description>exampleTask1</description>
+        <duration>3h2m</duration>
+        <dateAndTime>05/03/2018 3:20</dateAndTime>
+    </tasks>
+</addressbook>
diff --git a/src/test/data/XmlAddressBookStorageTest/invalidTaskAddressBook.xml b/src/test/data/XmlAddressBookStorageTest/invalidTaskAddressBook.xml
@@ -1 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><!-- @@author a-shakra --><addressbook>    <tasks>        <description>exampleTask1</description>        <duration>3333333:::</duration>        <dateAndTime>2018-05-02T03:20</dateAndTime>    </tasks></addressbook>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- @@author a-shakra -->
+<addressbook>
+    <tasks>
+        <description>exampleTask1</description>
+        <duration>3333333:::</duration>
+        <dateAndTime>2018-05-02T03:20</dateAndTime>
+    </tasks>
+</addressbook>
diff --git a/src/test/data/XmlSerializableAddressBookTest/typicalTasksAddressBook.xml b/src/test/data/XmlSerializableAddressBookTest/typicalTasksAddressBook.xml
@@ -23,4 +23,4 @@
         <duration>3h20m</duration>
         <dateAndTime>02/07/2018T23:20</dateAndTime>
     </tasks>
-</addressbook>
+</addressbook>
diff --git a/src/test/data/XmlUtilTest/invalidTaskField.xml b/src/test/data/XmlUtilTest/invalidTaskField.xml
@@ -5,4 +5,4 @@
     <description>exampleTask1</description>
     <duration>3h20m</duration>
     <dateAndTime>2018-00-00T03:20</dateAndTime>
-</tasks>
+</tasks>
diff --git a/src/test/data/XmlUtilTest/missingTaskField.xml b/src/test/data/XmlUtilTest/missingTaskField.xml
@@ -4,4 +4,4 @@
 <tasks>
     <description>exampleTask1</description>
     <duration>3:20</duration>
-</tasks>
+</tasks>
diff --git a/src/test/data/XmlUtilTest/validTask.xml b/src/test/data/XmlUtilTest/validTask.xml
@@ -5,4 +5,4 @@
     <description>exampleTask1</description>
     <duration>3h20m</duration>
     <dateAndTime>02/03/2018T03:20</dateAndTime>
-</tasks>
+</tasks>