Merge pull request #32 from AY1920S1-CS2113T-F10-1/master

pulling latest changes

src/main/java/planner/ui/cli/PlannerUi.java

@@ -176,7 +176,9 @@ public String readInput(InputStream stream) {
             for (char c = (char) stream.read();
                  c != '\n' && c != '\uFFFF';
                  c = (char) stream.read()) {
-                if (c != '\r') input.append(c);
+                if (c != '\r') {
+                    input.append(c);
+                }
             }
             if (input.length() == 0) {
                 return null;

src/test/java/planner/credential/user/TaskListsTest.java

@@ -1,3 +1,5 @@
+//@@author LongLeCE
+
 package planner.credential.user;
 
 import org.junit.jupiter.api.DisplayName;

src/test/java/planner/logic/command/ClearCommandTest.java → src/test/java/planner/logic/command/ClearTest.java

@@ -14,7 +14,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-public class ClearCommandTest extends CommandTestFramework {
+public class ClearTest extends CommandTest {
 
     private static final TaskList<Cca> emptyCcaList = new TaskList<>();
     private static final TaskList<ModuleTask> emptyModuleList = new TaskList<>();
@@ -34,7 +34,7 @@ public class ClearCommandTest extends CommandTestFramework {
                             + "scheduleCca 1";
     private String inputModule = inputCca;
 
-    ClearCommandTest() throws ModException {
+    ClearTest() throws ModException {
         super();
     }
 

src/test/java/planner/logic/command/CommandTestFramework.java → src/test/java/planner/logic/command/CommandTest.java

@@ -14,7 +14,7 @@
 import java.io.ByteArrayInputStream;
 import java.util.HashMap;
 
-public class CommandTestFramework extends InputTest {
+public class CommandTest extends InputTest {
 
     User user;
     HashMap<String, ModuleInfoDetailed> modDetail;
@@ -24,7 +24,7 @@ public class CommandTestFramework extends InputTest {
     ModuleCommand command;
     Parser parser;
 
-    public CommandTestFramework() throws ModException {
+    public CommandTest() throws ModException {
         init();
     }
 

src/test/java/planner/logic/command/SortCcaTest.java

@@ -26,7 +26,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
-public class SortCcaTest extends CommandTestFramework {
+public class SortCcaTest extends CommandTest {
     private static Storage store;
     private static ModuleTasksList modTasks;
     private static Parser argparser;

src/test/java/planner/logic/command/SortModuleTest.java

@@ -25,7 +25,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class SortModuleTest extends CommandTestFramework {
+public class SortModuleTest extends CommandTest {
     private static Storage store;
     private static ModuleTasksList modTasks;
     private static Parser argparser;

src/test/java/planner/logic/command/SortTimeTest.java

@@ -25,7 +25,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class SortTimeTest extends CommandTestFramework {
+public class SortTimeTest extends CommandTest {
     private static Storage store;
     private static ModuleTasksList modTasks;
     private static Parser argparser;

src/test/java/planner/main/PlannerTest.java

@@ -4,12 +4,12 @@
 
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import planner.logic.command.CommandTestFramework;
+import planner.logic.command.CommandTest;
 import planner.logic.exceptions.legacy.ModException;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class PlannerTest extends CommandTestFramework {
+public class PlannerTest extends CommandTest {
 
     private static final String LINE = "_______________________________";