Removed unnecessary edit command Test.

Improve toString method of Activity for feedback
CS2103AUG2016-W14-C2 · Nov 6, 2016 · 88d4cdf · 88d4cdf
1 parent 1d89ab0
commit 88d4cdf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 35 deletions.
diff --git a/.classpath b/.classpath
@@ -27,14 +27,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="/Users/lowjiansheng/Documents/Menion/src/main/resources/dependencies/slf4j-log4j12-1.7.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="/Users/lowjiansheng/Documents/Menion/src/main/resources/dependencies/slf4j-api-1.7.21.jar"/>
-	<classpathentry exported="true" kind="lib" path="/Users/lowjiansheng/Documents/Menion/src/main/resources/dependencies/slf4j-api-1.7.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="/Users/lowjiansheng/Documents/Menion/src/main/resources/dependencies/natty-0.12.jar"/>
-	<classpathentry exported="true" kind="lib" path="/Users/lowjiansheng/Documents/Menion/src/main/resources/dependencies/log4j-1.2.17.jar"/>
-	<classpathentry exported="true" kind="lib" path="/Users/lowjiansheng/Documents/Menion/src/main/resources/dependencies/javax.mail.jar"/>
-	<classpathentry exported="true" kind="lib" path="/Users/lowjiansheng/Documents/Menion/src/main/resources/dependencies/gunit-3.5.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="/Users/lowjiansheng/Documents/Menion/src/main/resources/dependencies/antlr-runtime-3.5.2.jar"/>
-
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/src/main/java/seedu/menion/model/activity/ReadOnlyActivity.java b/src/main/java/seedu/menion/model/activity/ReadOnlyActivity.java
@@ -131,7 +131,7 @@ default String getTaskAsText() {
                 .append("\nDeadline: ")
                 .append(getActivityStartDate().toFormattedDateString());
         if (!getActivityStartTime().toString().equals(ActivityTime.INFERRED_TIME)){
-        	builder.append("\nat:")
+        	builder.append(", ")
         			.append(getActivityStartTime());
         }
         if (getNote().toString() != null){
@@ -152,19 +152,19 @@ default String getEventAsText() {
         final StringBuilder builder = new StringBuilder();
 
         builder.append(getActivityName())
-        		.append(" Starting at: ")
+        		.append("\nStarting from: ")
         		.append(getActivityStartDate().toFormattedDateString());
 
         if (!getActivityStartTime().toString().equals(ActivityTime.INFERRED_TIME)){
-        	builder.append("\nat: ")
+        	builder.append(", ")
 			.append(getActivityStartTime());
         }
 
         builder.append("\nEnding at: ")
         		.append(getActivityEndDate().toFormattedDateString());
 
         if (!getActivityStartTime().toString().equals(ActivityTime.INFERRED_TIME)){
-        	builder.append("\nat: ")
+        	builder.append(",  ")
 			.append(getActivityEndTime());
         }
 

diff --git a/src/test/java/guitests/EditCommandTest.java b/src/test/java/guitests/EditCommandTest.java
@@ -39,29 +39,7 @@ public void Edit() {
         assertFloatingEditNoteSuccess(floating, 1, "Floating Hello Note");
         assertTaskEditNoteSuccess(task, 1, "Task Hello Note");
         assertEventEditNoteSuccess(event, 1, "Event Hello Note");
-
-        /**
-         * Editting for single parameters no longer works due to natty.
-         * I.e editting time/date alone does not work.
-        // Edit Date - For Task
-        assertTaskEditDateTimeSuccess(task, 1, "30-11-1994");
-        
-        // Edit Time - For Task
-        assertTaskEditDateTimeSuccess(task, 1, "2359");
-        
-        // Edit From Date - For Event
-        assertEventEditFromDateTimeSuccess(event, 1, "30-11-1994");
-       
-        // Edit From Time - For Event
-        assertEventEditFromDateTimeSuccess(event, 1, "2359");
-        
-        // Edit To Date - For Event
-        assertEventEditToDateTimeSuccess(event, 1, "20-02-2016");
-        
-        // Edit to Time - For Event. 
-        assertEventEditToDateTimeSuccess(event, 1, "1200");
 
-        */
 
         // Edit Both, Date/Time - For Task
         assertTaskEditBothDateTimeSuccess(task, 1, "10-10-2016 1000");