diff --git a/src/vstest.console/Internal/ConsoleLogger.cs b/src/vstest.console/Internal/ConsoleLogger.cs index 33ca43844d..4ef52ff60a 100644 --- a/src/vstest.console/Internal/ConsoleLogger.cs +++ b/src/vstest.console/Internal/ConsoleLogger.cs @@ -36,21 +36,6 @@ internal class ConsoleLogger : ITestLoggerWithParameters /// private const string TestResultPrefix = " "; - /// - /// Unicode for tick - /// - private const char PassedTestIndicator = '\u221a'; - - /// - /// Indicator for failed tests - /// - private const char FailedTestIndicator = 'X'; - - /// - /// Indicated skipped and not run tests - /// - private const char SkippedTestIndicator = '!'; - /// /// Bool to decide whether Verbose level should be added as prefix or not in log messages. /// @@ -544,7 +529,7 @@ private void TestResultHandler(object sender, TestResultEventArgs e) // Pause the progress indicator before displaying test result information this.progressIndicator?.Pause(); - Output.Write(string.Format("{0}{1} ", TestResultPrefix, SkippedTestIndicator), OutputLevel.Information, ConsoleColor.Yellow); + Output.Write(string.Format("{0}{1} ", TestResultPrefix, CommandLineResources.SkippedTestIndicator), OutputLevel.Information, ConsoleColor.Yellow); Output.WriteLine(testDisplayName, OutputLevel.Information); if (this.verbosityLevel == Verbosity.Detailed) { @@ -567,7 +552,7 @@ private void TestResultHandler(object sender, TestResultEventArgs e) // Pause the progress indicator before displaying test result information this.progressIndicator?.Pause(); - Output.Write(string.Format("{0}{1} ", TestResultPrefix, FailedTestIndicator), OutputLevel.Information, ConsoleColor.Red); + Output.Write(string.Format("{0}{1} ", TestResultPrefix, CommandLineResources.FailedTestIndicator), OutputLevel.Information, ConsoleColor.Red); Output.WriteLine(testDisplayName, OutputLevel.Information); DisplayFullInformation(e.Result); @@ -584,7 +569,7 @@ private void TestResultHandler(object sender, TestResultEventArgs e) // Pause the progress indicator before displaying test result information this.progressIndicator?.Pause(); - Output.Write(string.Format("{0}{1} ", TestResultPrefix, PassedTestIndicator), OutputLevel.Information, ConsoleColor.Green); + Output.Write(string.Format("{0}{1} ", TestResultPrefix, CommandLineResources.PassedTestIndicator), OutputLevel.Information, ConsoleColor.Green); Output.WriteLine(testDisplayName, OutputLevel.Information); if (this.verbosityLevel == Verbosity.Detailed) { @@ -608,7 +593,7 @@ private void TestResultHandler(object sender, TestResultEventArgs e) // Pause the progress indicator before displaying test result information this.progressIndicator?.Pause(); - Output.Write(string.Format("{0}{1} ", TestResultPrefix, SkippedTestIndicator), OutputLevel.Information, ConsoleColor.Yellow); + Output.Write(string.Format("{0}{1} ", TestResultPrefix, CommandLineResources.SkippedTestIndicator), OutputLevel.Information, ConsoleColor.Yellow); Output.WriteLine(testDisplayName, OutputLevel.Information); if (this.verbosityLevel == Verbosity.Detailed) { diff --git a/src/vstest.console/Resources/Resources.Designer.cs b/src/vstest.console/Resources/Resources.Designer.cs index 914815a63d..db78353506 100644 --- a/src/vstest.console/Resources/Resources.Designer.cs +++ b/src/vstest.console/Resources/Resources.Designer.cs @@ -11,6 +11,7 @@ namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Resources { using System; + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -556,7 +557,7 @@ internal static string ExtensionUriFormat { } /// - /// Looks up a localized string similar to Failed {0}. + /// Looks up a localized string similar to Failed. /// internal static string FailedTestIndicator { get { @@ -1055,7 +1056,7 @@ internal static string NoTestsAvailableInSources { } /// - /// Looks up a localized string similar to Not Run {0}. + /// Looks up a localized string similar to Not Run. /// internal static string NotRunTestIndicator { get { @@ -1114,7 +1115,7 @@ internal static string ParentProcessIdArgumentHelp { } /// - /// Looks up a localized string similar to Passed {0}. + /// Looks up a localized string similar to Passed. /// internal static string PassedTestIndicator { get { @@ -1319,7 +1320,7 @@ internal static string SettingFormat { } /// - /// Looks up a localized string similar to Skipped {0}. + /// Looks up a localized string similar to Skipped. /// internal static string SkippedTestIndicator { get { diff --git a/src/vstest.console/Resources/Resources.resx b/src/vstest.console/Resources/Resources.resx index 69c4f72391..5fb7d82647 100644 --- a/src/vstest.console/Resources/Resources.resx +++ b/src/vstest.console/Resources/Resources.resx @@ -267,7 +267,7 @@ Uri: {0} - Failed {0} + Failed Message which is written to the console when a test fails. @@ -436,7 +436,7 @@ Process Id of the Parent Process responsible for launching current process. - Passed {0} + Passed Message which is written to the console when a test passes. @@ -499,7 +499,7 @@ SettingName: {0} - Skipped {0} + Skipped A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again. @@ -629,7 +629,7 @@ The /InIsolation flag is deprecated. The tests are always run in a separate process - Not Run {0} + Not Run Logging Vstest Diagnostics in file: {0} diff --git a/src/vstest.console/Resources/xlf/Resources.cs.xlf b/src/vstest.console/Resources/xlf/Resources.cs.xlf index 1de3fe00af..56229ca96e 100644 --- a/src/vstest.console/Resources/xlf/Resources.cs.xlf +++ b/src/vstest.console/Resources/xlf/Resources.cs.xlf @@ -1304,8 +1304,8 @@ fuzzyMatch="15" wordcount="24" adjWordcount="20.4" curWordcount="20.4" - Failed {0} - Počet neúspěšných: {0} + Failed + Počet neúspěšných: {0} Message which is written to the console when a test fails. Fehlgeschlagene {0} @@ -1313,8 +1313,8 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Passed {0} - Počet úspěšných: {0} + Passed + Počet úspěšných: {0} Message which is written to the console when a test passes. Übergebene {0} @@ -1322,9 +1322,9 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Skipped {0} - Počet přeskočených: {0} - + Skipped + Počet přeskočených: {0} + Übersprungene {0} @@ -1447,9 +1447,9 @@ - Not Run {0} - Nespuštěno: {0} - + Not Run + Nespuštěno: {0} + Logging Vstest Diagnostics in file: {0} diff --git a/src/vstest.console/Resources/xlf/Resources.de.xlf b/src/vstest.console/Resources/xlf/Resources.de.xlf index ed086d9ef5..91f075d6c2 100644 --- a/src/vstest.console/Resources/xlf/Resources.de.xlf +++ b/src/vstest.console/Resources/xlf/Resources.de.xlf @@ -1304,8 +1304,8 @@ fuzzyMatch="15" wordcount="24" adjWordcount="20.4" curWordcount="20.4" - Failed {0} - Fehler {0} + Failed + Fehler {0} Message which is written to the console when a test fails. Fehlgeschlagene {0} @@ -1313,8 +1313,8 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Passed {0} - Bestanden {0} + Passed + Bestanden {0} Message which is written to the console when a test passes. Übergebene {0} @@ -1322,9 +1322,9 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Skipped {0} - Übersprungen {0} - + Skipped + Übersprungen {0} + Übersprungene {0} @@ -1447,9 +1447,9 @@ - Not Run {0} - Nicht ausgeführt: {0} - + Not Run + Nicht ausgeführt: {0} + Logging Vstest Diagnostics in file: {0} diff --git a/src/vstest.console/Resources/xlf/Resources.es.xlf b/src/vstest.console/Resources/xlf/Resources.es.xlf index 7af35efa5e..44c366b892 100644 --- a/src/vstest.console/Resources/xlf/Resources.es.xlf +++ b/src/vstest.console/Resources/xlf/Resources.es.xlf @@ -1307,8 +1307,8 @@ fuzzyMatch="15" wordcount="24" adjWordcount="20.4" curWordcount="20.4" - Failed {0} - Con error {0} + Failed + Con error {0} Message which is written to the console when a test fails. Fehlgeschlagene {0} @@ -1316,8 +1316,8 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Passed {0} - Correctas {0} + Passed + Correctas {0} Message which is written to the console when a test passes. Übergebene {0} @@ -1325,9 +1325,9 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Skipped {0} - Omitidas {0} - + Skipped + Omitidas {0} + Übersprungene {0} @@ -1450,9 +1450,9 @@ - Not Run {0} - No ejecutar {0} - + Not Run + No ejecutar {0} + Logging Vstest Diagnostics in file: {0} diff --git a/src/vstest.console/Resources/xlf/Resources.fr.xlf b/src/vstest.console/Resources/xlf/Resources.fr.xlf index c626818a1f..0cf3f10961 100644 --- a/src/vstest.console/Resources/xlf/Resources.fr.xlf +++ b/src/vstest.console/Resources/xlf/Resources.fr.xlf @@ -1304,8 +1304,8 @@ fuzzyMatch="15" wordcount="24" adjWordcount="20.4" curWordcount="20.4" - Failed {0} - Non réussi(s) : {0} + Failed + Non réussi(s) : {0} Message which is written to the console when a test fails. Fehlgeschlagene {0} @@ -1313,8 +1313,8 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Passed {0} - Réussi(s) : {0} + Passed + Réussi(s) : {0} Message which is written to the console when a test passes. Übergebene {0} @@ -1322,9 +1322,9 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Skipped {0} - Ignoré(s) : {0} - + Skipped + Ignoré(s) : {0} + Übersprungene {0} @@ -1447,9 +1447,9 @@ - Not Run {0} - {0} non exécuté - + Not Run + {0} non exécuté + Logging Vstest Diagnostics in file: {0} diff --git a/src/vstest.console/Resources/xlf/Resources.it.xlf b/src/vstest.console/Resources/xlf/Resources.it.xlf index 74c347f393..c0e457cf96 100644 --- a/src/vstest.console/Resources/xlf/Resources.it.xlf +++ b/src/vstest.console/Resources/xlf/Resources.it.xlf @@ -1304,8 +1304,8 @@ fuzzyMatch="15" wordcount="24" adjWordcount="20.4" curWordcount="20.4" - Failed {0} - Non superato {0} + Failed + Non superato {0} Message which is written to the console when a test fails. Fehlgeschlagene {0} @@ -1313,8 +1313,8 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Passed {0} - Superato {0} + Passed + Superato {0} Message which is written to the console when a test passes. Übergebene {0} @@ -1322,9 +1322,9 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Skipped {0} - Ignorato {0} - + Skipped + Ignorato {0} + Übersprungene {0} @@ -1447,9 +1447,9 @@ - Not Run {0} - Non eseguiti: {0} - + Not Run + Non eseguiti: {0} + Logging Vstest Diagnostics in file: {0} diff --git a/src/vstest.console/Resources/xlf/Resources.ja.xlf b/src/vstest.console/Resources/xlf/Resources.ja.xlf index 28435e0170..abb05096ab 100644 --- a/src/vstest.console/Resources/xlf/Resources.ja.xlf +++ b/src/vstest.console/Resources/xlf/Resources.ja.xlf @@ -1304,8 +1304,8 @@ fuzzyMatch="15" wordcount="24" adjWordcount="20.4" curWordcount="20.4" - Failed {0} - 失敗 {0} + Failed + 失敗 {0} Message which is written to the console when a test fails. Fehlgeschlagene {0} @@ -1313,8 +1313,8 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Passed {0} - 成功 {0} + Passed + 成功 {0} Message which is written to the console when a test passes. Übergebene {0} @@ -1322,9 +1322,9 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Skipped {0} - スキップ {0} - + Skipped + スキップ {0} + Übersprungene {0} @@ -1447,9 +1447,9 @@ - Not Run {0} - 実行されません {0} - + Not Run + 実行されません {0} + Logging Vstest Diagnostics in file: {0} diff --git a/src/vstest.console/Resources/xlf/Resources.ko.xlf b/src/vstest.console/Resources/xlf/Resources.ko.xlf index 7de0eb8a47..f64b767b2d 100644 --- a/src/vstest.console/Resources/xlf/Resources.ko.xlf +++ b/src/vstest.console/Resources/xlf/Resources.ko.xlf @@ -1304,8 +1304,8 @@ fuzzyMatch="15" wordcount="24" adjWordcount="20.4" curWordcount="20.4" - Failed {0} - 실패 {0} + Failed + 실패 {0} Message which is written to the console when a test fails. Fehlgeschlagene {0} @@ -1313,8 +1313,8 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Passed {0} - 통과 {0} + Passed + 통과 {0} Message which is written to the console when a test passes. Übergebene {0} @@ -1322,9 +1322,9 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Skipped {0} - 건너뜀 {0} - + Skipped + 건너뜀 {0} + Übersprungene {0} @@ -1447,9 +1447,9 @@ - Not Run {0} - {0} 실행 안 함 - + Not Run + {0} 실행 안 함 + Logging Vstest Diagnostics in file: {0} diff --git a/src/vstest.console/Resources/xlf/Resources.pl.xlf b/src/vstest.console/Resources/xlf/Resources.pl.xlf index 93a0e70be6..22f2b0f4c7 100644 --- a/src/vstest.console/Resources/xlf/Resources.pl.xlf +++ b/src/vstest.console/Resources/xlf/Resources.pl.xlf @@ -1304,8 +1304,8 @@ fuzzyMatch="15" wordcount="24" adjWordcount="20.4" curWordcount="20.4" - Failed {0} - Zakończone niepowodzeniem: {0} + Failed + Zakończone niepowodzeniem: {0} Message which is written to the console when a test fails. Fehlgeschlagene {0} @@ -1313,8 +1313,8 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Passed {0} - Zakończone pomyślnie: {0} + Passed + Zakończone pomyślnie: {0} Message which is written to the console when a test passes. Übergebene {0} @@ -1322,9 +1322,9 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Skipped {0} - Pominięte: {0} - + Skipped + Pominięte: {0} + Übersprungene {0} @@ -1447,9 +1447,9 @@ - Not Run {0} - Nie uruchomiono: {0} - + Not Run + Nie uruchomiono: {0} + Logging Vstest Diagnostics in file: {0} diff --git a/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf b/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf index fda0e98a72..f17325011b 100644 --- a/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf +++ b/src/vstest.console/Resources/xlf/Resources.pt-BR.xlf @@ -1304,8 +1304,8 @@ Altere o prefixo de nível de diagnóstico do agente de console, como mostrado a fuzzyMatch="15" wordcount="24" adjWordcount="20.4" curWordcount="20.4" - Failed {0} - {0} com falha + Failed + {0} com falha Message which is written to the console when a test fails. Fehlgeschlagene {0} @@ -1313,8 +1313,8 @@ Altere o prefixo de nível de diagnóstico do agente de console, como mostrado a fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Passed {0} - {0} aprovados + Passed + {0} aprovados Message which is written to the console when a test passes. Übergebene {0} @@ -1322,9 +1322,9 @@ Altere o prefixo de nível de diagnóstico do agente de console, como mostrado a fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Skipped {0} - {0} ignorados - + Skipped + {0} ignorados + Übersprungene {0} @@ -1447,9 +1447,9 @@ Alterar o nível de rastreamento dos logs, como mostrado abaixo - Not Run {0} - Não executar {0} - + Not Run + Não executar {0} + Logging Vstest Diagnostics in file: {0} diff --git a/src/vstest.console/Resources/xlf/Resources.ru.xlf b/src/vstest.console/Resources/xlf/Resources.ru.xlf index ed6ce4bfd7..dc32a95cdb 100644 --- a/src/vstest.console/Resources/xlf/Resources.ru.xlf +++ b/src/vstest.console/Resources/xlf/Resources.ru.xlf @@ -1304,8 +1304,8 @@ fuzzyMatch="15" wordcount="24" adjWordcount="20.4" curWordcount="20.4" - Failed {0} - Не пройдено: {0} + Failed + Не пройдено: {0} Message which is written to the console when a test fails. Fehlgeschlagene {0} @@ -1313,8 +1313,8 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Passed {0} - Пройдено: {0} + Passed + Пройдено: {0} Message which is written to the console when a test passes. Übergebene {0} @@ -1322,9 +1322,9 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Skipped {0} - Пропущено: {0} - + Skipped + Пропущено: {0} + Übersprungene {0} @@ -1447,9 +1447,9 @@ - Not Run {0} - Не запущен {0} - + Not Run + Не запущен {0} + Logging Vstest Diagnostics in file: {0} diff --git a/src/vstest.console/Resources/xlf/Resources.tr.xlf b/src/vstest.console/Resources/xlf/Resources.tr.xlf index 485fd30a57..0f4e0f55e8 100644 --- a/src/vstest.console/Resources/xlf/Resources.tr.xlf +++ b/src/vstest.console/Resources/xlf/Resources.tr.xlf @@ -1304,8 +1304,8 @@ fuzzyMatch="15" wordcount="24" adjWordcount="20.4" curWordcount="20.4" - Failed {0} - Başarısız {0} + Failed + Başarısız {0} Message which is written to the console when a test fails. Fehlgeschlagene {0} @@ -1313,8 +1313,8 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Passed {0} - Başarılı {0} + Passed + Başarılı {0} Message which is written to the console when a test passes. Übergebene {0} @@ -1322,9 +1322,9 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Skipped {0} - Atlandı {0} - + Skipped + Atlandı {0} + Übersprungene {0} @@ -1447,9 +1447,9 @@ Günlükler için izleme düzeyini aşağıda gösterildiği gibi değiştirin - Not Run {0} - {0} Çalıştırılmadı - + Not Run + {0} Çalıştırılmadı + Logging Vstest Diagnostics in file: {0} diff --git a/src/vstest.console/Resources/xlf/Resources.xlf b/src/vstest.console/Resources/xlf/Resources.xlf index 982ccc1780..6f53284141 100644 --- a/src/vstest.console/Resources/xlf/Resources.xlf +++ b/src/vstest.console/Resources/xlf/Resources.xlf @@ -554,15 +554,15 @@ - Failed {0} + Failed Message which is written to the console when a test fails. - Passed {0} + Passed Message which is written to the console when a test passes. - Skipped {0} + Skipped @@ -602,7 +602,7 @@ - Not Run {0} + Not Run Not Run {0} diff --git a/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf b/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf index c53aa96c37..b8cad99f37 100644 --- a/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf +++ b/src/vstest.console/Resources/xlf/Resources.zh-Hans.xlf @@ -1304,8 +1304,8 @@ fuzzyMatch="15" wordcount="24" adjWordcount="20.4" curWordcount="20.4" - Failed {0} - {0} 个失败 + Failed + {0} 个失败 Message which is written to the console when a test fails. Fehlgeschlagene {0} @@ -1313,8 +1313,8 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Passed {0} - 已通过 {0} 个 + Passed + 已通过 {0} 个 Message which is written to the console when a test passes. Übergebene {0} @@ -1322,9 +1322,9 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Skipped {0} - 已跳过 {0} 个 - + Skipped + 已跳过 {0} 个 + Übersprungene {0} @@ -1447,9 +1447,9 @@ - Not Run {0} - 未运行 {0} - + Not Run + 未运行 {0} + Logging Vstest Diagnostics in file: {0} diff --git a/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf b/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf index 8c443a5598..6ed487535f 100644 --- a/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf +++ b/src/vstest.console/Resources/xlf/Resources.zh-Hant.xlf @@ -1305,8 +1305,8 @@ fuzzyMatch="15" wordcount="24" adjWordcount="20.4" curWordcount="20.4" - Failed {0} - 失敗 {0} + Failed + 失敗 {0} Message which is written to the console when a test fails. Fehlgeschlagene {0} @@ -1314,8 +1314,8 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Passed {0} - 成功 {0} + Passed + 成功 {0} Message which is written to the console when a test passes. Übergebene {0} @@ -1323,9 +1323,9 @@ fuzzyMatch="15" wordcount="2" adjWordcount="1.7" curWordcount="1.7" - Skipped {0} - 略過 {0} - + Skipped + 略過 {0} + Übersprungene {0} @@ -1448,9 +1448,9 @@ - Not Run {0} - 未執行 {0} - + Not Run + 未執行 {0} + Logging Vstest Diagnostics in file: {0} diff --git a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs index 7d25744753..83d29a2137 100644 --- a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs +++ b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs @@ -258,8 +258,8 @@ public void ValidatePassedTests(params string[] passedTests) { // Check for tick or ? both, in some cases as unicode character for tick is not available // in std out and gets replaced by ? - var flag = this.standardTestOutput.Contains("\\u221a " + test) - || this.standardTestOutput.Contains("\\u221a " + GetTestMethodName(test)) + var flag = this.standardTestOutput.Contains("Passed " + test) + || this.standardTestOutput.Contains("Passed " + GetTestMethodName(test)) || this.standardTestOutput.Contains("\\ufffd " + test) || this.standardTestOutput.Contains("\\ufffd " + GetTestMethodName(test)); Assert.IsTrue(flag, "Test {0} does not appear in passed tests list.", test); @@ -278,8 +278,8 @@ public void ValidateFailedTests(params string[] failedTests) { foreach (var test in failedTests) { - var flag = this.standardTestOutput.Contains("X " + test) - || this.standardTestOutput.Contains("X " + GetTestMethodName(test)); + var flag = this.standardTestOutput.Contains("Failed " + test) + || this.standardTestOutput.Contains("Failed " + GetTestMethodName(test)); Assert.IsTrue(flag, "Test {0} does not appear in failed tests list.", test); // Verify stack information as well. @@ -296,8 +296,8 @@ public void ValidateSkippedTests(params string[] skippedTests) { foreach (var test in skippedTests) { - var flag = this.standardTestOutput.Contains("! " + test) - || this.standardTestOutput.Contains("! " + GetTestMethodName(test)); + var flag = this.standardTestOutput.Contains("Skipped " + test) + || this.standardTestOutput.Contains("Skipped " + GetTestMethodName(test)); Assert.IsTrue(flag, "Test {0} does not appear in skipped tests list.", test); } } diff --git a/test/vstest.console.UnitTests/Internal/ConsoleLoggerTests.cs b/test/vstest.console.UnitTests/Internal/ConsoleLoggerTests.cs index 9ec0a0de6e..9477385886 100644 --- a/test/vstest.console.UnitTests/Internal/ConsoleLoggerTests.cs +++ b/test/vstest.console.UnitTests/Internal/ConsoleLoggerTests.cs @@ -32,9 +32,9 @@ public class ConsoleLoggerTests private ConsoleLogger consoleLogger; private Mock mockProgressIndicator; - private const string PassedTestIndicator = " \u221a "; - private const string FailedTestIndicator = " X "; - private const string SkippedTestIndicator = " ! "; + private const string PassedTestIndicator = " Passed "; + private const string FailedTestIndicator = " Failed "; + private const string SkippedTestIndicator = " Skipped "; [TestInitialize] public void Initialize()