From d972c8af135030eb27bea600be5cf27591db4987 Mon Sep 17 00:00:00 2001 From: jessteoxizhi Date: Mon, 11 Nov 2019 23:19:21 +0800 Subject: [PATCH 1/3] checkstyle --- src/main/resources/NoteDaily.txt | 22 +++++ .../PlacesAddCommandTest.java | 2 +- .../PlacesCommandParserTest.java | 2 +- .../PlacesDeleteCommandTest.java | 2 +- .../PlacesFindCommandTest.java | 4 +- .../PlacesListCommandTest.java | 4 +- .../PlacesUndoCommandTest.java | 9 +- .../deleteModuleCommandTest.java | 85 +++++++++---------- .../shiftModuleCommandTest.java | 78 ++++++++--------- .../taskcmdtest/RescheduleCommandTest.java | 16 ++-- .../java/taskcmdtest/SnoozeCommandTest.java | 16 ++-- .../java/taskcmdtest/TentativeEventTest.java | 16 ++-- 12 files changed, 142 insertions(+), 114 deletions(-) diff --git a/src/main/resources/NoteDaily.txt b/src/main/resources/NoteDaily.txt index e69de29bb2..e9af979d7d 100644 --- a/src/main/resources/NoteDaily.txt +++ b/src/main/resources/NoteDaily.txt @@ -0,0 +1,22 @@ +2019-10-12 +1 +testing note +2020-09-11 +2 +note 1 +note 2 +2019-08-11 +1 +updated note +2019-11-09 +10 +will receive chocolate hahaha +jiayou for this busy day +today is a holiday +made a new friend today :) +managed meet mum +went to botanic gardens +saw a new species of bird +took photo of a rare bird +ai ya! failed to photograph a pretty butterfly +found a pretty pebble diff --git a/src/test/java/PlacesCommandTest/PlacesAddCommandTest.java b/src/test/java/PlacesCommandTest/PlacesAddCommandTest.java index 7bafece0e2..bcd2ce42b9 100644 --- a/src/test/java/PlacesCommandTest/PlacesAddCommandTest.java +++ b/src/test/java/PlacesCommandTest/PlacesAddCommandTest.java @@ -1,6 +1,6 @@ //@@author jessteoxizhi -package PlacesCommandTest; +package placesCommandTest; import gazeeebo.UI.Ui; import gazeeebo.commands.places.AddPlacesCommand; diff --git a/src/test/java/PlacesCommandTest/PlacesCommandParserTest.java b/src/test/java/PlacesCommandTest/PlacesCommandParserTest.java index 18eeb75ad8..0744ca7b15 100644 --- a/src/test/java/PlacesCommandTest/PlacesCommandParserTest.java +++ b/src/test/java/PlacesCommandTest/PlacesCommandParserTest.java @@ -1,6 +1,6 @@ //@@author jessteoxizhi -package PlacesCommandTest; +package placesCommandTest; import gazeeebo.storage.TriviaStorage; import gazeeebo.triviaManager.TriviaManager; diff --git a/src/test/java/PlacesCommandTest/PlacesDeleteCommandTest.java b/src/test/java/PlacesCommandTest/PlacesDeleteCommandTest.java index b272afff37..d67d1210f8 100644 --- a/src/test/java/PlacesCommandTest/PlacesDeleteCommandTest.java +++ b/src/test/java/PlacesCommandTest/PlacesDeleteCommandTest.java @@ -1,6 +1,6 @@ //@@author jessteoxizhi -package PlacesCommandTest; +package placesCommandTest; import gazeeebo.UI.Ui; import gazeeebo.commands.places.DeletePlacesCommand; diff --git a/src/test/java/PlacesCommandTest/PlacesFindCommandTest.java b/src/test/java/PlacesCommandTest/PlacesFindCommandTest.java index 47244100bf..28b9cbb714 100644 --- a/src/test/java/PlacesCommandTest/PlacesFindCommandTest.java +++ b/src/test/java/PlacesCommandTest/PlacesFindCommandTest.java @@ -1,6 +1,6 @@ //@@author jessteoxizhi -package PlacesCommandTest; +package placesCommandTest; import gazeeebo.UI.Ui; import gazeeebo.commands.places.FindPlacesCommand; @@ -37,7 +37,7 @@ void restoreStream() { } /** - * test find places command + * test find places command. * @throws IOException exception when there is an error reading the command */ diff --git a/src/test/java/PlacesCommandTest/PlacesListCommandTest.java b/src/test/java/PlacesCommandTest/PlacesListCommandTest.java index e8a7f3b29b..e07f71b176 100644 --- a/src/test/java/PlacesCommandTest/PlacesListCommandTest.java +++ b/src/test/java/PlacesCommandTest/PlacesListCommandTest.java @@ -1,6 +1,6 @@ //@@author jessteoxizhi -package PlacesCommandTest; +package placesCommandTest; import gazeeebo.UI.Ui; import gazeeebo.commands.places.ListPlacesCommand; @@ -38,7 +38,7 @@ void restoreStream() { /** * test list command. - * @throws IOException + * @throws IOException Exception when file cannot be read */ @Test diff --git a/src/test/java/PlacesCommandTest/PlacesUndoCommandTest.java b/src/test/java/PlacesCommandTest/PlacesUndoCommandTest.java index d6a3830784..27271c2f6b 100644 --- a/src/test/java/PlacesCommandTest/PlacesUndoCommandTest.java +++ b/src/test/java/PlacesCommandTest/PlacesUndoCommandTest.java @@ -1,6 +1,6 @@ //@@author jessteoxizhi -package PlacesCommandTest; +package placesCommandTest; import gazeeebo.UI.Ui; import gazeeebo.commands.places.UndoPlacesCommand; @@ -14,7 +14,12 @@ import java.io.IOException; import java.io.PrintStream; import java.text.ParseException; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.TreeMap; +import java.util.Stack; + + import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/studyAssistTest/deleteModuleCommandTest.java b/src/test/java/studyAssistTest/deleteModuleCommandTest.java index 0843e0a93c..2e73281a39 100644 --- a/src/test/java/studyAssistTest/deleteModuleCommandTest.java +++ b/src/test/java/studyAssistTest/deleteModuleCommandTest.java @@ -19,7 +19,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -public class deleteModuleCommandTest { +class deleteModuleCommandTest { private final ByteArrayOutputStream outContent = new ByteArrayOutputStream(); private final PrintStream originalOut = System.out; @@ -32,19 +32,19 @@ public void setUpStreams() { public void restoreStreams() { System.setOut(originalOut); } + @Test void deleteModule_emptyException() throws IOException { Storage storage = new Storage(); Ui ui = new Ui(); StudyAssistPageStorage studyAssistPageStorage = new StudyAssistPageStorage(); - StudyPlannerCommand StudyPlan = new StudyPlannerCommand(studyAssistPageStorage); + StudyPlannerCommand studyPlan = new StudyPlannerCommand(studyAssistPageStorage); Stack>> oldStudyPlan = new Stack<>(); - oldStudyPlan.push(StudyPlan.StudyPlan); + oldStudyPlan.push(studyPlan.StudyPlan); ui.fullCommand = "delete"; try { - new DeleteModuleCommand().execute(StudyPlan,studyAssistPageStorage,ui,oldStudyPlan); -// fail(); - } catch (DukeException e){ + new DeleteModuleCommand().execute(studyPlan,studyAssistPageStorage,ui,oldStudyPlan); + } catch (DukeException e) { assertEquals("Please follow the correct input format~",e.getMessage()); } } @@ -54,105 +54,104 @@ void deleteModule_wrongModuleException() throws IOException { Storage storage = new Storage(); Ui ui = new Ui(); StudyAssistPageStorage studyAssistPageStorage = new StudyAssistPageStorage(); - StudyPlannerCommand StudyPlan = new StudyPlannerCommand(studyAssistPageStorage); + StudyPlannerCommand studyPlan = new StudyPlannerCommand(studyAssistPageStorage); Stack>> oldStudyPlan = new Stack<>(); - oldStudyPlan.push(StudyPlan.StudyPlan); + oldStudyPlan.push(studyPlan.StudyPlan); ui.fullCommand = "delete CD1234 from 5"; try { - new DeleteModuleCommand().execute(StudyPlan,studyAssistPageStorage,ui,oldStudyPlan); -// fail(); - } catch (DukeException e){ + new DeleteModuleCommand().execute(studyPlan,studyAssistPageStorage,ui,oldStudyPlan); + } catch (DukeException e) { assertEquals("We currently do not have this module.",e.getMessage()); } } + @Test void addModule_wrongSemesterException() throws IOException { Storage storage = new Storage(); Ui ui = new Ui(); StudyAssistPageStorage studyAssistPageStorage = new StudyAssistPageStorage(); - StudyPlannerCommand StudyPlan = new StudyPlannerCommand(studyAssistPageStorage); + StudyPlannerCommand studyPlan = new StudyPlannerCommand(studyAssistPageStorage); Stack>> oldStudyPlan = new Stack<>(); - oldStudyPlan.push(StudyPlan.StudyPlan); + oldStudyPlan.push(studyPlan.StudyPlan); ui.fullCommand = "delete CS2040C from 9"; try { - new DeleteModuleCommand().execute(StudyPlan,studyAssistPageStorage,ui,oldStudyPlan); -// fail(); - } catch (DukeException | IOException e){ + new DeleteModuleCommand().execute(studyPlan,studyAssistPageStorage,ui,oldStudyPlan); + } catch (DukeException | IOException e) { assertEquals("Please input correct Semester number.",e.getMessage()); } } + @Test void addModule_wrongFormatException() throws IOException { Storage storage = new Storage(); Ui ui = new Ui(); StudyAssistPageStorage studyAssistPageStorage = new StudyAssistPageStorage(); - StudyPlannerCommand StudyPlan = new StudyPlannerCommand(studyAssistPageStorage); + StudyPlannerCommand studyPlan = new StudyPlannerCommand(studyAssistPageStorage); Stack>> oldStudyPlan = new Stack<>(); - oldStudyPlan.push(StudyPlan.StudyPlan); + oldStudyPlan.push(studyPlan.StudyPlan); ui.fullCommand = "delete CS2040C from"; try { - new DeleteModuleCommand().execute(StudyPlan,studyAssistPageStorage,ui,oldStudyPlan); -// fail(); - } catch (DukeException | IOException e){ + new DeleteModuleCommand().execute(studyPlan,studyAssistPageStorage,ui,oldStudyPlan); + } catch (DukeException | IOException e) { assertEquals("Please follow the correct input format~",e.getMessage()); } } + @Test void addModule_not_existModuleException() throws IOException { Storage storage = new Storage(); Ui ui = new Ui(); StudyAssistPageStorage studyAssistPageStorage = new StudyAssistPageStorage(); - StudyPlannerCommand StudyPlan = new StudyPlannerCommand(studyAssistPageStorage); + StudyPlannerCommand studyPlan = new StudyPlannerCommand(studyAssistPageStorage); Stack>> oldStudyPlan = new Stack<>(); - oldStudyPlan.push(StudyPlan.StudyPlan); + oldStudyPlan.push(studyPlan.StudyPlan); ui.fullCommand = "delete CS3230 sem 5"; try { - new DeleteModuleCommand().execute(StudyPlan,studyAssistPageStorage,ui,oldStudyPlan); -// fail(); - } catch (DukeException | IOException e){ + new DeleteModuleCommand().execute(studyPlan,studyAssistPageStorage,ui,oldStudyPlan); + } catch (DukeException | IOException e) { assertEquals("This module is not inside the study plan",e.getMessage()); } } + @Test void deleteModuleTest() throws IOException { Storage storage = new Storage(); Ui ui = new Ui(); StudyAssistPageStorage studyAssistPageStorage = new StudyAssistPageStorage(); - StudyPlannerCommand StudyPlan = new StudyPlannerCommand(studyAssistPageStorage); + StudyPlannerCommand studyPlan = new StudyPlannerCommand(studyAssistPageStorage); Stack>> oldStudyPlan = new Stack<>(); - oldStudyPlan.push(StudyPlan.StudyPlan); + oldStudyPlan.push(studyPlan.StudyPlan); ui.fullCommand = "delete CS2040C from 5"; - String ModuleCode = "CS2040C"; - int Semester = Integer.parseInt(ui.fullCommand.split(" ")[3]) - 1; + String moduleCode = "CS2040C"; + int semester = Integer.parseInt(ui.fullCommand.split(" ")[3]) - 1; boolean flag = false; int semester_number = -1; - for(int i=0;i tasks = new ArrayList(); @@ -30,21 +30,21 @@ public void testExecuteSnooze() throws ParseException,IOException,DukeException{ Storage storage = new Storage(); TriviaStorage triviaStorage = new TriviaStorage(); TriviaManager triviaManager = new TriviaManager(triviaStorage); - Stack> CommandStack = new Stack<>(); + Stack> commandStack = new Stack<>(); ArrayList deletedTask = new ArrayList(); ui.fullCommand = "deadline return book /by 2008-07-07 03:03:03"; try { - deadlineCommand.execute(tasks,ui,storage, CommandStack, deletedTask,triviaManager); + deadlineCommand.execute(tasks,ui,storage, commandStack, deletedTask,triviaManager); } catch (DukeException dukeException) { dukeException.printStackTrace(); } ui.fullCommand = "reschedule 1"; - int index =0; - String Decription = tasks.get(index).description; - ui.fullCommand ="2019-09-18 05:05:05"; - Task RescheduledDeadline = new Deadline(Decription, ui.fullCommand); + int index = 0; + String description = tasks.get(index).description; + ui.fullCommand = "2019-09-18 05:05:05"; + Task rescheduledDeadline = new Deadline(description, ui.fullCommand); tasks.remove(index); - tasks.add(RescheduledDeadline); + tasks.add(rescheduledDeadline); assertEquals(tasks.get(0).toString(),"D|ND|return book |by: 2019-09-18 05:05:05"); diff --git a/src/test/java/taskcmdtest/SnoozeCommandTest.java b/src/test/java/taskcmdtest/SnoozeCommandTest.java index 431ad35da8..9b5630e629 100644 --- a/src/test/java/taskcmdtest/SnoozeCommandTest.java +++ b/src/test/java/taskcmdtest/SnoozeCommandTest.java @@ -33,25 +33,25 @@ public void testExecuteSnooze() throws IOException { Storage storage = new Storage(); TriviaStorage triviaStorage = new TriviaStorage(); TriviaManager triviaManager = new TriviaManager(triviaStorage); - Stack> CommandStack = new Stack<>(); + Stack> commandStack = new Stack<>(); ArrayList deletedTask = new ArrayList(); ui.fullCommand = "deadline return book /by 2008-07-07 03:03:03"; try { - deadlineCommand.execute(tasks,ui,storage, CommandStack, deletedTask,triviaManager); - } catch (DukeException | ParseException |IOException e) { + deadlineCommand.execute(tasks,ui,storage, commandStack, deletedTask,triviaManager); + } catch (DukeException | ParseException | IOException e) { e.printStackTrace(); } int index = 0; int year = 1; - int day =1; - int month =1; + int day = 1; + int month = 1; int hour = 1; - String Description = tasks.get(index).description; + String description = tasks.get(index).description; String date = tasks.get(index).toString().split("\\|")[3].substring(4); LocalDateTime newDate = LocalDateTime.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); newDate = newDate.plusYears(year).plusMonths(month).plusDays(day).plusHours(hour); - String newBy= newDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - Task snoozedDeadline = new Deadline(Description,newBy); + String newBy = newDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + Task snoozedDeadline = new Deadline(description,newBy); tasks.remove(index); tasks.add(snoozedDeadline); diff --git a/src/test/java/taskcmdtest/TentativeEventTest.java b/src/test/java/taskcmdtest/TentativeEventTest.java index 48ada1aac7..5e2898b0fd 100644 --- a/src/test/java/taskcmdtest/TentativeEventTest.java +++ b/src/test/java/taskcmdtest/TentativeEventTest.java @@ -20,18 +20,20 @@ public void testListFormat() { tentativetimes.add("2008-06-07 05:05:05-08:08:08"); tentativetimes.add("2007-03-02 04:04:04-10:10:10"); TentativeEvent newtentative = new TentativeEvent(description,tentativetimes); - String timeslots = "[TE]"+ "[" + newtentative.getStatusIcon() + "] "+description+"\n" ; + String timeslots = "[TE]" + "[" + newtentative.getStatusIcon() + "] " + description + "\n"; for (int i = 0; i < tentativetimes.size(); i++) { DateTimeFormatter fmtED = DateTimeFormatter.ofPattern("yyyy-MM-dd"); DateTimeFormatter fmtET = DateTimeFormatter.ofPattern("HH:mm:ss"); String[] dateTime = tentativetimes.get(i).split(" "); String[] time = dateTime[1].split("-"); - String datestring = LocalDate.parse(dateTime[0], fmtED).format(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM)); - String output = datestring + " "+ LocalTime.parse(time[0], fmtET).format(fmtET) + "-" + LocalTime.parse(time[1], fmtET).format(fmtET) + ")"; - if(i==0){ - timeslots += "at "+output+"\n"; - }else{ - timeslots += "or "+output+"\n"; + String datestring = LocalDate.parse(dateTime[0], fmtED) + .format(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM)); + String output = datestring + " " + LocalTime.parse(time[0], fmtET).format(fmtET) + "-" + + LocalTime.parse(time[1], fmtET).format(fmtET) + ")"; + if (i == 0) { + timeslots += "at " + output + "\n"; + } else { + timeslots += "or " + output + "\n"; } } assertEquals(newtentative.listFormat(),timeslots); From c6785c32e23e0dbb320f0875b83e6ae47963b5ac Mon Sep 17 00:00:00 2001 From: jessteoxizhi Date: Mon, 11 Nov 2019 23:27:51 +0800 Subject: [PATCH 2/3] refactor places test --- GazeeeboLogger.log.lck | 0 Save.txt | 20 ------------------- .../PlacesAddCommandTest.java | 3 ++- .../PlacesDeleteCommandTest.java | 3 ++- .../PlacesFindCommandTest.java | 3 ++- .../PlacesListCommandTest.java | 3 ++- .../PlacesParserTest.java} | 5 +++-- .../PlacesUndoCommandTest.java | 2 +- 8 files changed, 12 insertions(+), 27 deletions(-) delete mode 100644 GazeeeboLogger.log.lck rename src/test/java/{PlacesCommandTest => placestest}/PlacesAddCommandTest.java (98%) rename src/test/java/{PlacesCommandTest => placestest}/PlacesDeleteCommandTest.java (98%) rename src/test/java/{PlacesCommandTest => placestest}/PlacesFindCommandTest.java (98%) rename src/test/java/{PlacesCommandTest => placestest}/PlacesListCommandTest.java (98%) rename src/test/java/{PlacesCommandTest/PlacesCommandParserTest.java => placestest/PlacesParserTest.java} (98%) rename src/test/java/{PlacesCommandTest => placestest}/PlacesUndoCommandTest.java (98%) diff --git a/GazeeeboLogger.log.lck b/GazeeeboLogger.log.lck deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Save.txt b/Save.txt index 504f615c6f..cb7be37ecd 100644 --- a/Save.txt +++ b/Save.txt @@ -1,21 +1 @@ D|ND|yearly assignment|by: 2020-01-01 01:01:01 -E|ND|party|at: 2019-11-09 12:00:00-14:00:00 -E|ND|project meeting|at: 2019-01-13 08:00:00-13:00:00 -E|ND|meeting friend|at: 2019-01-13 15:00:00-16:00:00 -E|ND|welfare pack collection|at: 2019-01-13 16:30:00-17:30:00 -E|ND|internship fair|at: 2019-01-13 18:00:00-20:30:00 -D|ND|project submission|by: 2019-01-13 23:59:59 -D|ND|PPP|by: 2019-01-13 23:59:59 -D|ND|UG|by: 2019-01-13 23:59:59 -D|ND|DG|by: 2019-01-13 23:59:59 -D|ND|jar file submission|by: 2019-01-13 23:59:59 -D|ND|update github page|by: 2019-01-13 23:59:59 -E|ND|lunch with parents|at: 2019-01-12 12:00:00-13:00:00 -E|ND|consultation|at: 2019-01-11 14:00:00-14:30:00 -P|ND|watch cg2028 webcast|2019-01-10 and 2019-01-14 -P|ND|do geh1036 tutorial|2019-01-09 and 2019-01-13 -P|ND|polish my blade|2019-01-07 and 2019-01-09 -P|ND|cut hair|2019-01-06 and 2019-01-07 -P|ND|buy new chair|2019-01-05 and 2019-01-08 -P|ND|clean room|2019-01-06 and 2019-01-10 - diff --git a/src/test/java/PlacesCommandTest/PlacesAddCommandTest.java b/src/test/java/placestest/PlacesAddCommandTest.java similarity index 98% rename from src/test/java/PlacesCommandTest/PlacesAddCommandTest.java rename to src/test/java/placestest/PlacesAddCommandTest.java index 56014354f7..1a5263a13f 100644 --- a/src/test/java/PlacesCommandTest/PlacesAddCommandTest.java +++ b/src/test/java/placestest/PlacesAddCommandTest.java @@ -1,6 +1,6 @@ //@@author jessteoxizhi -package placesCommandTest; +package placestest; import gazeeebo.ui.Ui; import gazeeebo.commands.places.AddPlacesCommand; @@ -59,3 +59,4 @@ void testAddWrongPlacesCommand() { assertEquals("Please input add command in the correct format\r\n", output.toString()); } } + diff --git a/src/test/java/PlacesCommandTest/PlacesDeleteCommandTest.java b/src/test/java/placestest/PlacesDeleteCommandTest.java similarity index 98% rename from src/test/java/PlacesCommandTest/PlacesDeleteCommandTest.java rename to src/test/java/placestest/PlacesDeleteCommandTest.java index 5755a36f5a..6a69029e6e 100644 --- a/src/test/java/PlacesCommandTest/PlacesDeleteCommandTest.java +++ b/src/test/java/placestest/PlacesDeleteCommandTest.java @@ -1,6 +1,6 @@ //@@author jessteoxizhi -package placesCommandTest; +package placestest; import gazeeebo.ui.Ui; import gazeeebo.commands.places.DeletePlacesCommand; @@ -71,3 +71,4 @@ void testDeleteWrongFormatPlacesCommand() throws IOException { assertEquals("Please input delete command in the correct format\r\n", output.toString()); } } + diff --git a/src/test/java/PlacesCommandTest/PlacesFindCommandTest.java b/src/test/java/placestest/PlacesFindCommandTest.java similarity index 98% rename from src/test/java/PlacesCommandTest/PlacesFindCommandTest.java rename to src/test/java/placestest/PlacesFindCommandTest.java index 13f3eaece2..ff5f03d930 100644 --- a/src/test/java/PlacesCommandTest/PlacesFindCommandTest.java +++ b/src/test/java/placestest/PlacesFindCommandTest.java @@ -1,6 +1,6 @@ //@@author jessteoxizhi -package placesCommandTest; +package placestest; import gazeeebo.ui.Ui; import gazeeebo.commands.places.FindPlacesCommand; @@ -53,3 +53,4 @@ void testFindPlacesCommand() throws IOException { + "------------------------------------------\n", output.toString()); } } + diff --git a/src/test/java/PlacesCommandTest/PlacesListCommandTest.java b/src/test/java/placestest/PlacesListCommandTest.java similarity index 98% rename from src/test/java/PlacesCommandTest/PlacesListCommandTest.java rename to src/test/java/placestest/PlacesListCommandTest.java index 5efe0c1e50..de04b2baff 100644 --- a/src/test/java/PlacesCommandTest/PlacesListCommandTest.java +++ b/src/test/java/placestest/PlacesListCommandTest.java @@ -1,6 +1,6 @@ //@@author jessteoxizhi -package placesCommandTest; +package placestest; import gazeeebo.ui.Ui; import gazeeebo.commands.places.ListPlacesCommand; @@ -57,3 +57,4 @@ void testListPlacesCommand() throws IOException { + "------------------------------------------\n", output.toString()); } } + diff --git a/src/test/java/PlacesCommandTest/PlacesCommandParserTest.java b/src/test/java/placestest/PlacesParserTest.java similarity index 98% rename from src/test/java/PlacesCommandTest/PlacesCommandParserTest.java rename to src/test/java/placestest/PlacesParserTest.java index 76ae599c8e..2faeb2f407 100644 --- a/src/test/java/PlacesCommandTest/PlacesCommandParserTest.java +++ b/src/test/java/placestest/PlacesParserTest.java @@ -1,6 +1,6 @@ //@@author jessteoxizhi -package placesCommandTest; +package placestest; import gazeeebo.storage.TriviaStorage; import gazeeebo.triviamanager.TriviaManager; @@ -21,7 +21,7 @@ import java.util.Stack; import static org.junit.jupiter.api.Assertions.assertEquals; -class PlacesCommandParserTest { +class PlacesParserTest { private ByteArrayOutputStream output = new ByteArrayOutputStream(); private PrintStream mine = new PrintStream(output); private PrintStream original = System.out; @@ -80,3 +80,4 @@ void testPlaceCommand() throws IOException, ParseException, DukeException { + "\r\n",output.toString()); } } + diff --git a/src/test/java/PlacesCommandTest/PlacesUndoCommandTest.java b/src/test/java/placestest/PlacesUndoCommandTest.java similarity index 98% rename from src/test/java/PlacesCommandTest/PlacesUndoCommandTest.java rename to src/test/java/placestest/PlacesUndoCommandTest.java index 7afa8efea2..b2f8006c3f 100644 --- a/src/test/java/PlacesCommandTest/PlacesUndoCommandTest.java +++ b/src/test/java/placestest/PlacesUndoCommandTest.java @@ -1,6 +1,6 @@ //@@author jessteoxizhi -package placesCommandTest; +package placestest; import gazeeebo.ui.Ui; import gazeeebo.commands.places.UndoPlacesCommand; From 16ad2390bb0929e232df700e605290a50ad7726c Mon Sep 17 00:00:00 2001 From: jessteoxizhi Date: Mon, 11 Nov 2019 23:31:11 +0800 Subject: [PATCH 3/3] PPP --- docs/team/jessteoxizhi.pdf | Bin 557714 -> 557668 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/team/jessteoxizhi.pdf b/docs/team/jessteoxizhi.pdf index b5ae6fd5c8c11fe2244bb82bb3fae56561f7854f..ee7c779e6e871e49961faed50a916f02d19cae41 100644 GIT binary patch delta 3464 zcmb_eYg7|w8a4@mAs8_#5xEJn&0s(5}AnwsY z)GDL`x`J5IQCSs8x4KvbY(=ezP^(gV6hsiWi|$Umv@+>A?vKr!FK6=1`##_Myq7Pt zQ#0e|{24h7JdG>89pj1V5;vZdADl{GapTz*4!ZK##b=j*T}I5Ht8n#kA%cJ)L`U2a z+P=9h+5W11O0H6uJ8j~{wGVO-w!wk$Vp#9f%<@Qxg7K*eOXeL@qI!s&ktG9PnG}< zD#*)AEJ{sFiH+JI7G>>e9*5( z$o5CtVk`feA(1X6#%!&_VxqLQp@GZepiEH(gR}xCf)Qio|;4qhFS_wEmbbu zbZ;PTepuTS?F}o(lc!2!R?WYu{>Qh+|LT`qm0b0?R^GqNam!bZo-x|ewV~Et&Rw!r z`1vgH%d_%%40^v=9%l4KZ>+B5JM$~IFPv44%IpETWl)Z?C}%;D`tm_hkUG8wpnYP? zCWk*yQ?E+Lzf)UYO7=1S%^}!9dc+5-tH{xoFBPowwuv+i{n)lf9O}KI#@tkiebd+m zf3Mn|sT4QlooXNV<7rbxwtW49+=3lI@j(d9joV@Lsl&8zd1^eb_8>8&e%>yr)2JpW zZM%RQI&r&c=GpbK;T!GK64iC>!o<9Y3hSYqCrYG?-=_2L6Cms2gYyDQ&mTK`m0SriL>qmD6DEh!+t)mZGPoZZjxFt`t43L z_ol22$x5}b>G8~_D=zH!4s+L@jbX-``YA7xjyc(!6WyPGtZ99{O?S?&dQo>i)3YJN zBt#d!spHwG;(|$ki&e&SuN?Cz+bp94jVBTY*DN=muB#p}%`&!*5=?2Hs;W1|b@YHm zmN=rv`bB4LcK5OK;!|Je-QPQGJ37T`Gk&XN)b5ndyk3x0=Luotk=%!*kuGGHB*ck0S9@S_l46hI z3--!a)G3k_;fnZRG2IvlIIDijZE)fBH546|9qOx+9a`2^uzkQNq3r0TYT41gs+yWh)j;i~ zx=en@)RJ+F#I-A>_d}}-DvK+bNBsq9Lq73GfZE@98Vd^x&2@Xi-R^RmV{PT(pE}*5 zT|}-T*YYF1iJ27#76-D#;kzc#*+GC6UzWPwZW?Gh7~zb|@z^Dv$+nl9Or{BXI*l7y>zI zg(wi>HWv)x5Vsdt4C4xcAqs^k)!4ejY?-*Jh7k-M+cY2uV>p3vf`KtsGN+s{Mv)}f zj$|3%Wm@%i>|hFlNRDCzLnv<3u(2TADPh?V178BCP)?Z;5`}OM#^gi-_jm%Fg6O!F zKr|nPnbws+F;75H7#;o@u#JzB%!AK>*?c|-G13^oi^s=MCS)~GXT%2y#&|7ohJA$5 zrNO{t`iJ#E10STAZ3#duPXOTvJ-7i#=R+v7E)kf^6R-`+97zIPczhV9JC#6`03i@& zPBIY3A_QHT0vs2h1j&S?0wMt)f$8XUV50yd5&Fk;;0Yf=nbu8uW}GBxcrzO=LeaZ7 z1N+%%VH(c_zUHBHR5~!38O;O`fqP3`Jm^dv2fz z0zvOe_O@auiNXjcn=FQ-oM~e*wg+DC`^RC2k{HY#OBTc48vcGLq7*v{oc_^c+!jD7 z801bRiy`0`ajbp})*mKgv%q2o6Q~c58sn_@B?*)hj28yA?if&Hmh!QC1o*t&~FPELv?e*XpO!x-lP delta 3477 zcmb_fc~nzZ9wrIPD;P@@L699pR(<#F4-t@>`ZfSRc3@ zX^Y~B2-KR077I8oqo_DKTE_*nEl68R>!66r%%#|lyv#Z6ACr6TdG~$iw{P#}s{+@Z zg|32hTjeXjiferYa0}rU!ELOo^)bnBG{FD^P!7Fs;xKkBj<|0Ex2Z1T zz8R`8!~6l`4+*x)5d7Ddb{VqWogx@gPT+(eJy(kP5ezH$3z11lKR{q1EGwsp5ZOE~ zTaI}DE=t`wIr2Fo!wESQOA%6xp3B1HsKmDg1_t~l#R_Mxb+Krg8sLBk3>2GZsWMX% zm16UpedO(po32IMU-96d>Gi=K%uj@_I z`#gN?S2x@)xtnnA&LykUw-i;Tk!3LeeW2Js@nzSU&QwQx^lm?O_shZ~n@c;ZsVG~A z%jHYfl}zKcI|Jw5EPsSCx@mAAX>(7U&B>C&l_cEdf{SskNDB8Z)%v&3;4QnvdMO zK{{CnyZ9Dx;-Dr^HM1^s)nItArLa0o)OOILKx%w5Z#c}RFIcHJ>TCV3tLbpWtELyI zgycLcM*x=IBA2IPvY^ zbqglOOLHyM;>}&Ly=I%cP4$k$?ZFH31nCX|X4l#hF0TK!W_a*WTYI|OghH3}$rJJ= zJIvd=Q}t7BbXn`g^49OsN&Omt+TG}0GS$L%$2*UmE&B6LCkEUzd;Z1esKBFjp5Do$ z-73e(v7oriHpk9Ut-a6{UTM0$U3Ia@zETj{I(fkTN~fp}HSc!24PDv)wLa*w|IpMx?cjjd+B~(mK@wOzX-L>o(9vLW zvTf;rGJWvx$6oh6{Nna^34^K1{1s`*dz?;*PPRWEaCl`jJCS~c1hrlpu-Mh+c*o-G z>A{~~Z+O|YltIq6ZefgyyWV9csM|gWGo9a6xxDt=ES1$r(c`cuMf;vfN3@gE%}4Up z-R}E}GHW$>y7kr8T&gyy=cwBsvZHbRa24~xH(>|=`l!dx)pw__tFLQabK0;XX#ay! zY@0P)$hNp`4@yszUiY@+wnri!>LkqxZ|mL@B}Y7KdJlQlOuAoWH6*Uy_0e9}O4mbu zPvmKXZl?vete;y}vw8(H?DiujX%IXBT~{?MV*b*pVr1e(4gh$jjy@O^8_6v0+Ry4J0QF-I+vW#aQQw}I+9q(ormpy4bUlxD<(u(t58>g3- zT+y%%lTJ2r#%E@5lr+Ey(!dyo0>FTdriiyOHT0Qg zSi-+tF7_a)5yaSSjUwfWFipB}PK#Ha*UVQ)>pe&z`1{lqY45TA@kx`=% zq;X!TA;zKx0x>}F!V0MXzql|!0e&q&jO06l0hXXJ^>~jl95VLv#$51cIFB*v9{4T*snlRv{DVE`-31@ko-8A$9xWk#d2E!5Pjs0Vx%-K&MYYW(tJ_q3caT0tG^r)_Eo) z^~ORH)!k7br-UMa0&dqDEst6pT z`SXInaX|f&syCS;U=(Ry6d^`2ye@;6RTLl7@!uf_L0DnqYi{&b`-bq>VMwrmCV6!; zit$rVurSbkW1w^7IOpJygOMe0o+l79=sXgGBV-)&C@(`ZJYyin0A72KV*i7eMd$DZ z5^$pNh8*lq*i+*p12GEVoTV1=kNwTd{qMQ{k6ro`GgUd6DXC&}*w^r{0QZR&nYZcx nB7as`W=gj6nAlm%B2rQ#RZ93es)nzcq)8lz&8JV7h06Z}?mZ;6