Created two assertions

sj1999-BIT · Sep 9, 2021 · cb4d7a5 · cb4d7a5
1 parent 0f66bcb
commit cb4d7a5
Show file tree

Hide file tree

Showing 20 changed files with 31 additions and 18 deletions.
diff --git a/.gradle/6.7/executionHistory/executionHistory.bin b/.gradle/6.7/executionHistory/executionHistory.bin
diff --git a/.gradle/6.7/executionHistory/executionHistory.lock b/.gradle/6.7/executionHistory/executionHistory.lock
diff --git a/.gradle/6.7/fileHashes/fileHashes.bin b/.gradle/6.7/fileHashes/fileHashes.bin
diff --git a/.gradle/6.7/fileHashes/fileHashes.lock b/.gradle/6.7/fileHashes/fileHashes.lock
diff --git a/.gradle/6.7/javaCompile/classAnalysis.bin b/.gradle/6.7/javaCompile/classAnalysis.bin
diff --git a/.gradle/6.7/javaCompile/javaCompile.lock b/.gradle/6.7/javaCompile/javaCompile.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/build/classes/java/main/Duke.class b/build/classes/java/main/Duke.class
diff --git a/build/classes/java/main/Storage/DeadlineTask.class b/build/classes/java/main/Storage/DeadlineTask.class
diff --git a/build/classes/java/main/Storage/EventsTask.class b/build/classes/java/main/Storage/EventsTask.class
diff --git a/build/classes/java/main/Storage/Parser.class b/build/classes/java/main/Storage/Parser.class
diff --git a/build/classes/java/main/Storage/Storage.class b/build/classes/java/main/Storage/Storage.class
diff --git a/build/classes/java/main/Storage/TodoTasks.class b/build/classes/java/main/Storage/TodoTasks.class
diff --git a/build/classes/java/main/Ui.class b/build/classes/java/main/Ui.class
diff --git a/build/libs/ip-1.0-SNAPSHOT.jar b/build/libs/ip-1.0-SNAPSHOT.jar
diff --git a/build/resources/main/META-INF/MANIFEST.MF b/build/resources/main/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: Main
+
diff --git a/build/tmp/compileJava/source-classes-mapping.txt b/build/tmp/compileJava/source-classes-mapping.txt
@@ -1,29 +1,29 @@
-Duke.java
- Duke
- Ui
+Task/DeadlineException.java
+ Task.DeadlineException
 Launcher.java
  Launcher
 Task/TaskList.java
  Task.TaskList
-Main.java
- Main
-Task/EventsException.java
- Task.EventsException
-Task/TodoException.java
- Task.TodoException
 Storage/Storage.java
  Storage.DeadlineTask
  Storage.EventsTask
  Storage.Parser
  Storage.Storage
  Storage.TodoTasks
+Task/EventsException.java
+ Task.EventsException
+Task/TodoException.java
+ Task.TodoException
+Task/Task.java
+ Task.Task
 Task/TaskTypes.java
  Task.TaskTypes
-MainWindow.java
- MainWindow
 DialogBox.java
  DialogBox
-Task/Task.java
- Task.Task
-Task/DeadlineException.java
- Task.DeadlineException
+Duke.java
+ Duke
+ Ui
+Main.java
+ Main
+MainWindow.java
+ MainWindow
diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
@@ -8,6 +8,7 @@
 
 public class Duke{
  private final Ui userInterface = new Ui();
+ private boolean initialised = false;
 
  public static void main(String[] args) {
  Duke user = new Duke();
@@ -21,7 +22,13 @@ public static void main(String[] args) {
  }
 
  public String getResponse(String input) {
- return userInterface.choiceOfAction(input);
+ if (initialised) {
+ return userInterface.choiceOfAction(input);
+ } else {
+ initialised = true;
+ userInterface.getDataInputList();
+ return userInterface.greet();
+ }
  }
 }
 
@@ -51,7 +58,7 @@ public String greet() {
  * generate the end message.
  */
  public String bye() {
- store.saveListInFile("src/main/java/Duke/Duke.txt", taskList);
+ store.saveListInFile("src/main/java/Duke.txt", taskList);
  return "Bye. Hope to see you again soon!";
  }
  /**

diff --git a/src/main/java/Duke.txt b/src/main/java/Duke.txt
@@ -0,0 +1 @@
+Todo r
diff --git a/src/main/java/Storage/Storage.java b/src/main/java/Storage/Storage.java
@@ -17,7 +17,7 @@ public class Storage {
  */
  public void getDataInputList(TaskList lst) {
  try {
- File f = new File("src/main/java/Duke/Duke.txt");
+ File f = new File("src/main/java/Duke.txt");
  if(!f.exists()){
  f.createNewFile();
  }
@@ -139,8 +139,10 @@ public Task createTask(String action) throws Exception{
  return new TodoTasks(action);
  } else {
  if (type.equals("Deadline")) {
+ assert action.contains("Deadline") : "invalid format";
  return new DeadlineTask(action);
  } else if (type.equals("Events")) {
+ assert action.contains("Events") : "invalid format";
  return new EventsTask(action);
  } else {
  throw new Exception("Error type");