From 7438b53487cb21f261eac4396aba0dbaa16ee015 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Mon, 13 Sep 2010 14:25:21 +0100 Subject: [PATCH] Update DumpRenderTree2 text results output to better match HTML version Always print number of crashes and line things up nicely. Change-Id: I79a72056ba5ce007fdd4154f1518b9535b595317 --- .../com/android/dumprendertree2/Summarizer.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java index 0efb78eaad621..b61e1456dd4b1 100644 --- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java +++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/Summarizer.java @@ -265,15 +265,12 @@ public class Summarizer { txt.append("WebKit version: " + getWebKitVersionFromUserAgentString() + "\n"); txt.append("WebKit revision: " + getWebKitRevision() + "\n"); - txt.append("TOTAL: " + getTotalTestCount() + "\n"); - if (mCrashedTestsCount > 0) { - txt.append("CRASHED (total among all tests): " + mCrashedTestsCount + "\n"); - txt.append("-------------"); - } - txt.append("UNEXPECTED FAILURES: " + mUnexpectedFailures.size() + "\n"); - txt.append("UNEXPECTED PASSES: " + mUnexpectedPasses.size() + "\n"); - txt.append("EXPECTED FAILURES: " + mExpectedFailures.size() + "\n"); - txt.append("EXPECTED PASSES: " + mExpectedPasses.size() + "\n"); + txt.append("TOTAL: " + getTotalTestCount() + "\n"); + txt.append("CRASHED (among all tests): " + mCrashedTestsCount + "\n"); + txt.append("UNEXPECTED FAILURES: " + mUnexpectedFailures.size() + "\n"); + txt.append("UNEXPECTED PASSES: " + mUnexpectedPasses.size() + "\n"); + txt.append("EXPECTED FAILURES: " + mExpectedFailures.size() + "\n"); + txt.append("EXPECTED PASSES: " + mExpectedPasses.size() + "\n"); FsUtils.writeDataToStorage(new File(mResultsRootDirPath, TXT_SUMMARY_RELATIVE_PATH), txt.toString().getBytes(), false); @@ -355,7 +352,7 @@ public class Summarizer { html.append(""); createSummaryTableRow(html, "TOTAL", getTotalTestCount()); - createSummaryTableRow(html, "CRASHED", mCrashedTestsCount); + createSummaryTableRow(html, "CRASHED (among all tests)", mCrashedTestsCount); createSummaryTableRow(html, "UNEXPECTED FAILURES", mUnexpectedFailures.size()); createSummaryTableRow(html, "UNEXPECTED PASSES", mUnexpectedPasses.size()); createSummaryTableRow(html, "EXPECTED FAILURES", mExpectedFailures.size());