Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing nunit inconclusive tests reported as failure #533

Merged
merged 3 commits into from
Feb 22, 2017
Merged

Fixing nunit inconclusive tests reported as failure #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9984117
Fixing up the mappings of NotRun tests in trx logger and printing it …
AbhitejJohn Feb 22, 2017
65a6b1c
Unrelated issue to this change but this is failing build.
AbhitejJohn Feb 22, 2017
a0fa12a
Merge branch 'master' into nunittrxfixport
AbhitejJohn Feb 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/Converter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,9 @@ internal static TrxObjectModel.TestOutcome ToOutcome(ObjectModel.TestOutcome roc
outcome = TrxObjectModel.TestOutcome.Passed;
break;
case ObjectModel.TestOutcome.Skipped:
outcome = TrxObjectModel.TestOutcome.NotExecuted;
break;
case ObjectModel.TestOutcome.None:
outcome = TrxObjectModel.TestOutcome.Failed;
break;
case ObjectModel.TestOutcome.NotFound:
outcome = TrxObjectModel.TestOutcome.Failed;
outcome = TrxObjectModel.TestOutcome.NotExecuted;
break;
default:
Debug.Fail("Unexpected Outcome.");
Expand Down
6 changes: 6 additions & 0 deletions src/vstest.console/Internal/ConsoleLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,12 @@ private void TestResultHandler(object sender, TestResultEventArgs e)
}
this.testsPassed++;
}
else
{
string output = string.Format(CultureInfo.CurrentCulture, CommandLineResources.NotRunTestIndicator, name);
Output.WriteLine(output, OutputLevel.Information);
DisplayFullInformation(e.Result);
}
}

/// <summary>
Expand Down
11 changes: 11 additions & 0 deletions src/vstest.console/Resources/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/vstest.console/Resources/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,4 +637,7 @@
<data name="InIsolationDeprecated" xml:space="preserve">
<value>The /InIsolation flag is deprecated. The tests are always run in a separate process</value>
</data>
<data name="NotRunTestIndicator" xml:space="preserve">
<value>Not Run {0}</value>
</data>
</root>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,6 +1519,11 @@
<target state="new">The /InIsolation flag is deprecated. The tests are always run in a separate process</target>
<note></note>
</trans-unit>
<trans-unit id="NotRunTestIndicator">
<source>Not Run {0}</source>
<target state="new">Not Run {0}</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,6 +1519,11 @@ Standardeinstellungen werden verwendet, wenn die Verwendung der Einstellungsdate
<target state="new">The /InIsolation flag is deprecated. The tests are always run in a separate process</target>
<note></note>
</trans-unit>
<trans-unit id="NotRunTestIndicator">
<source>Not Run {0}</source>
<target state="new">Not Run {0}</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1531,6 +1531,11 @@
<target state="new">The /InIsolation flag is deprecated. The tests are always run in a separate process</target>
<note></note>
</trans-unit>
<trans-unit id="NotRunTestIndicator">
<source>Not Run {0}</source>
<target state="new">Not Run {0}</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,6 +1519,11 @@
<target state="new">The /InIsolation flag is deprecated. The tests are always run in a separate process</target>
<note></note>
</trans-unit>
<trans-unit id="NotRunTestIndicator">
<source>Not Run {0}</source>
<target state="new">Not Run {0}</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.it.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,6 +1519,11 @@
<target state="new">The /InIsolation flag is deprecated. The tests are always run in a separate process</target>
<note></note>
</trans-unit>
<trans-unit id="NotRunTestIndicator">
<source>Not Run {0}</source>
<target state="new">Not Run {0}</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.ja.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,6 +1519,11 @@
<target state="new">The /InIsolation flag is deprecated. The tests are always run in a separate process</target>
<note></note>
</trans-unit>
<trans-unit id="NotRunTestIndicator">
<source>Not Run {0}</source>
<target state="new">Not Run {0}</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.ko.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1520,6 +1520,11 @@
<target state="new">The /InIsolation flag is deprecated. The tests are always run in a separate process</target>
<note></note>
</trans-unit>
<trans-unit id="NotRunTestIndicator">
<source>Not Run {0}</source>
<target state="new">Not Run {0}</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.pl.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,6 +1519,11 @@
<target state="new">The /InIsolation flag is deprecated. The tests are always run in a separate process</target>
<note></note>
</trans-unit>
<trans-unit id="NotRunTestIndicator">
<source>Not Run {0}</source>
<target state="new">Not Run {0}</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.pt-BR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,6 +1519,11 @@
<target state="new">The /InIsolation flag is deprecated. The tests are always run in a separate process</target>
<note></note>
</trans-unit>
<trans-unit id="NotRunTestIndicator">
<source>Not Run {0}</source>
<target state="new">Not Run {0}</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.ru.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,6 +1519,11 @@
<target state="new">The /InIsolation flag is deprecated. The tests are always run in a separate process</target>
<note></note>
</trans-unit>
<trans-unit id="NotRunTestIndicator">
<source>Not Run {0}</source>
<target state="new">Not Run {0}</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.tr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,6 +1519,11 @@
<target state="new">The /InIsolation flag is deprecated. The tests are always run in a separate process</target>
<note></note>
</trans-unit>
<trans-unit id="NotRunTestIndicator">
<source>Not Run {0}</source>
<target state="new">Not Run {0}</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
55 changes: 48 additions & 7 deletions src/vstest.console/Resources/xlf/Resources.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,13 @@
</trans-unit>
<trans-unit id="EnableLoggersArgumentHelp">
<source>--logger|/logger:&lt;Logger Uri/FriendlyName&gt;
Specify a logger for test results. For example, to log results into a
Visual Studio Test Results File (TRX) use /logger:trx [;LogFileName=&lt;Defaults to unique file name&gt;]
Creates file in TestResults directory with given LogFileName.
To publish test results to Team Foundation Server, use TfsPublisher as shown below
Example: /logger:TfsPublisher;
Collection=&lt;team project collection url&gt;;
Specify a logger for test results. For example, to log results into a
Visual Studio Test Results File (TRX) use /logger:trx [;LogFileName=&lt;Defaults to unique file name&gt;]
Creates file in TestResults directory with given LogFileName.

To publish test results to Team Foundation Server, use TfsPublisher as shown below
Example: /logger:TfsPublisher;
Collection=&lt;team project collection url&gt;;
BuildName=&lt;build name&gt;;
TeamProject=&lt;team project name&gt;
[;Platform=&lt;Defaults to "Any CPU"&gt;]
Expand Down Expand Up @@ -636,6 +636,47 @@
<target state="new">Timeout to connect or process request for DesignModeClient on port: {0}</target>
<note></note>
</trans-unit>
<trans-unit id="NotRunTestIndicator">
<source>Not Run {0}</source>
<target state="new">Not Run {0}</target>
<note></note>
</trans-unit>
<trans-unit id="CLIRunSettingsArgumentHelp">
<source>Args:
Any extra arguments that should be passed to adapter. Arguments may be specified as name-value pair of the form &lt;n&gt;=&lt;v&gt;, where &lt;n&gt; is the argument name, and &lt;v&gt; is the argument value. Use a space to separate multiple arguments.</source>
<target state="new">Args:
Any extra arguments that should be passed to adapter. Arguments may be specified as name-value pair of the form &lt;n&gt;=&lt;v&gt;, where &lt;n&gt; is the argument name, and &lt;v&gt; is the argument value. Use a space to separate multiple arguments.</target>
<note></note>
</trans-unit>
<trans-unit id="MalformedRunSettingsKey">
<source>One or more runsettings provided contain invalid token</source>
<target state="new">One or more runsettings provided contain invalid token</target>
<note></note>
</trans-unit>
<trans-unit id="ResultsDirectoryArgumentHelp">
<source>--ResultsDirectory|/ResultsDirectory
Test results directory will be created in specified path if not exists.
Example /ResultsDirectory:&lt;pathToResultsDirectory&gt;</source>
<target state="new">--ResultsDirectory|/ResultsDirectory
Test results directory will be created in specified path if not exists.
Example /ResultsDirectory:&lt;pathToResultsDirectory&gt;</target>
<note></note>
</trans-unit>
<trans-unit id="ResultsDirectoryValueRequired">
<source>The /ResultsDirectory parameter requires a value, where the test results should be saved. Example: /ResultsDirectory:c:\MyTestResultsDirectory</source>
<target state="new">The /ResultsDirectory parameter requires a value, where the test results should be saved. Example: /ResultsDirectory:c:\MyTestResultsDirectory</target>
<note></note>
</trans-unit>
<trans-unit id="InvalidResultsDirectoryPathCommand">
<source>The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</source>
<target state="new">The path '{0}' specified in the 'ResultsDirectory' is invalid. Error: {1}</target>
<note></note>
</trans-unit>
<trans-unit id="InIsolationDeprecated">
<source>The /InIsolation flag is deprecated. The tests are always run in a separate process</source>
<target state="new">The /InIsolation flag is deprecated. The tests are always run in a separate process</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,6 +1519,11 @@
<target state="new">The /InIsolation flag is deprecated. The tests are always run in a separate process</target>
<note></note>
</trans-unit>
<trans-unit id="NotRunTestIndicator">
<source>Not Run {0}</source>
<target state="new">Not Run {0}</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
5 changes: 5 additions & 0 deletions src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,6 +1519,11 @@
<target state="new">The /InIsolation flag is deprecated. The tests are always run in a separate process</target>
<note></note>
</trans-unit>
<trans-unit id="NotRunTestIndicator">
<source>Not Run {0}</source>
<target state="new">Not Run {0}</target>
<note></note>
</trans-unit>
</body>
</file>
</xliff>
1 change: 1 addition & 0 deletions test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/TrxLoggerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ namespace Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests
using ObjectModel = Microsoft.VisualStudio.TestPlatform.ObjectModel;
using TrxLoggerObjectModel = Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel;
using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource;
using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;

[TestClass]
public class TrxLoggerTests
Expand Down
45 changes: 45 additions & 0 deletions test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Utility/ConverterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

namespace Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.Utility
{
using Microsoft.TestPlatform.Extensions.TrxLogger.Utility;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using Microsoft.VisualStudio.TestTools.UnitTesting;

using TrxLoggerOutcome = Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel.TestOutcome;

[TestClass]
public class ConverterTests
{
[TestMethod]
public void ToOutcomeShouldMapFailedToFailed()
{
Assert.AreEqual(TrxLoggerOutcome.Failed, Converter.ToOutcome(TestOutcome.Failed));
}

[TestMethod]
public void ToOutcomeShouldMapPassedToPassed()
{
Assert.AreEqual(TrxLoggerOutcome.Passed, Converter.ToOutcome(TestOutcome.Passed));
}

[TestMethod]
public void ToOutcomeShouldMapSkippedToNotExecuted()
{
Assert.AreEqual(TrxLoggerOutcome.NotExecuted, Converter.ToOutcome(TestOutcome.Skipped));
}

[TestMethod]
public void ToOutcomeShouldMapNoneToNotExecuted()
{
Assert.AreEqual(TrxLoggerOutcome.NotExecuted, Converter.ToOutcome(TestOutcome.None));
}

[TestMethod]
public void ToOutcomeShouldMapNotFoundToNotExecuted()
{
Assert.AreEqual(TrxLoggerOutcome.NotExecuted, Converter.ToOutcome(TestOutcome.NotFound));
}
}
}
12 changes: 4 additions & 8 deletions test/vstest.console.UnitTests/Internal/ConsoleLoggerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,8 @@ public void TestResultHandlerShouldWriteToConsoleIfTestResultEventsAreRaised()

this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.PassedTestIndicator, "TestName"), OutputLevel.Information), Times.Once());
this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.FailedTestIndicator, "TestName"), OutputLevel.Information), Times.Once());
this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.SkippedTestIndicator, "TestName"), OutputLevel.Information), Times.Once());
this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.SkippedTestIndicator, "TestName"), OutputLevel.Information), Times.Once());
this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.SkippedTestIndicator, "TestName"), OutputLevel.Information), Times.Once());
this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.SkippedTestIndicator, "TestName"), OutputLevel.Information), Times.Once());
this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.PassedTestIndicator, "TestName"), OutputLevel.Information), Times.Once());
this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.NotRunTestIndicator, "TestName"), OutputLevel.Information), Times.Exactly(2));
}

[TestMethod]
Expand All @@ -176,11 +174,9 @@ public void TestResultHandlerShouldWriteToConsoleButSkipPassedTestsForMinimalVer
this.testRunRequest.Raise(m => m.OnRunStatsChange += null, eventArgs);
this.FlushLoggerMessages();

this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.PassedTestIndicator, "TestName"), OutputLevel.Information), Times.Once());
this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.FailedTestIndicator, "TestName"), OutputLevel.Information), Times.Once());
this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.SkippedTestIndicator, "TestName"), OutputLevel.Information), Times.Once());
this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.SkippedTestIndicator, "TestName"), OutputLevel.Information), Times.Once());
this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.SkippedTestIndicator, "TestName"), OutputLevel.Information), Times.Once());
this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.SkippedTestIndicator, "TestName"), OutputLevel.Information), Times.Once());
this.mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.NotRunTestIndicator, "TestName"), OutputLevel.Information), Times.Exactly(2));
}

[TestMethod]
Expand Down