diff --git a/src/fitnesse/reporting/TestTextFormatter.java b/src/fitnesse/reporting/TestTextFormatter.java index dfb142a1c0..17a491eed4 100644 --- a/src/fitnesse/reporting/TestTextFormatter.java +++ b/src/fitnesse/reporting/TestTextFormatter.java @@ -24,7 +24,8 @@ public TestTextFormatter(ChunkedResponse response) { @Override public void testSystemStarted(TestSystem testSystem) { - response.add(String.format("\nStarting Test System: %s.\n", testSystem.getName())); + 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())); } @Override @@ -40,9 +41,8 @@ public void testOutputChunk(String output) { public void testComplete(WikiTestPage page, TestSummary summary) throws IOException { timeMeasurement.stop(); updateCounters(summary); - 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())); + 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() )); } private void updateCounters(TestSummary summary) { diff --git a/test/fitnesse/reporting/TestTextFormatterTest.java b/test/fitnesse/reporting/TestTextFormatterTest.java index 464c1bf769..63e40b2414 100644 --- 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 " + START_TIME + " R:1 W:2 I:3 E:4 page\t()\t9" + getDecimalSeparator() + "800 seconds\n"); + verify(response).add("F 9" + getDecimalSeparator() + "800 sec R:1 W:2 I:3 E:4 page\t()\n"); } @Test