diff --git a/src/Adapter/MSTest.TestAdapter/Execution/ExceptionHelper.cs b/src/Adapter/MSTest.TestAdapter/Execution/ExceptionHelper.cs index 0c36b4e56f..f4820a5be7 100644 --- a/src/Adapter/MSTest.TestAdapter/Execution/ExceptionHelper.cs +++ b/src/Adapter/MSTest.TestAdapter/Execution/ExceptionHelper.cs @@ -78,7 +78,6 @@ internal static class ExceptionHelper result.AppendLine(Resource.UTA_EndOfInnerExceptionTrace); } - result.Append(' '); result.AppendLine(stackTraces.Pop()); first = false; diff --git a/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestAssemblyInfoTests.cs b/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestAssemblyInfoTests.cs index fd22fa0d62..30c49fe9ae 100644 --- a/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestAssemblyInfoTests.cs +++ b/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestAssemblyInfoTests.cs @@ -183,7 +183,7 @@ public void RunAssemblyInitializeShouldThrowTestFailedExceptionWithNonAssertExce == "Assembly Initialization method Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestAssemblyInfoTests+DummyTestClass.AssemblyInitializeMethod threw exception. System.ArgumentException: Some actualErrorMessage message. Aborting test execution."); Verify( exception.StackTraceInformation.ErrorStackTrace.StartsWith( - " at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestAssemblyInfoTests.<>c.", StringComparison.Ordinal)); + " at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestAssemblyInfoTests.<>c.", StringComparison.Ordinal)); Verify(exception.InnerException.GetType() == typeof(ArgumentException)); Verify(exception.InnerException.InnerException.GetType() == typeof(InvalidOperationException)); } @@ -205,7 +205,7 @@ public void RunAssemblyInitializeShouldThrowTheInnerMostExceptionWhenThereAreMul == "Assembly Initialization method Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestAssemblyInfoTests+DummyTestClass.AssemblyInitializeMethod threw exception. System.InvalidOperationException: I fail.. Aborting test execution."); Verify( exception.StackTraceInformation.ErrorStackTrace.StartsWith( - " at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestAssemblyInfoTests.FailingStaticHelper..cctor()", StringComparison.Ordinal)); + " at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestAssemblyInfoTests.FailingStaticHelper..cctor()", StringComparison.Ordinal)); Verify(exception.InnerException.GetType() == typeof(InvalidOperationException)); } @@ -282,7 +282,7 @@ public void RunAssemblyCleanupShouldReturnExceptionDetailsOfNonAssertExceptions( _testAssemblyInfo.AssemblyCleanupMethod = typeof(DummyTestClass).GetMethod("AssemblyCleanupMethod"); Verify( _testAssemblyInfo.RunAssemblyCleanup().StartsWith( - "Assembly Cleanup method DummyTestClass.AssemblyCleanupMethod failed. Error Message: System.ArgumentException: Argument Exception. StackTrace: at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestAssemblyInfoTests.<>c.", StringComparison.Ordinal)); + "Assembly Cleanup method DummyTestClass.AssemblyCleanupMethod failed. Error Message: System.ArgumentException: Argument Exception. StackTrace: at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestAssemblyInfoTests.<>c.", StringComparison.Ordinal)); } public void RunAssemblyCleanupShouldThrowTheInnerMostExceptionWhenThereAreMultipleNestedTypeInitializationExceptions() diff --git a/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestClassInfoTests.cs b/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestClassInfoTests.cs index b338689b72..d377b96e13 100644 --- a/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestClassInfoTests.cs +++ b/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestClassInfoTests.cs @@ -342,7 +342,7 @@ public void RunClassInitializeShouldThrowTestFailedExceptionOnBaseInitializeMeth == "Class Initialization method Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestClassInfoTests+DummyTestClass.InitBaseClassMethod threw exception. System.ArgumentException: Some exception message."); Verify( exception.StackTraceInformation.ErrorStackTrace.StartsWith( - " at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestClassInfoTests.<>c.", StringComparison.Ordinal)); + " at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestClassInfoTests.<>c.", StringComparison.Ordinal)); Verify(exception.InnerException.GetType() == typeof(ArgumentException)); Verify(exception.InnerException.InnerException.GetType() == typeof(InvalidOperationException)); } @@ -397,7 +397,7 @@ public void RunClassInitializeShouldThrowTestFailedExceptionWithNonAssertExcepti == "Class Initialization method Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestClassInfoTests+DummyTestClass.ClassInitializeMethod threw exception. System.ArgumentException: Argument exception."); Verify( exception.StackTraceInformation.ErrorStackTrace.StartsWith( - " at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestClassInfoTests.<>c.", StringComparison.Ordinal)); + " at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestClassInfoTests.<>c.", StringComparison.Ordinal)); } public void RunClassInitializeShouldThrowForAlreadyExecutedTestClassInitWithException() @@ -438,7 +438,7 @@ public void RunClassInitializeShouldThrowTheInnerMostExceptionWhenThereAreMultip == "Class Initialization method Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestClassInfoTests+DummyTestClass.ClassInitializeMethod threw exception. System.InvalidOperationException: I fail.."); Verify( exception.StackTraceInformation.ErrorStackTrace.StartsWith( - " at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestClassInfoTests.FailingStaticHelper..cctor()", StringComparison.Ordinal)); + " at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestClassInfoTests.FailingStaticHelper..cctor()", StringComparison.Ordinal)); Verify(exception.InnerException.GetType() == typeof(InvalidOperationException)); } diff --git a/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestMethodInfoTests.cs b/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestMethodInfoTests.cs index a8c6540c7d..a2e6c569e4 100644 --- a/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestMethodInfoTests.cs +++ b/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestMethodInfoTests.cs @@ -285,7 +285,7 @@ public void TestMethodInfoInvokeShouldSetStackTraceInformationIfTestClassConstru Verify(exception.StackTraceInformation is not null); Verify( exception.StackTraceInformation.ErrorStackTrace.StartsWith( - " at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestMethodInfoTests.<>c.b__", StringComparison.Ordinal)); + " at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestMethodInfoTests.<>c.b__", StringComparison.Ordinal)); } public void TestMethodInfoInvokeShouldSetStackTraceInformationIfTestClassConstructorThrowsWithoutInnerException() @@ -300,7 +300,7 @@ public void TestMethodInfoInvokeShouldSetStackTraceInformationIfTestClassConstru Verify(exception.StackTraceInformation is not null); Verify( exception.StackTraceInformation.ErrorStackTrace.StartsWith( - " at System.Reflection.RuntimeConstructorInfo.Invoke(BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture)", StringComparison.Ordinal)); + " at System.Reflection.RuntimeConstructorInfo.Invoke(BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture)", StringComparison.Ordinal)); } public void TestMethodInfoInvokeShouldSetResultFilesIfTestContextHasAttachments() @@ -400,7 +400,7 @@ public void TestMethodInfoInvokeShouldSetStackTraceInformationIfSetTestContextTh Verify(exception.StackTraceInformation is not null); Verify( exception.StackTraceInformation.ErrorStackTrace.StartsWith( - " at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestMethodInfoTests.<>c.b__", StringComparison.Ordinal)); + " at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestMethodInfoTests.<>c.b__", StringComparison.Ordinal)); } public void TestMethodInfoInvoke_WhenCtorHasOneParameterOfTypeTestContextAndTestContextProperty_InitializeBothTestContexts() @@ -514,7 +514,7 @@ public void TestMethodInfoInvokeWhenTestThrowsReturnsExpectedResult() Verify( exception.StackTraceInformation.ErrorStackTrace.StartsWith( - " at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestMethodInfoTests.<>c.b__", StringComparison.Ordinal)); + " at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestMethodInfoTests.<>c.b__", StringComparison.Ordinal)); } public void TestInitialize_WhenTestReturnsTaskFromException_DisplayProperException() diff --git a/test/UnitTests/MSTestAdapter.UnitTests/Extensions/ExceptionExtensionsTests.cs b/test/UnitTests/MSTestAdapter.UnitTests/Extensions/ExceptionExtensionsTests.cs index 4c37529ebf..4c8c4987c3 100644 --- a/test/UnitTests/MSTestAdapter.UnitTests/Extensions/ExceptionExtensionsTests.cs +++ b/test/UnitTests/MSTestAdapter.UnitTests/Extensions/ExceptionExtensionsTests.cs @@ -60,11 +60,11 @@ public void TryGetStackTraceInformationReturnsNullIfExceptionStackTraceIsNullOrE public void TryGetStackTraceInformationReturnsStackTraceForAnException() { - var exception = new DummyExceptionForStackTrace(() => " at A()\r\n at B()"); + var exception = new DummyExceptionForStackTrace(() => " at A()\r\n at B()"); MSTest.TestAdapter.ObjectModel.StackTraceInformation stackTraceInformation = exception.TryGetStackTraceInformation(); - Verify(stackTraceInformation.ErrorStackTrace.StartsWith(" at A()", StringComparison.Ordinal)); + Verify(stackTraceInformation.ErrorStackTrace.StartsWith(" at A()", StringComparison.Ordinal)); Verify(stackTraceInformation.ErrorFilePath is null); Verify(stackTraceInformation.ErrorLineNumber == 0); }