Skip to content

VSTestBridge: Cleanup FixUpTestCase #7186

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
Evangelink merged 1 commit into from
Jan 12, 2026
Merged

VSTestBridge: Cleanup FixUpTestCase #7186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 5 additions & 10 deletions ...Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/FrameworkHandlerAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ internal sealed class FrameworkHandlerAdapter : IFrameworkHandle
private readonly CancellationToken _cancellationToken;
private readonly bool _isTrxEnabled;
private readonly MessageLoggerAdapter _comboMessageLogger;
private readonly string _testAssemblyPath;
private readonly INamedFeatureCapability? _namedFeatureCapability;
private readonly ICommandLineOptions _commandLineOptions;
private readonly IClientInfo _clientInfo;
Expand All @@ -59,17 +58,13 @@ public FrameworkHandlerAdapter(
}
else if (testAssemblyPaths.Length > 1)
{
_testAssemblyPath = testApplicationModuleInfo.GetCurrentTestApplicationFullPath();
string testAssemblyPath = testApplicationModuleInfo.GetCurrentTestApplicationFullPath();

if (!testAssemblyPaths.Contains(_testAssemblyPath))
if (!testAssemblyPaths.Contains(testAssemblyPath))
{
throw new ArgumentException("None of the test assemblies are the test application.");
}
}
else
{
_testAssemblyPath = testAssemblyPaths[0];
}

_namedFeatureCapability = namedFeatureCapability;
_commandLineOptions = commandLineOptions;
Expand Down Expand Up @@ -119,7 +114,7 @@ public void RecordEnd(TestCase testCase, TestOutcome outcome)

_cancellationToken.ThrowIfCancellationRequested();

testCase.FixUpTestCase(_testAssemblyPath);
testCase.FixUpTestCase();

// Forward call to VSTest
_frameworkHandle?.RecordEnd(testCase, outcome);
Expand All @@ -132,7 +127,7 @@ public void RecordResult(TestResult testResult)

_cancellationToken.ThrowIfCancellationRequested();

testResult.TestCase.FixUpTestCase(_testAssemblyPath);
testResult.TestCase.FixUpTestCase();

// Forward call to VSTest
_frameworkHandle?.RecordResult(testResult);
Expand All @@ -151,7 +146,7 @@ public void RecordStart(TestCase testCase)

_cancellationToken.ThrowIfCancellationRequested();

testCase.FixUpTestCase(_testAssemblyPath);
testCase.FixUpTestCase();

// Forward call to VSTest
_frameworkHandle?.RecordStart(testCase);
Expand Down
9 changes: 1 addition & 8 deletions src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/ObjectModelConverters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,15 +286,8 @@ private static void AddAssertDataToException(VSTestException exception, TestResu
}
}

internal static void FixUpTestCase(this TestCase testCase, string? testAssemblyPath = null)
internal static void FixUpTestCase(this TestCase testCase)
{
// To help framework authors using code generator, we replace the Source property of the test case with the
// test assembly path.
if (RoslynString.IsNullOrEmpty(testCase.Source) && !RoslynString.IsNullOrEmpty(testAssemblyPath))
{
testCase.Source = testAssemblyPath;
}

// Because this project is the actually registered test adapter, we need to replace test framework executor
// URI by ours.
if (!testCase.Properties.Any(x => x.Id == OriginalExecutorUriProperty.Id))
Expand Down
11 changes: 3 additions & 8 deletions ...orm/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/TestCaseDiscoverySinkAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ internal sealed class TestCaseDiscoverySinkAdapter : ITestCaseDiscoverySink
private readonly VSTestBridgedTestFrameworkBase _adapterExtension;
private readonly TestSessionContext _session;
private readonly CancellationToken _cancellationToken;
private readonly string? _testAssemblyPath;

public TestCaseDiscoverySinkAdapter(
VSTestBridgedTestFrameworkBase adapterExtension,
Expand All @@ -55,17 +54,13 @@ public TestCaseDiscoverySinkAdapter(
}
else if (testAssemblyPaths.Length > 1)
{
_testAssemblyPath = testApplicationModuleInfo.GetCurrentTestApplicationFullPath();
string testAssemblyPath = testApplicationModuleInfo.GetCurrentTestApplicationFullPath();

if (!testAssemblyPaths.Contains(_testAssemblyPath))
if (!testAssemblyPaths.Contains(testAssemblyPath))
{
throw new ArgumentException("None of the test assemblies are the test application.");
}
}
else
{
_testAssemblyPath = testAssemblyPaths[0];
}

_testCaseDiscoverySink = testCaseDiscoverySink;
_logger = loggerFactory.CreateLogger<TestCaseDiscoverySinkAdapter>();
Expand All @@ -86,7 +81,7 @@ public void SendTestCase(TestCase discoveredTest)

_cancellationToken.ThrowIfCancellationRequested();

discoveredTest.FixUpTestCase(_testAssemblyPath);
discoveredTest.FixUpTestCase();

// Forward call to VSTest
_testCaseDiscoverySink?.SendTestCase(discoveredTest);
Expand Down
Loading