Merge branch 'branch-A-MoreTesting'

Author: Pluiexo

src/main/java/plato/storage/Storage.java

@@ -45,7 +45,10 @@ public TaskManager loadFile() throws PlatoException {
                 throw new PlatoException("directoryError");
             }
         }
-        assert filePath.contains(".txt") : "Loading invalid storage format";
+        if (!filePath.contains("txt") || !filePath.contains("data")) {
+            throw new PlatoException("loadError");
+        }
+
         File storage = new File(filePath);
         try {
             if (!storage.createNewFile()) {
@@ -60,6 +63,9 @@ public TaskManager loadFile() throws PlatoException {
     }
 
     private void loadTasksFromFile(File file, TaskManager manager) throws IOException, PlatoException {
+
+        assert filePath.contains(".txt") : "Loading invalid storage format";
+
         BufferedReader br = new BufferedReader(new FileReader(file));
         String next;
 

src/main/java/plato/ui/DialogBox.java

@@ -68,5 +68,7 @@ private void flip() {
         Collections.reverse(tmp);
         getChildren().setAll(tmp);
         setAlignment(Pos.TOP_LEFT);
+        dialog.getStyleClass().clear();
+        dialog.getStyleClass().add("dialogLabelPlato");
     }
 }

src/main/resources/style/style.css

@@ -1,20 +1,34 @@
 /* For the dialog box window */
+/* Radius are top-left, top-right, bottom-right, and bottom-left corners, in that order. */
+/*Padding are in the order of top right bottom and left for java fx */
 .dialogLabel{
     -fx-border-radius: 20 20 20 20;
     -fx-background-radius: 20 20 20 20;
-    -fx-background-color: #2c242a;
+    -fx-background-color: #3d549d;
     -fx-background-padding: 100 200 0 0;
     -fx-padding: 15 25 15 25;
     -fx-background-insets: 0 0 0 0;
     -fx-text-fill: white;
-    -fx-effect: dropshadow(gaussian, rgba(45,36,42,0.8), 13, 0, 0, 0);
-    /* top-left, top-right, bottom-right, and bottom-left corners, in that order. */
-    /*Padding are in the order of top right bottom and left for java fx */
+    -fx-effect: dropshadow(gaussian, rgba(62,84,158,0.8), 13, 0, 0, 0);
+
  }
+
+ .dialogLabelPlato{
+     -fx-border-radius: 20 20 20 20;
+     -fx-background-radius: 20 20 20 20;
+     -fx-background-color: #2c242a;
+     -fx-background-padding: 100 200 0 0;
+     -fx-padding: 15 25 15 25;
+     -fx-background-insets: 0 0 0 0;
+     -fx-text-fill: white;
+     -fx-effect: dropshadow(gaussian, rgba(45,36,42,0.8), 13, 0, 0, 0);
+     /* top-left, top-right, bottom-right, and bottom-left corners, in that order. */
+     /*Padding are in the order of top right bottom and left for java fx */
+  }
  .image{
     -fx-effect: dropshadow(gaussian, rgba(45,36,42,0.8), 13, 0, 0, 0);
  }
 /* For the main screen*/
  .mainWindow{
-    -fx-background-color: #68abc4;
+    -fx-background-color: #7187b0;
  }

src/test/java/plato/parser/ParserTest.java

@@ -8,13 +8,16 @@
 
 import plato.PlatoException;
 import plato.task.Deadline;
+import plato.task.Event;
 import plato.task.Task;
 import plato.task.TaskManager;
 import plato.task.Todo;
 
 
 class ParserTest {
     private static final String RESPONSE_ADD = "Got it. I've added this task:";
+    private static final String RESPONSE_VIEW_DATES = "Here are the task scheduled on that date!!";
+    private static final String RESPONSE_FIND = "Here are the matching tasks in your list";
 
     @Test
     public void parse_todo() throws PlatoException {
@@ -42,5 +45,47 @@ public void parse_deadline() throws PlatoException {
         assertArrayEquals(testValues, Parser.parse("deadline math test /by 12-04-23 1800", testManager));
     }
 
+    @Test
+    public void parse_event() throws PlatoException {
+        TaskManager assertManager = new TaskManager();
+        LocalDateTime from = LocalDateTime.of(2023, 4, 12, 18, 0);
+        LocalDateTime by = LocalDateTime.of(2023, 4, 13, 15, 0);
+        Task testItem = new Event("science test ", from, by);
+        assertManager.addItem(testItem);
+        String[] testValues = new String[3];
+        testValues[0] = RESPONSE_ADD;
+        testValues[1] = testItem.toString();
+        testValues[2] = assertManager.numOfTask();
+        TaskManager testManager = new TaskManager();
+        assertArrayEquals(testValues, Parser.parse("event science test /from 12-04-23 1800 /to 1500 13/04/23",
+                                                   testManager));
+    }
+
+    @Test
+    public void parse_find() throws PlatoException {
+        TaskManager assertManager = new TaskManager();
+        Task testItem = new Deadline("math test ", LocalDateTime.of(2023, 4, 12, 18, 0));
+        assertManager.addItem(testItem);
+        String[] testValues = new String[2];
+        testValues[0] = RESPONSE_FIND;
+        testValues[1] = "1. " + testItem;
+        TaskManager testManager = new TaskManager();
+        testManager.addItem(testItem);
+        assertArrayEquals(testValues, Parser.parse("find math", testManager));
+    }
+
+    @Test
+    public void parse_view() throws PlatoException {
+        TaskManager assertManager = new TaskManager();
+        Task testItem = new Deadline("math test ", LocalDateTime.of(2023, 4, 12, 18, 0));
+        assertManager.addItem(testItem);
+        String[] testValues = new String[2];
+        testValues[0] = RESPONSE_VIEW_DATES;
+        testValues[1] = "1. " + testItem;
+        TaskManager testManager = new TaskManager();
+        testManager.addItem(testItem);
+        assertArrayEquals(testValues, Parser.parse("view 12-04-23", testManager));
+    }
+
 }
 

src/test/java/plato/storage/StorageTest.java

@@ -0,0 +1,18 @@
+package plato.storage;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+import plato.PlatoException;
+
+
+class StorageTest {
+    @Test
+    public void load_wrongFile_failure() {
+        String filePath = "testFakePath";
+        Storage store = new Storage(filePath);
+        assertThrows(PlatoException.class, store::loadFile);
+    }
+
+}