Revert "Change of TestTextFormatter to make duration more visible"

This reverts commit de35b5c.
unclebob · Apr 14, 2015 · 085256d · 085256d
1 parent 6dc733d
commit 085256d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/fitnesse/reporting/TestTextFormatter.java b/src/fitnesse/reporting/TestTextFormatter.java
@@ -24,8 +24,7 @@ public TestTextFormatter(ChunkedResponse response) {
 
   @Override
   public void testSystemStarted(TestSystem testSystem) {
-	String timeString = new SimpleDateFormat("yyyy-mm-dd HH:mm:ss").format(totalTimeMeasurement.startedAtDate());
-    response.add(String.format("\nStarting Test System at %s: %s.\n", timeString, testSystem.getName()));
+    response.add(String.format("\nStarting Test System: %s.\n", testSystem.getName()));
   }
 
   @Override
@@ -41,8 +40,9 @@ public void testOutputChunk(String output) {
   public void testComplete(WikiTestPage page, TestSummary summary) throws IOException {
     timeMeasurement.stop();
     updateCounters(summary);
-    response.add(String.format("%s %.03f sec R:%-4d W:%-4d I:%-4d E:%-4d %s\t(%s)\n",
-      passFail(summary),  timeMeasurement.elapsedSeconds(), summary.getRight(), summary.getWrong(), summary.getIgnores(), summary.getExceptions(), page.getName(), page.getFullPath() ));
+    String timeString = new SimpleDateFormat("HH:mm:ss").format(timeMeasurement.startedAtDate());
+    response.add(String.format("%s %s R:%-4d W:%-4d I:%-4d E:%-4d %s\t(%s)\t%.03f seconds\n",
+      passFail(summary), timeString, summary.getRight(), summary.getWrong(), summary.getIgnores(), summary.getExceptions(), page.getName(), page.getFullPath(), timeMeasurement.elapsedSeconds()));
   }
 
   private void updateCounters(TestSummary summary) {

diff --git a/test/fitnesse/reporting/TestTextFormatterTest.java b/test/fitnesse/reporting/TestTextFormatterTest.java
@@ -46,7 +46,7 @@ public void testCompleteShouldAddPageAndSummaryAndTimingToResponse() throws Exce
     clock.elapse(9800);
     formatter.testComplete(page, summary);
     formatter.close();
-    verify(response).add("F 9" + getDecimalSeparator() + "800 sec R:1    W:2    I:3    E:4    page\t()\n");
+    verify(response).add("F " + START_TIME + " R:1    W:2    I:3    E:4    page\t()\t9" + getDecimalSeparator() + "800 seconds\n");
   }
 
   @Test