Show total test = unknown if tests is aborted or canceled (#990)

* Show total test = unknown if tests is aborted or canceled * Fix tests
microsoft · Aug 14, 2017 · 069e859 · 069e859
1 parent 123adc3
commit 069e859
Show file tree

Hide file tree

Showing 19 changed files with 127 additions and 4 deletions.
diff --git a/src/vstest.console/Internal/ConsoleLogger.cs b/src/vstest.console/Internal/ConsoleLogger.cs
@@ -410,7 +410,18 @@ private void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e)
  // Output a summary.
  if (this.testsTotal > 0)
  {
- Output.Information(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary, testsTotal, testsPassed, testsFailed, testsSkipped));
+ string testCountDetails;
+
+ if(e.IsAborted || e.IsCanceled)
+ {
+ testCountDetails = string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryForCanceledOrAbortedRun, testsPassed, testsFailed, testsSkipped);
+ }
+ else
+ {
+ testCountDetails = string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary, testsTotal, testsPassed, testsFailed, testsSkipped);
+ }
+
+ Output.Information(testCountDetails);
 
  if (e.IsCanceled)
  {

diff --git a/src/vstest.console/Resources/Resources.Designer.cs b/src/vstest.console/Resources/Resources.Designer.cs
diff --git a/src/vstest.console/Resources/Resources.resx b/src/vstest.console/Resources/Resources.resx
@@ -672,4 +672,7 @@
  <data name="TestRunCanceled" xml:space="preserve">
  <value>Test Run Canceled.</value>
  </data>
+ <data name="TestRunSummaryForCanceledOrAbortedRun" xml:space="preserve">
+ <value>Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</value>
+ </data>
 </root>
diff --git a/src/vstest.console/Resources/xlf/Resources.cs.xlf b/src/vstest.console/Resources/xlf/Resources.cs.xlf
@@ -1581,6 +1581,11 @@
  Read response file for more options.</target>
  <note></note>
  </trans-unit>
+ <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+ <source>Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</source>
+ <target state="new">Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/vstest.console/Resources/xlf/Resources.de.xlf b/src/vstest.console/Resources/xlf/Resources.de.xlf
@@ -1581,6 +1581,11 @@
  Read response file for more options.</target>
  <note></note>
  </trans-unit>
+ <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+ <source>Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</source>
+ <target state="new">Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/vstest.console/Resources/xlf/Resources.es.xlf b/src/vstest.console/Resources/xlf/Resources.es.xlf
@@ -1589,6 +1589,11 @@
  Read response file for more options.</target>
  <note></note>
  </trans-unit>
+ <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+ <source>Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</source>
+ <target state="new">Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/vstest.console/Resources/xlf/Resources.fr.xlf b/src/vstest.console/Resources/xlf/Resources.fr.xlf
@@ -1581,6 +1581,11 @@
  Read response file for more options.</target>
  <note></note>
  </trans-unit>
+ <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+ <source>Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</source>
+ <target state="new">Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/vstest.console/Resources/xlf/Resources.it.xlf b/src/vstest.console/Resources/xlf/Resources.it.xlf
@@ -1581,6 +1581,11 @@
  Read response file for more options.</target>
  <note></note>
  </trans-unit>
+ <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+ <source>Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</source>
+ <target state="new">Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/vstest.console/Resources/xlf/Resources.ja.xlf b/src/vstest.console/Resources/xlf/Resources.ja.xlf
@@ -1581,6 +1581,11 @@
  Read response file for more options.</target>
  <note></note>
  </trans-unit>
+ <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+ <source>Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</source>
+ <target state="new">Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/vstest.console/Resources/xlf/Resources.ko.xlf b/src/vstest.console/Resources/xlf/Resources.ko.xlf
@@ -1581,6 +1581,11 @@
  Read response file for more options.</target>
  <note></note>
  </trans-unit>
+ <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+ <source>Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</source>
+ <target state="new">Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/vstest.console/Resources/xlf/Resources.pl.xlf b/src/vstest.console/Resources/xlf/Resources.pl.xlf
@@ -1581,6 +1581,11 @@
  Read response file for more options.</target>
  <note></note>
  </trans-unit>
+ <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+ <source>Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</source>
+ <target state="new">Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf b/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf
@@ -1580,6 +1580,11 @@
  Read response file for more options.</target>
  <note></note>
  </trans-unit>
+ <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+ <source>Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</source>
+ <target state="new">Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/vstest.console/Resources/xlf/Resources.ru.xlf b/src/vstest.console/Resources/xlf/Resources.ru.xlf
@@ -1582,6 +1582,11 @@
  Read response file for more options.</target>
  <note></note>
  </trans-unit>
+ <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+ <source>Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</source>
+ <target state="new">Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/vstest.console/Resources/xlf/Resources.tr.xlf b/src/vstest.console/Resources/xlf/Resources.tr.xlf
@@ -1581,6 +1581,11 @@
  Read response file for more options.</target>
  <note></note>
  </trans-unit>
+ <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+ <source>Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</source>
+ <target state="new">Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/vstest.console/Resources/xlf/Resources.xlf b/src/vstest.console/Resources/xlf/Resources.xlf
@@ -729,6 +729,11 @@
  Read response file for more options.</target>
  <note></note>
  </trans-unit>
+ <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+ <source>Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</source>
+ <target state="new">Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf b/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf
@@ -1580,6 +1580,11 @@
  Read response file for more options.</target>
  <note></note>
  </trans-unit>
+ <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+ <source>Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</source>
+ <target state="new">Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf b/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf
@@ -1581,6 +1581,11 @@
  Read response file for more options.</target>
  <note></note>
  </trans-unit>
+ <trans-unit id="TestRunSummaryForCanceledOrAbortedRun">
+ <source>Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</source>
+ <target state="new">Total tests: Unknown. Passed: {0}. Failed: {1}. Skipped: {2}.</target>
+ <note></note>
+ </trans-unit>
  </body>
  </file>
 </xliff>
diff --git a/...tform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj b/...tform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj
@@ -23,7 +23,7 @@
  <ProjectReference Include="..\..\src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj">
  <FromP2P>true</FromP2P>
  </ProjectReference>
- <ProjectReference Include="..\..\src\Microsoft.TestPlatform.PlatformAbstractions\Microsoft.TestPlatform.PlatformAbstractions.csproj"/>
+ <ProjectReference Include="..\..\src\Microsoft.TestPlatform.PlatformAbstractions\Microsoft.TestPlatform.PlatformAbstractions.csproj" />
  </ItemGroup>
  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
  <Reference Include="System.Runtime" />

diff --git a/test/vstest.console.UnitTests/Internal/ConsoleLoggerTests.cs b/test/vstest.console.UnitTests/Internal/ConsoleLoggerTests.cs
@@ -452,10 +452,38 @@ public void TestRunCompleteHandlerShouldWriteToConsoleIfTestsCanceled()
  // Raise an event on mock object
  this.testRunRequest.Raise(m => m.OnRunCompletion += null, new TestRunCompleteEventArgs(null, true, false, null, null, new TimeSpan(1, 0, 0, 0)));
 
- this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary, 1, 0, 1, 0), OutputLevel.Information), Times.Once());
+ this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryForCanceledOrAbortedRun, 0, 1, 0), OutputLevel.Information), Times.Once());
+ this.mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunCanceled, OutputLevel.Error), Times.Once());
+ }
+
+ [TestMethod]
+ public void TestRunCompleteHandlerShouldNotWriteTolatTestToConsoleIfTestsCanceled()
+ {
+ // Raise an event on mock object raised to register test case count and mark Outcome as Outcome.Failed
+ var eventArgs = new TestRunChangedEventArgs(null, this.GetTestResultObject(TestOutcome.Failed), null);
+ this.testRunRequest.Raise(m => m.OnRunStatsChange += null, eventArgs);
+
+ // Raise an event on mock object
+ this.testRunRequest.Raise(m => m.OnRunCompletion += null, new TestRunCompleteEventArgs(null, true, false, null, null, new TimeSpan(1, 0, 0, 0)));
+
+ this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryForCanceledOrAbortedRun, 0, 1, 0), OutputLevel.Information), Times.Once());
  this.mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunCanceled, OutputLevel.Error), Times.Once());
  }
 
+ [TestMethod]
+ public void TestRunCompleteHandlerShouldNotWriteTolatTestToConsoleIfTestsAborted()
+ {
+ // Raise an event on mock object raised to register test case count and mark Outcome as Outcome.Failed
+ var eventArgs = new TestRunChangedEventArgs(null, this.GetTestResultObject(TestOutcome.Failed), null);
+ this.testRunRequest.Raise(m => m.OnRunStatsChange += null, eventArgs);
+
+ // Raise an event on mock object
+ this.testRunRequest.Raise(m => m.OnRunCompletion += null, new TestRunCompleteEventArgs(null, false, true, null, null, new TimeSpan(1, 0, 0, 0)));
+
+ this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryForCanceledOrAbortedRun, 0, 1, 0), OutputLevel.Information), Times.Once());
+ this.mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunAborted, OutputLevel.Error), Times.Once());
+ }
+
  [TestMethod]
  public void TestRunCompleteHandlerShouldWriteToConsoleIfTestsAborted()
  {
@@ -466,7 +494,7 @@ public void TestRunCompleteHandlerShouldWriteToConsoleIfTestsAborted()
  // Raise an event on mock object
  this.testRunRequest.Raise(m => m.OnRunCompletion += null, new TestRunCompleteEventArgs(null, false, true, null, null, new TimeSpan(1, 0, 0, 0)));
 
- this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary, 1, 0, 1, 0), OutputLevel.Information), Times.Once());
+ this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummaryForCanceledOrAbortedRun, 0, 1, 0), OutputLevel.Information), Times.Once());
  this.mockOutput.Verify(o => o.WriteLine(CommandLineResources.TestRunAborted, OutputLevel.Error), Times.Once());
  }