Skip to content

Commit

Permalink
Merge pull request nunit#1101 from michaelhofer/issue-1044
Browse files Browse the repository at this point in the history 
Re-order Test Summary Errors/Failures
  • Loading branch information
@CharliePoole
CharliePoole committed Dec 4, 2015
2 parents 373dcef + 945a69b commit f23197b
Show file tree
Hide file tree
Showing 7 changed files with 100 additions and 36 deletions.
7 changes: 4 additions & 3 deletions src/NUnitConsole/nunit3-console.tests/ResultReporterTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,10 @@ public void SummaryReportTest()
{
var expected = new string[] {
"Test Run Summary",
" Overall result: Failed",
" Tests run: 35, Passed: 30, Errors: 1, Failures: 3, Inconclusive: 1",
" Not run: 10, Invalid: 3, Ignored: 4, Explicit: 3, Skipped: 0",
" Overall result: Failed",
" Test Count: 45, Passed: 30, Failed: 7, Inconclusive: 1, Skipped: 7",
" Failed Tests - Failures: 3, Errors: 1, Invalid: 3",
" Skipped Tests - Ignored: 4, Explicit: 3, Other: 0",
" Start time: 2015-10-19 02:12:28Z",
" End time: 2015-10-19 02:12:29Z",
" Duration: 0.349 seconds",
Expand Down
30 changes: 20 additions & 10 deletions src/NUnitConsole/nunit3-console/ResultReporter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,21 +114,31 @@ public void WriteSummaryReport()
: ColorStyle.Output;

_writer.WriteLine(ColorStyle.SectionHeader, "Test Run Summary");
_writer.WriteLabelLine(" Overall result: ", _overallResult, overall);
_writer.WriteLabelLine(" Overall result: ", _overallResult, overall);

WriteSummaryCount(" Tests run: ", Summary.RunCount);
WriteSummaryCount(" Test Count: ", Summary.TestCount);
WriteSummaryCount(", Passed: ", Summary.PassCount);
WriteSummaryCount(", Errors: ", Summary.ErrorCount, ColorStyle.Error);
WriteSummaryCount(", Failures: ", Summary.FailureCount, ColorStyle.Failure);
WriteSummaryCount(", Failed: ", Summary.FailedCount, ColorStyle.Failure);
WriteSummaryCount(", Inconclusive: ", Summary.InconclusiveCount);
WriteSummaryCount(", Skipped: ", Summary.TotalSkipCount);
_writer.WriteLine();

WriteSummaryCount(" Not run: ", Summary.NotRunCount);
WriteSummaryCount(", Invalid: ", Summary.InvalidCount, ColorStyle.Error);
WriteSummaryCount(", Ignored: ", Summary.IgnoreCount, ColorStyle.Warning);
WriteSummaryCount(", Explicit: ", Summary.ExplicitCount);
WriteSummaryCount(", Skipped: ", Summary.SkipCount);
_writer.WriteLine();
if (Summary.FailedCount > 0)
{
_writer.Write(" Failed Tests - ");
WriteSummaryCount("Failures: ", Summary.FailureCount);
WriteSummaryCount(", Errors: ", Summary.ErrorCount);
WriteSummaryCount(", Invalid: ", Summary.InvalidCount);
_writer.WriteLine();
}
if (Summary.TotalSkipCount > 0)
{
_writer.Write(" Skipped Tests - ");
WriteSummaryCount("Ignored: ", Summary.IgnoreCount);
WriteSummaryCount(", Explicit: ", Summary.ExplicitCount);
WriteSummaryCount(", Other: ", Summary.SkipCount);
_writer.WriteLine();
}

var duration = _result.GetAttribute("duration", 0.0);
var startTime = _result.GetAttribute("start-time", DateTime.MinValue);
Expand Down
16 changes: 16 additions & 0 deletions src/NUnitConsole/nunit3-console/ResultSummary.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,22 @@ public int NotRunCount
get { return IgnoreCount + ExplicitCount + InvalidCount + SkipCount; }
}

/// <summary>
/// Returns the number of failed test cases (including errors and invalid tests)
/// </summary>
public int FailedCount
{
get { return FailureCount + InvalidCount + ErrorCount; }
}

/// <summary>
/// Returns the sum of skipped test cases, including ignored and explicit tests
/// </summary>
public int TotalSkipCount
{
get { return SkipCount + IgnoreCount + ExplicitCount; }
}

/// <summary>
/// Gets the count of passed tests
/// </summary>
Expand Down
30 changes: 20 additions & 10 deletions src/NUnitFramework/nunitlite.runner/Portable/TextUI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,21 +211,31 @@ public void DisplaySummaryReport(ResultSummary summary)

_writer.WriteLine();
_writer.WriteLine("Test Run Summary");
WriteLabelLine(" Overall result: ", overallResult);
WriteLabelLine(" Overall result: ", overallResult);

WriteSummaryCount(" Tests run: ", summary.RunCount);
WriteSummaryCount(" Test Count: ", summary.TestCount);
WriteSummaryCount(", Passed: ", summary.PassCount);
WriteSummaryCount(", Errors: ", summary.ErrorCount);
WriteSummaryCount(", Failures: ", summary.FailureCount);
WriteSummaryCount(", Failed: ", summary.FailedCount);
WriteSummaryCount(", Inconclusive: ", summary.InconclusiveCount);
WriteSummaryCount(", Skipped: ", summary.TotalSkipCount);
_writer.WriteLine();

WriteSummaryCount(" Not run: ", summary.NotRunCount);
WriteSummaryCount(", Invalid: ", summary.InvalidCount);
WriteSummaryCount(", Ignored: ", summary.IgnoreCount);
WriteSummaryCount(", Explicit: ", summary.ExplicitCount);
WriteSummaryCount(", Skipped: ", summary.SkipCount);
_writer.WriteLine();
if (summary.FailedCount > 0)
{
_writer.Write(" Failed Tests - ");
WriteSummaryCount("Failures: ", summary.FailureCount);
WriteSummaryCount(", Errors: ", summary.ErrorCount);
WriteSummaryCount(", Invalid: ", summary.InvalidCount);
_writer.WriteLine();
}
if (summary.TotalSkipCount > 0)
{
_writer.Write(" Skipped Tests - ");
WriteSummaryCount("Ignored: ", summary.IgnoreCount);
WriteSummaryCount(", Explicit: ", summary.ExplicitCount);
WriteSummaryCount(", Other: ", summary.SkipCount);
_writer.WriteLine();
}

WriteLabelLine(" Start time: ", summary.StartTime.ToString("u"));
WriteLabelLine(" End time: ", summary.EndTime.ToString("u"));
Expand Down
16 changes: 16 additions & 0 deletions src/NUnitFramework/nunitlite.runner/ResultSummary.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,22 @@ public int NotRunCount
get { return InvalidCount + SkipCount + IgnoreCount + ExplicitCount; }
}

/// <summary>
/// Returns the number of failed test cases (including errors and invalid tests)
/// </summary>
public int FailedCount
{
get { return FailureCount + InvalidCount + ErrorCount; }
}

/// <summary>
/// Returns the sum of skipped test cases, including ignored and explicit tests
/// </summary>
public int TotalSkipCount
{
get { return SkipCount + IgnoreCount + ExplicitCount; }
}

/// <summary>
/// Gets the count of passed tests
/// </summary>
Expand Down
30 changes: 20 additions & 10 deletions src/NUnitFramework/nunitlite.runner/TextUI.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,21 +342,31 @@ public void DisplaySummaryReport(ResultSummary summary)
SkipLine();

WriteSectionHeader("Test Run Summary");
WriteLabelLine(" Overall result: ", overallResult, overallStyle);
WriteLabelLine(" Overall result: ", overallResult, overallStyle);

WriteSummaryCount(" Tests run: ", summary.RunCount);
WriteSummaryCount(" Test Count: ", summary.TestCount);
WriteSummaryCount(", Passed: ", summary.PassCount);
WriteSummaryCount(", Errors: ", summary.ErrorCount, ColorStyle.Error);
WriteSummaryCount(", Failures: ", summary.FailureCount, ColorStyle.Failure);
WriteSummaryCount(", Failed: ", summary.FailedCount);
WriteSummaryCount(", Inconclusive: ", summary.InconclusiveCount);
WriteSummaryCount(", Skipped: ", summary.TotalSkipCount);
_outWriter.WriteLine();

WriteSummaryCount(" Not run: ", summary.NotRunCount);
WriteSummaryCount(", Invalid: ", summary.InvalidCount, ColorStyle.Error);
WriteSummaryCount(", Ignored: ", summary.IgnoreCount, ColorStyle.Warning);
WriteSummaryCount(", Explicit: ", summary.ExplicitCount);
WriteSummaryCount(", Skipped: ", summary.SkipCount);
_outWriter.WriteLine();
if (summary.FailedCount > 0)
{
_outWriter.Write(" Failed Tests - ");
WriteSummaryCount("Failures: ", summary.FailureCount);
WriteSummaryCount(", Errors: ", summary.ErrorCount);
WriteSummaryCount(", Invalid: ", summary.InvalidCount);
_outWriter.WriteLine();
}
if (summary.TotalSkipCount > 0)
{
_outWriter.Write(" Skipped Tests - ");
WriteSummaryCount("Ignored: ", summary.IgnoreCount);
WriteSummaryCount(", Explicit: ", summary.ExplicitCount);
WriteSummaryCount(", Other: ", summary.SkipCount);
_outWriter.WriteLine();
}

WriteLabelLine(" Start time: ", summary.StartTime.ToString("u"));
WriteLabelLine(" End time: ", summary.EndTime.ToString("u"));
Expand Down
7 changes: 4 additions & 3 deletions src/NUnitFramework/nunitlite.tests/TextUITests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,10 @@ public void SummaryReportTest()
{
var expected = new string[] {
"Test Run Summary",
" Overall result: Failed",
" Tests run: 7, Passed: 4, Errors: 1, Failures: 1, Inconclusive: 1",
" Not run: 4, Invalid: 2, Ignored: 1, Explicit: 1, Skipped: 0",
" Overall result: Failed",
" Test Count: 11, Passed: 4, Failed: 4, Inconclusive: 1, Skipped: 2",
" Failed Tests - Failures: 1, Errors: 1, Invalid: 2",
" Skipped Tests - Ignored: 1, Explicit: 1, Other: 0",
" Start time: 2014-12-02 12:34:56Z",
" End time: 2014-12-02 12:34:56Z",
" Duration: 0.123 seconds",
Expand Down

0 comments on commit f23197b

Please sign in to comment.