Skip to content

[rel/3.8] Remove extra space #5252

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

Merged
merged 5 commits into from
Mar 17, 2025
Merged

[rel/3.8] Remove extra space #5252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ee8c31
Remove extra space
nohwnd Mar 14, 2025
08fd00f
Remove extra space
nohwnd Mar 14, 2025
9025182
Fix tests
nohwnd Mar 14, 2025
23437fc
merge
nohwnd Mar 17, 2025
72447c4
Fix tests
nohwnd Mar 17, 2025
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
1 change: 0 additions & 1 deletion src/Adapter/MSTest.TestAdapter/Execution/ExceptionHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ internal static class ExceptionHelper
result.AppendLine(Resource.UTA_EndOfInnerExceptionTrace);
}

result.Append(' ');
result.AppendLine(stackTraces.Pop());

first = false;
Expand Down
6 changes: 3 additions & 3 deletions test/UnitTests/MSTestAdapter.UnitTests/Execution/TestAssemblyInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.<RunAssemblyInitializeShouldThrowTestFailedExceptionWithNonAssertExceptions>", StringComparison.Ordinal));
" at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestAssemblyInfoTests.<>c.<RunAssemblyInitializeShouldThrowTestFailedExceptionWithNonAssertExceptions>", StringComparison.Ordinal));
Verify(exception.InnerException.GetType() == typeof(ArgumentException));
Verify(exception.InnerException.InnerException.GetType() == typeof(InvalidOperationException));
}
Expand All @@ -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));
}

Expand Down Expand Up @@ -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.<RunAssemblyCleanupShouldReturnExceptionDetailsOfNonAssertExceptions>", StringComparison.Ordinal));
"Assembly Cleanup method DummyTestClass.AssemblyCleanupMethod failed. Error Message: System.ArgumentException: Argument Exception. StackTrace: at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestAssemblyInfoTests.<>c.<RunAssemblyCleanupShouldReturnExceptionDetailsOfNonAssertExceptions>", StringComparison.Ordinal));
}

public void RunAssemblyCleanupShouldThrowTheInnerMostExceptionWhenThereAreMultipleNestedTypeInitializationExceptions()
Expand Down
6 changes: 3 additions & 3 deletions test/UnitTests/MSTestAdapter.UnitTests/Execution/TestClassInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.<RunClassInitializeShouldThrowTestFailedExceptionOnBaseInitializeMethodWithNonAssertExceptions>", StringComparison.Ordinal));
" at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestClassInfoTests.<>c.<RunClassInitializeShouldThrowTestFailedExceptionOnBaseInitializeMethodWithNonAssertExceptions>", StringComparison.Ordinal));
Verify(exception.InnerException.GetType() == typeof(ArgumentException));
Verify(exception.InnerException.InnerException.GetType() == typeof(InvalidOperationException));
}
Expand Down Expand Up @@ -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.<RunClassInitializeShouldThrowTestFailedExceptionWithNonAssertExceptions>", StringComparison.Ordinal));
" at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestClassInfoTests.<>c.<RunClassInitializeShouldThrowTestFailedExceptionWithNonAssertExceptions>", StringComparison.Ordinal));
}

public void RunClassInitializeShouldThrowForAlreadyExecutedTestClassInitWithException()
Expand Down Expand Up @@ -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));
}

Expand Down
8 changes: 4 additions & 4 deletions test/UnitTests/MSTestAdapter.UnitTests/Execution/TestMethodInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.<TestMethodInfoInvokeShouldSetStackTraceInformationIfTestClassConstructorThrows>b__", StringComparison.Ordinal));
" at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestMethodInfoTests.<>c.<TestMethodInfoInvokeShouldSetStackTraceInformationIfTestClassConstructorThrows>b__", StringComparison.Ordinal));
}

public void TestMethodInfoInvokeShouldSetStackTraceInformationIfTestClassConstructorThrowsWithoutInnerException()
Expand All @@ -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()
Expand Down Expand Up @@ -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.<TestMethodInfoInvokeShouldSetStackTraceInformationIfSetTestContextThrows>b__", StringComparison.Ordinal));
" at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestMethodInfoTests.<>c.<TestMethodInfoInvokeShouldSetStackTraceInformationIfSetTestContextThrows>b__", StringComparison.Ordinal));
}

public void TestMethodInfoInvoke_WhenCtorHasOneParameterOfTypeTestContextAndTestContextProperty_InitializeBothTestContexts()
Expand Down Expand Up @@ -514,7 +514,7 @@ public void TestMethodInfoInvokeWhenTestThrowsReturnsExpectedResult()

Verify(
exception.StackTraceInformation.ErrorStackTrace.StartsWith(
" at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestMethodInfoTests.<>c.<TestMethodInfoInvokeWhenTestThrowsReturnsExpectedResult>b__", StringComparison.Ordinal));
" at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.Execution.TestMethodInfoTests.<>c.<TestMethodInfoInvokeWhenTestThrowsReturnsExpectedResult>b__", StringComparison.Ordinal));
}

public void TestInitialize_WhenTestReturnsTaskFromException_DisplayProperException()
Expand Down
4 changes: 2 additions & 2 deletions test/UnitTests/MSTestAdapter.UnitTests/Extensions/ExceptionExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down