Move test-case filter parsing to adapter boundary (Phase 6d-1)

[Amaury Levé (Evangelink)]

Phase 6d-1 of the PlatformServices platform-agnostic initiative

Part of removing the VSTest object model (Microsoft.TestPlatform.ObjectModel) dependency from MSTestAdapter.PlatformServices.

This phase moves the test-case filter parsing to the adapter boundary. TestMethodFilter (which parses the VSTest ITestCaseFilterExpression from IRunContext/IDiscoveryContext.GetTestCaseFilter) moves out of PlatformServices into MSTest.TestAdapter, and the engine/discoverer receive an injected neutral ITestElementFilter via a new ITestElementFilterProvider abstraction.

What changed

• New ITestElementFilterProvider (PlatformServices.Interface): ITestElementFilter? GetTestElementFilter(IAdapterMessageLogger, out bool filterHasError).
• Moved TestMethodFilter (+ nested TestElementFilter) → MSTest.TestAdapter (class body byte-identical); added a boundary TestElementFilterProvider that closes over the VSTest context.
• The boundary (MSTestExecutor, MSTestDiscoverer — which the MTP MSTestBridgedTestFramework also routes through) builds new TestElementFilterProvider(context) and injects it into TestExecutionManager.RunTestsAsync/ExecuteTestsAsync and UnitTestDiscoverer.DiscoverTests.
• The engine/discoverer invoke the provider at the exact same call sites they previously built the filter (per source), so parse-error reporting keeps the same timing and per-source count.

No behavior change

TestElementFilter.Matches still does element.ToTestCase() (byte-for-byte; the #9568 no-round-trip optimization is deferred as its own follow-up). This removes ITestCaseFilterExpression / GetTestCaseFilter / MatchTestCase / the VSTest filter TestProperty set from PlatformServices code. IRunContext/IDiscoveryContext remain only for deployment + settings extraction (removed in 6d-2).

Verification

• Full build green across all TFMs (net462, net8.0, net9.0, UWP, WinUI).
• MSTestAdapter.PlatformServices.UnitTests: 897 (net8.0) / 935 (net462); MSTestAdapter.UnitTests: 21; MSTest.IntegrationTests: 47 pass / 1 skip — including TestCaseFilteringTests, the out-of-proc filter regression net.
• Expert MSTest/MTP reviewer: no material findings; definitive byte-for-byte verdict on the per-source parse-error timing/count and the null-provider equivalence.

Base / stacking

• Stacked on Phase 6c2 (Neutralize run-settings input in PlatformServices host layer (Phase 6c2) #9590). Base = dev/amauryleve/vstest-decoupling-settings; review/merge after Neutralize run-settings input in PlatformServices host layer (Phase 6c2) #9590. When 6c2 merges into vstest-decoupling-base, this PR is rebased onto the updated base (diff is 6d-1 only, 10 files).

Remaining work

• 6d-2: remove IRunContext/IDiscoveryContext from PlatformServices entirely (deploy-context + settings extraction to the boundary).
• Avoid double TestCase construction when filtering during discovery/execution (platform-agnostic refactor follow-up) #9568: filter no-round-trip optimization (only if provably byte-for-byte).
• 6e: relocate remaining bridges + the deep UnitTestElement↔TestCase conversion + EngineConstants.
• 7: remove the Microsoft.TestPlatform.ObjectModel PackageReference + guard test.

[github-actions]

Note

🤖 Automated review by GitHub Copilot. Posted via a maintainer's GitHub token, so it appears under their account — the account owner did not write or approve this content personally. Generated by the Expert Code Review workflow. To request a follow-up action, reply by tagging @copilot directly.

✅ 22/22 dimensions clean — no findings.

Folder hotspot coverage: All changed files fall under src/Adapter/ (correctness, threading, API) and test/ (assertions, isolation, flakiness) — both clusters received priority analysis.

Spot-checks verified:

• Threading safety of _testElementFilterProvider: The new non-readonly field is written once in ExecuteTestsAsync before the sequential foreach/await loop; the parallel workers spawned inside ExecuteTestsInSourceAsync capture a local ITestElementFilter? variable (the result of GetTestElementFilter) and never touch the field directly. No unsynchronized cross-thread access.

• ?. + out bool initialization pattern: bool filterHasError = false; ITestElementFilter? filter = filterProvider?.GetTestElementFilter(logger, out filterHasError); — when filterProvider is null the pre-init false is the correct value (no filter = no error), and the if (filterHasError) return; guard is not triggered. Correct for the MTP no-filter path.

• Per-source call count: GetTestElementFilter is called once per source in discovery and once per source in execution (same as the old code with separate TestMethodFilter instances). Error-message count is unchanged.

• TestMethodFilter state: _supportedProperties is populated once in the constructor and only read thereafter; concurrent TryGetValue reads from parallel test-filter matching are safe on an unmodified Dictionary<K,V>.

• Public API surface: ITestElementFilterProvider and TestElementFilterProvider are both internal; no public API is added, removed, or changed.

• Assertion library: MSTestAdapter.PlatformServices.UnitTests bans MSTest Assert/StringAssert/CollectionAssert and requires AwesomeAssertions — all updated test call sites use .Should() correctly.

• Project references: MSTestAdapter.PlatformServices.UnitTests.csproj already references MSTest.TestAdapter.csproj, so TestElementFilterProvider is accessible from the updated tests.

[Amaury Levé (Evangelink)]

Phase 6d-1 of the PlatformServices platform-agnostic initiative

Part of removing the VSTest object model (Microsoft.TestPlatform.ObjectModel) dependency from MSTestAdapter.PlatformServices.

This phase moves the test-case filter parsing to the adapter boundary. TestMethodFilter (which parses the VSTest ITestCaseFilterExpression from IRunContext/IDiscoveryContext.GetTestCaseFilter) moves out of PlatformServices into MSTest.TestAdapter, and the engine/discoverer receive an injected neutral ITestElementFilter via a new ITestElementFilterProvider abstraction.

What changed

• New ITestElementFilterProvider (PlatformServices.Interface): ITestElementFilter? GetTestElementFilter(IAdapterMessageLogger, out bool filterHasError).
• Moved TestMethodFilter (+ nested TestElementFilter) → MSTest.TestAdapter (class body byte-identical); added a boundary TestElementFilterProvider that closes over the VSTest context.
• The boundary (MSTestExecutor, MSTestDiscoverer — which the MTP MSTestBridgedTestFramework also routes through) builds new TestElementFilterProvider(context) and injects it into TestExecutionManager.RunTestsAsync/ExecuteTestsAsync and UnitTestDiscoverer.DiscoverTests.
• The engine/discoverer invoke the provider at the exact same call sites they previously built the filter (per source), so parse-error reporting keeps the same timing and per-source count.

No behavior change

TestElementFilter.Matches still does element.ToTestCase() (byte-for-byte; the #9568 no-round-trip optimization is deferred as its own follow-up). This removes ITestCaseFilterExpression / GetTestCaseFilter / MatchTestCase / the VSTest filter TestProperty set from PlatformServices code. IRunContext/IDiscoveryContext remain only for deployment + settings extraction (removed in 6d-2).

Verification

• Full build green across all TFMs (net462, net8.0, net9.0, UWP, WinUI).
• MSTestAdapter.PlatformServices.UnitTests: 897 (net8.0) / 935 (net462); MSTestAdapter.UnitTests: 21; MSTest.IntegrationTests: 47 pass / 1 skip — including TestCaseFilteringTests, the out-of-proc filter regression net.
• Expert MSTest/MTP reviewer: no material findings; definitive byte-for-byte verdict on the per-source parse-error timing/count and the null-provider equivalence.

Base / stacking

• Stacked on Phase 6c2 (Neutralize run-settings input in PlatformServices host layer (Phase 6c2) #9590). Base = dev/amauryleve/vstest-decoupling-settings; review/merge after Neutralize run-settings input in PlatformServices host layer (Phase 6c2) #9590. When 6c2 merges into vstest-decoupling-base, this PR is rebased onto the updated base (diff is 6d-1 only, 10 files).

Remaining work

• 6d-2: remove IRunContext/IDiscoveryContext from PlatformServices entirely (deploy-context + settings extraction to the boundary).
• Avoid double TestCase construction when filtering during discovery/execution (platform-agnostic refactor follow-up) #9568: filter no-round-trip optimization (only if provably byte-for-byte).
• 6e: relocate remaining bridges + the deep UnitTestElement↔TestCase conversion + EngineConstants.
• 7: remove the Microsoft.TestPlatform.ObjectModel PackageReference + guard test.

[github-actions]

Note

🤖 Automated review by GitHub Copilot. Posted via a maintainer's GitHub token, so it appears under their account — the account owner did not write or approve this content personally. Generated by the Expert Code Review workflow. To request a follow-up action, reply by tagging @copilot directly.

✅ 22/22 dimensions clean — no findings.

Folder hotspot coverage: All changed files fall under src/Adapter/ (correctness, threading, API) and test/ (assertions, isolation, flakiness) — both clusters received priority analysis.

Spot-checks verified:

• Threading safety of _testElementFilterProvider: The new non-readonly field is written once in ExecuteTestsAsync before the sequential foreach/await loop; the parallel workers spawned inside ExecuteTestsInSourceAsync capture a local ITestElementFilter? variable (the result of GetTestElementFilter) and never touch the field directly. No unsynchronized cross-thread access.

• ?. + out bool initialization pattern: bool filterHasError = false; ITestElementFilter? filter = filterProvider?.GetTestElementFilter(logger, out filterHasError); — when filterProvider is null the pre-init false is the correct value (no filter = no error), and the if (filterHasError) return; guard is not triggered. Correct for the MTP no-filter path.

• Per-source call count: GetTestElementFilter is called once per source in discovery and once per source in execution (same as the old code with separate TestMethodFilter instances). Error-message count is unchanged.

• TestMethodFilter state: _supportedProperties is populated once in the constructor and only read thereafter; concurrent TryGetValue reads from parallel test-filter matching are safe on an unmodified Dictionary<K,V>.

• Public API surface: ITestElementFilterProvider and TestElementFilterProvider are both internal; no public API is added, removed, or changed.

• Assertion library: MSTestAdapter.PlatformServices.UnitTests bans MSTest Assert/StringAssert/CollectionAssert and requires AwesomeAssertions — all updated test call sites use .Should() correctly.

• Project references: MSTestAdapter.PlatformServices.UnitTests.csproj already references MSTest.TestAdapter.csproj, so TestElementFilterProvider is accessible from the updated tests.

[Amaury Levé (Evangelink)]

Phase 6d-1 of the PlatformServices platform-agnostic initiative

Part of removing the VSTest object model (Microsoft.TestPlatform.ObjectModel) dependency from MSTestAdapter.PlatformServices.

This phase moves the test-case filter parsing to the adapter boundary. TestMethodFilter (which parses the VSTest ITestCaseFilterExpression from IRunContext/IDiscoveryContext.GetTestCaseFilter) moves out of PlatformServices into MSTest.TestAdapter, and the engine/discoverer receive an injected neutral ITestElementFilter via a new ITestElementFilterProvider abstraction.

What changed

• New ITestElementFilterProvider (PlatformServices.Interface): ITestElementFilter? GetTestElementFilter(IAdapterMessageLogger, out bool filterHasError).
• Moved TestMethodFilter (+ nested TestElementFilter) → MSTest.TestAdapter (class body byte-identical); added a boundary TestElementFilterProvider that closes over the VSTest context.
• The boundary (MSTestExecutor, MSTestDiscoverer — which the MTP MSTestBridgedTestFramework also routes through) builds new TestElementFilterProvider(context) and injects it into TestExecutionManager.RunTestsAsync/ExecuteTestsAsync and UnitTestDiscoverer.DiscoverTests.
• The engine/discoverer invoke the provider at the exact same call sites they previously built the filter (per source), so parse-error reporting keeps the same timing and per-source count.

No behavior change

TestElementFilter.Matches still does element.ToTestCase() (byte-for-byte; the #9568 no-round-trip optimization is deferred as its own follow-up). This removes ITestCaseFilterExpression / GetTestCaseFilter / MatchTestCase / the VSTest filter TestProperty set from PlatformServices code. IRunContext/IDiscoveryContext remain only for deployment + settings extraction (removed in 6d-2).

Verification

• Full build green across all TFMs (net462, net8.0, net9.0, UWP, WinUI).
• MSTestAdapter.PlatformServices.UnitTests: 897 (net8.0) / 935 (net462); MSTestAdapter.UnitTests: 21; MSTest.IntegrationTests: 47 pass / 1 skip — including TestCaseFilteringTests, the out-of-proc filter regression net.
• Expert MSTest/MTP reviewer: no material findings; definitive byte-for-byte verdict on the per-source parse-error timing/count and the null-provider equivalence.

Base / stacking

• Stacked on Phase 6c2 (Neutralize run-settings input in PlatformServices host layer (Phase 6c2) #9590). Base = dev/amauryleve/vstest-decoupling-settings; review/merge after Neutralize run-settings input in PlatformServices host layer (Phase 6c2) #9590. When 6c2 merges into vstest-decoupling-base, this PR is rebased onto the updated base (diff is 6d-1 only, 10 files).

Remaining work

• 6d-2: remove IRunContext/IDiscoveryContext from PlatformServices entirely (deploy-context + settings extraction to the boundary).
• Avoid double TestCase construction when filtering during discovery/execution (platform-agnostic refactor follow-up) #9568: filter no-round-trip optimization (only if provably byte-for-byte).
• 6e: relocate remaining bridges + the deep UnitTestElement↔TestCase conversion + EngineConstants.
• 7: remove the Microsoft.TestPlatform.ObjectModel PackageReference + guard test.

[github-actions]

Note

🤖 Automated review by GitHub Copilot. Posted via a maintainer's GitHub token, so it appears under their account — the account owner did not write or approve this content personally. Generated by the Expert Code Review workflow. To request a follow-up action, reply by tagging @copilot directly.

✅ 22/22 dimensions clean — no findings.

Folder hotspot coverage: All changed files fall under src/Adapter/ (correctness, threading, API) and test/ (assertions, isolation, flakiness) — both clusters received priority analysis.

Spot-checks verified:

• Threading safety of _testElementFilterProvider: The new non-readonly field is written once in ExecuteTestsAsync before the sequential foreach/await loop; the parallel workers spawned inside ExecuteTestsInSourceAsync capture a local ITestElementFilter? variable (the result of GetTestElementFilter) and never touch the field directly. No unsynchronized cross-thread access.

• ?. + out bool initialization pattern: bool filterHasError = false; ITestElementFilter? filter = filterProvider?.GetTestElementFilter(logger, out filterHasError); — when filterProvider is null the pre-init false is the correct value (no filter = no error), and the if (filterHasError) return; guard is not triggered. Correct for the MTP no-filter path.

• Per-source call count: GetTestElementFilter is called once per source in discovery and once per source in execution (same as the old code with separate TestMethodFilter instances). Error-message count is unchanged.

• TestMethodFilter state: _supportedProperties is populated once in the constructor and only read thereafter; concurrent TryGetValue reads from parallel test-filter matching are safe on an unmodified Dictionary<K,V>.

• Public API surface: ITestElementFilterProvider and TestElementFilterProvider are both internal; no public API is added, removed, or changed.

• Assertion library: MSTestAdapter.PlatformServices.UnitTests bans MSTest Assert/StringAssert/CollectionAssert and requires AwesomeAssertions — all updated test call sites use .Should() correctly.

• Project references: MSTestAdapter.PlatformServices.UnitTests.csproj already references MSTest.TestAdapter.csproj, so TestElementFilterProvider is accessible from the updated tests.

[Amaury Levé (Evangelink)]

Phase 6d-1 of the PlatformServices platform-agnostic initiative

Part of removing the VSTest object model (Microsoft.TestPlatform.ObjectModel) dependency from MSTestAdapter.PlatformServices.

This phase moves the test-case filter parsing to the adapter boundary. TestMethodFilter (which parses the VSTest ITestCaseFilterExpression from IRunContext/IDiscoveryContext.GetTestCaseFilter) moves out of PlatformServices into MSTest.TestAdapter, and the engine/discoverer receive an injected neutral ITestElementFilter via a new ITestElementFilterProvider abstraction.

What changed

• New ITestElementFilterProvider (PlatformServices.Interface): ITestElementFilter? GetTestElementFilter(IAdapterMessageLogger, out bool filterHasError).
• Moved TestMethodFilter (+ nested TestElementFilter) → MSTest.TestAdapter (class body byte-identical); added a boundary TestElementFilterProvider that closes over the VSTest context.
• The boundary (MSTestExecutor, MSTestDiscoverer — which the MTP MSTestBridgedTestFramework also routes through) builds new TestElementFilterProvider(context) and injects it into TestExecutionManager.RunTestsAsync/ExecuteTestsAsync and UnitTestDiscoverer.DiscoverTests.
• The engine/discoverer invoke the provider at the exact same call sites they previously built the filter (per source), so parse-error reporting keeps the same timing and per-source count.

No behavior change

TestElementFilter.Matches still does element.ToTestCase() (byte-for-byte; the #9568 no-round-trip optimization is deferred as its own follow-up). This removes ITestCaseFilterExpression / GetTestCaseFilter / MatchTestCase / the VSTest filter TestProperty set from PlatformServices code. IRunContext/IDiscoveryContext remain only for deployment + settings extraction (removed in 6d-2).

Verification

• Full build green across all TFMs (net462, net8.0, net9.0, UWP, WinUI).
• MSTestAdapter.PlatformServices.UnitTests: 897 (net8.0) / 935 (net462); MSTestAdapter.UnitTests: 21; MSTest.IntegrationTests: 47 pass / 1 skip — including TestCaseFilteringTests, the out-of-proc filter regression net.
• Expert MSTest/MTP reviewer: no material findings; definitive byte-for-byte verdict on the per-source parse-error timing/count and the null-provider equivalence.

Base / stacking

• Stacked on Phase 6c2 (Neutralize run-settings input in PlatformServices host layer (Phase 6c2) #9590). Base = dev/amauryleve/vstest-decoupling-settings; review/merge after Neutralize run-settings input in PlatformServices host layer (Phase 6c2) #9590. When 6c2 merges into vstest-decoupling-base, this PR is rebased onto the updated base (diff is 6d-1 only, 10 files).

Remaining work

• 6d-2: remove IRunContext/IDiscoveryContext from PlatformServices entirely (deploy-context + settings extraction to the boundary).
• Avoid double TestCase construction when filtering during discovery/execution (platform-agnostic refactor follow-up) #9568: filter no-round-trip optimization (only if provably byte-for-byte).
• 6e: relocate remaining bridges + the deep UnitTestElement↔TestCase conversion + EngineConstants.
• 7: remove the Microsoft.TestPlatform.ObjectModel PackageReference + guard test.

[github-actions]

Note

🤖 Automated review by GitHub Copilot. Posted via a maintainer's GitHub token, so it appears under their account — the account owner did not write or approve this content personally. Generated by the Expert Code Review workflow. To request a follow-up action, reply by tagging @copilot directly.

✅ 22/22 dimensions clean — no findings.

Folder hotspot coverage: All changed files fall under src/Adapter/ (correctness, threading, API) and test/ (assertions, isolation, flakiness) — both clusters received priority analysis.

Spot-checks verified:

• Threading safety of _testElementFilterProvider: The new non-readonly field is written once in ExecuteTestsAsync before the sequential foreach/await loop; the parallel workers spawned inside ExecuteTestsInSourceAsync capture a local ITestElementFilter? variable (the result of GetTestElementFilter) and never touch the field directly. No unsynchronized cross-thread access.

• ?. + out bool initialization pattern: bool filterHasError = false; ITestElementFilter? filter = filterProvider?.GetTestElementFilter(logger, out filterHasError); — when filterProvider is null the pre-init false is the correct value (no filter = no error), and the if (filterHasError) return; guard is not triggered. Correct for the MTP no-filter path.

• Per-source call count: GetTestElementFilter is called once per source in discovery and once per source in execution (same as the old code with separate TestMethodFilter instances). Error-message count is unchanged.

• TestMethodFilter state: _supportedProperties is populated once in the constructor and only read thereafter; concurrent TryGetValue reads from parallel test-filter matching are safe on an unmodified Dictionary<K,V>.

• Public API surface: ITestElementFilterProvider and TestElementFilterProvider are both internal; no public API is added, removed, or changed.

• Assertion library: MSTestAdapter.PlatformServices.UnitTests bans MSTest Assert/StringAssert/CollectionAssert and requires AwesomeAssertions — all updated test call sites use .Should() correctly.

• Project references: MSTestAdapter.PlatformServices.UnitTests.csproj already references MSTest.TestAdapter.csproj, so TestElementFilterProvider is accessible from the updated tests.

[Amaury Levé (Evangelink)]

Phase 6d-1 of the PlatformServices platform-agnostic initiative

Part of removing the VSTest object model (Microsoft.TestPlatform.ObjectModel) dependency from MSTestAdapter.PlatformServices.

This phase moves the test-case filter parsing to the adapter boundary. TestMethodFilter (which parses the VSTest ITestCaseFilterExpression from IRunContext/IDiscoveryContext.GetTestCaseFilter) moves out of PlatformServices into MSTest.TestAdapter, and the engine/discoverer receive an injected neutral ITestElementFilter via a new ITestElementFilterProvider abstraction.

What changed

• New ITestElementFilterProvider (PlatformServices.Interface): ITestElementFilter? GetTestElementFilter(IAdapterMessageLogger, out bool filterHasError).
• Moved TestMethodFilter (+ nested TestElementFilter) → MSTest.TestAdapter (class body byte-identical); added a boundary TestElementFilterProvider that closes over the VSTest context.
• The boundary (MSTestExecutor, MSTestDiscoverer — which the MTP MSTestBridgedTestFramework also routes through) builds new TestElementFilterProvider(context) and injects it into TestExecutionManager.RunTestsAsync/ExecuteTestsAsync and UnitTestDiscoverer.DiscoverTests.
• The engine/discoverer invoke the provider at the exact same call sites they previously built the filter (per source), so parse-error reporting keeps the same timing and per-source count.

No behavior change

TestElementFilter.Matches still does element.ToTestCase() (byte-for-byte; the #9568 no-round-trip optimization is deferred as its own follow-up). This removes ITestCaseFilterExpression / GetTestCaseFilter / MatchTestCase / the VSTest filter TestProperty set from PlatformServices code. IRunContext/IDiscoveryContext remain only for deployment + settings extraction (removed in 6d-2).

Verification

• Full build green across all TFMs (net462, net8.0, net9.0, UWP, WinUI).
• MSTestAdapter.PlatformServices.UnitTests: 897 (net8.0) / 935 (net462); MSTestAdapter.UnitTests: 21; MSTest.IntegrationTests: 47 pass / 1 skip — including TestCaseFilteringTests, the out-of-proc filter regression net.
• Expert MSTest/MTP reviewer: no material findings; definitive byte-for-byte verdict on the per-source parse-error timing/count and the null-provider equivalence.

Base / stacking

• Stacked on Phase 6c2 (Neutralize run-settings input in PlatformServices host layer (Phase 6c2) #9590). Base = dev/amauryleve/vstest-decoupling-settings; review/merge after Neutralize run-settings input in PlatformServices host layer (Phase 6c2) #9590. When 6c2 merges into vstest-decoupling-base, this PR is rebased onto the updated base (diff is 6d-1 only, 10 files).

Remaining work

• 6d-2: remove IRunContext/IDiscoveryContext from PlatformServices entirely (deploy-context + settings extraction to the boundary).
• Avoid double TestCase construction when filtering during discovery/execution (platform-agnostic refactor follow-up) #9568: filter no-round-trip optimization (only if provably byte-for-byte).
• 6e: relocate remaining bridges + the deep UnitTestElement↔TestCase conversion + EngineConstants.
• 7: remove the Microsoft.TestPlatform.ObjectModel PackageReference + guard test.

[github-actions]

Note

🤖 Automated review by GitHub Copilot. Posted via a maintainer's GitHub token, so it appears under their account — the account owner did not write or approve this content personally. Generated by the Expert Code Review workflow. To request a follow-up action, reply by tagging @copilot directly.

✅ 22/22 dimensions clean — no findings.

Folder hotspot coverage: All changed files fall under src/Adapter/ (correctness, threading, API) and test/ (assertions, isolation, flakiness) — both clusters received priority analysis.

Spot-checks verified:

• Threading safety of _testElementFilterProvider: The new non-readonly field is written once in ExecuteTestsAsync before the sequential foreach/await loop; the parallel workers spawned inside ExecuteTestsInSourceAsync capture a local ITestElementFilter? variable (the result of GetTestElementFilter) and never touch the field directly. No unsynchronized cross-thread access.

• ?. + out bool initialization pattern: bool filterHasError = false; ITestElementFilter? filter = filterProvider?.GetTestElementFilter(logger, out filterHasError); — when filterProvider is null the pre-init false is the correct value (no filter = no error), and the if (filterHasError) return; guard is not triggered. Correct for the MTP no-filter path.

• Per-source call count: GetTestElementFilter is called once per source in discovery and once per source in execution (same as the old code with separate TestMethodFilter instances). Error-message count is unchanged.

• TestMethodFilter state: _supportedProperties is populated once in the constructor and only read thereafter; concurrent TryGetValue reads from parallel test-filter matching are safe on an unmodified Dictionary<K,V>.

• Public API surface: ITestElementFilterProvider and TestElementFilterProvider are both internal; no public API is added, removed, or changed.

• Assertion library: MSTestAdapter.PlatformServices.UnitTests bans MSTest Assert/StringAssert/CollectionAssert and requires AwesomeAssertions — all updated test call sites use .Should() correctly.

• Project references: MSTestAdapter.PlatformServices.UnitTests.csproj already references MSTest.TestAdapter.csproj, so TestElementFilterProvider is accessible from the updated tests.

[Amaury Levé (Evangelink)]

Phase 6d-1 of the PlatformServices platform-agnostic initiative

Part of removing the VSTest object model (Microsoft.TestPlatform.ObjectModel) dependency from MSTestAdapter.PlatformServices.

This phase moves the test-case filter parsing to the adapter boundary. TestMethodFilter (which parses the VSTest ITestCaseFilterExpression from IRunContext/IDiscoveryContext.GetTestCaseFilter) moves out of PlatformServices into MSTest.TestAdapter, and the engine/discoverer receive an injected neutral ITestElementFilter via a new ITestElementFilterProvider abstraction.

What changed

• New ITestElementFilterProvider (PlatformServices.Interface): ITestElementFilter? GetTestElementFilter(IAdapterMessageLogger, out bool filterHasError).
• Moved TestMethodFilter (+ nested TestElementFilter) → MSTest.TestAdapter (class body byte-identical); added a boundary TestElementFilterProvider that closes over the VSTest context.
• The boundary (MSTestExecutor, MSTestDiscoverer — which the MTP MSTestBridgedTestFramework also routes through) builds new TestElementFilterProvider(context) and injects it into TestExecutionManager.RunTestsAsync/ExecuteTestsAsync and UnitTestDiscoverer.DiscoverTests.
• The engine/discoverer invoke the provider at the exact same call sites they previously built the filter (per source), so parse-error reporting keeps the same timing and per-source count.

No behavior change

TestElementFilter.Matches still does element.ToTestCase() (byte-for-byte; the #9568 no-round-trip optimization is deferred as its own follow-up). This removes ITestCaseFilterExpression / GetTestCaseFilter / MatchTestCase / the VSTest filter TestProperty set from PlatformServices code. IRunContext/IDiscoveryContext remain only for deployment + settings extraction (removed in 6d-2).

Verification

• Full build green across all TFMs (net462, net8.0, net9.0, UWP, WinUI).
• MSTestAdapter.PlatformServices.UnitTests: 897 (net8.0) / 935 (net462); MSTestAdapter.UnitTests: 21; MSTest.IntegrationTests: 47 pass / 1 skip — including TestCaseFilteringTests, the out-of-proc filter regression net.
• Expert MSTest/MTP reviewer: no material findings; definitive byte-for-byte verdict on the per-source parse-error timing/count and the null-provider equivalence.

Base / stacking

• Stacked on Phase 6c2 (Neutralize run-settings input in PlatformServices host layer (Phase 6c2) #9590). Base = dev/amauryleve/vstest-decoupling-settings; review/merge after Neutralize run-settings input in PlatformServices host layer (Phase 6c2) #9590. When 6c2 merges into vstest-decoupling-base, this PR is rebased onto the updated base (diff is 6d-1 only, 10 files).

Remaining work

• 6d-2: remove IRunContext/IDiscoveryContext from PlatformServices entirely (deploy-context + settings extraction to the boundary).
• Avoid double TestCase construction when filtering during discovery/execution (platform-agnostic refactor follow-up) #9568: filter no-round-trip optimization (only if provably byte-for-byte).
• 6e: relocate remaining bridges + the deep UnitTestElement↔TestCase conversion + EngineConstants.
• 7: remove the Microsoft.TestPlatform.ObjectModel PackageReference + guard test.

[github-actions]

Note

🤖 Automated review by GitHub Copilot. Posted via a maintainer's GitHub token, so it appears under their account — the account owner did not write or approve this content personally. Generated by the Expert Code Review workflow. To request a follow-up action, reply by tagging @copilot directly.

✅ 22/22 dimensions clean — no findings.

Folder hotspot coverage: All changed files fall under src/Adapter/ (correctness, threading, API) and test/ (assertions, isolation, flakiness) — both clusters received priority analysis.

Spot-checks verified:

• Threading safety of _testElementFilterProvider: The new non-readonly field is written once in ExecuteTestsAsync before the sequential foreach/await loop; the parallel workers spawned inside ExecuteTestsInSourceAsync capture a local ITestElementFilter? variable (the result of GetTestElementFilter) and never touch the field directly. No unsynchronized cross-thread access.

• ?. + out bool initialization pattern: bool filterHasError = false; ITestElementFilter? filter = filterProvider?.GetTestElementFilter(logger, out filterHasError); — when filterProvider is null the pre-init false is the correct value (no filter = no error), and the if (filterHasError) return; guard is not triggered. Correct for the MTP no-filter path.

• Per-source call count: GetTestElementFilter is called once per source in discovery and once per source in execution (same as the old code with separate TestMethodFilter instances). Error-message count is unchanged.

• TestMethodFilter state: _supportedProperties is populated once in the constructor and only read thereafter; concurrent TryGetValue reads from parallel test-filter matching are safe on an unmodified Dictionary<K,V>.

• Public API surface: ITestElementFilterProvider and TestElementFilterProvider are both internal; no public API is added, removed, or changed.

• Assertion library: MSTestAdapter.PlatformServices.UnitTests bans MSTest Assert/StringAssert/CollectionAssert and requires AwesomeAssertions — all updated test call sites use .Should() correctly.

• Project references: MSTestAdapter.PlatformServices.UnitTests.csproj already references MSTest.TestAdapter.csproj, so TestElementFilterProvider is accessible from the updated tests.

[Amaury Levé (Evangelink)]

Phase 6d-1 of the PlatformServices platform-agnostic initiative

Part of removing the VSTest object model (Microsoft.TestPlatform.ObjectModel) dependency from MSTestAdapter.PlatformServices.

This phase moves the test-case filter parsing to the adapter boundary. TestMethodFilter (which parses the VSTest ITestCaseFilterExpression from IRunContext/IDiscoveryContext.GetTestCaseFilter) moves out of PlatformServices into MSTest.TestAdapter, and the engine/discoverer receive an injected neutral ITestElementFilter via a new ITestElementFilterProvider abstraction.

What changed

• New ITestElementFilterProvider (PlatformServices.Interface): ITestElementFilter? GetTestElementFilter(IAdapterMessageLogger, out bool filterHasError).
• Moved TestMethodFilter (+ nested TestElementFilter) → MSTest.TestAdapter (class body byte-identical); added a boundary TestElementFilterProvider that closes over the VSTest context.
• The boundary (MSTestExecutor, MSTestDiscoverer — which the MTP MSTestBridgedTestFramework also routes through) builds new TestElementFilterProvider(context) and injects it into TestExecutionManager.RunTestsAsync/ExecuteTestsAsync and UnitTestDiscoverer.DiscoverTests.
• The engine/discoverer invoke the provider at the exact same call sites they previously built the filter (per source), so parse-error reporting keeps the same timing and per-source count.

No behavior change

TestElementFilter.Matches still does element.ToTestCase() (byte-for-byte; the #9568 no-round-trip optimization is deferred as its own follow-up). This removes ITestCaseFilterExpression / GetTestCaseFilter / MatchTestCase / the VSTest filter TestProperty set from PlatformServices code. IRunContext/IDiscoveryContext remain only for deployment + settings extraction (removed in 6d-2).

Verification

• Full build green across all TFMs (net462, net8.0, net9.0, UWP, WinUI).
• MSTestAdapter.PlatformServices.UnitTests: 897 (net8.0) / 935 (net462); MSTestAdapter.UnitTests: 21; MSTest.IntegrationTests: 47 pass / 1 skip — including TestCaseFilteringTests, the out-of-proc filter regression net.
• Expert MSTest/MTP reviewer: no material findings; definitive byte-for-byte verdict on the per-source parse-error timing/count and the null-provider equivalence.

Base / stacking

• Stacked on Phase 6c2 (Neutralize run-settings input in PlatformServices host layer (Phase 6c2) #9590). Base = dev/amauryleve/vstest-decoupling-settings; review/merge after Neutralize run-settings input in PlatformServices host layer (Phase 6c2) #9590. When 6c2 merges into vstest-decoupling-base, this PR is rebased onto the updated base (diff is 6d-1 only, 10 files).

Remaining work

• 6d-2: remove IRunContext/IDiscoveryContext from PlatformServices entirely (deploy-context + settings extraction to the boundary).
• Avoid double TestCase construction when filtering during discovery/execution (platform-agnostic refactor follow-up) #9568: filter no-round-trip optimization (only if provably byte-for-byte).
• 6e: relocate remaining bridges + the deep UnitTestElement↔TestCase conversion + EngineConstants.
• 7: remove the Microsoft.TestPlatform.ObjectModel PackageReference + guard test.

[github-actions]

Note

🤖 Automated review by GitHub Copilot. Posted via a maintainer's GitHub token, so it appears under their account — the account owner did not write or approve this content personally. Generated by the Expert Code Review workflow. To request a follow-up action, reply by tagging @copilot directly.

✅ 22/22 dimensions clean — no findings.

Folder hotspot coverage: All changed files fall under src/Adapter/ (correctness, threading, API) and test/ (assertions, isolation, flakiness) — both clusters received priority analysis.

Spot-checks verified:

• Threading safety of _testElementFilterProvider: The new non-readonly field is written once in ExecuteTestsAsync before the sequential foreach/await loop; the parallel workers spawned inside ExecuteTestsInSourceAsync capture a local ITestElementFilter? variable (the result of GetTestElementFilter) and never touch the field directly. No unsynchronized cross-thread access.

• ?. + out bool initialization pattern: bool filterHasError = false; ITestElementFilter? filter = filterProvider?.GetTestElementFilter(logger, out filterHasError); — when filterProvider is null the pre-init false is the correct value (no filter = no error), and the if (filterHasError) return; guard is not triggered. Correct for the MTP no-filter path.

• Per-source call count: GetTestElementFilter is called once per source in discovery and once per source in execution (same as the old code with separate TestMethodFilter instances). Error-message count is unchanged.

• TestMethodFilter state: _supportedProperties is populated once in the constructor and only read thereafter; concurrent TryGetValue reads from parallel test-filter matching are safe on an unmodified Dictionary<K,V>.

• Public API surface: ITestElementFilterProvider and TestElementFilterProvider are both internal; no public API is added, removed, or changed.

• Assertion library: MSTestAdapter.PlatformServices.UnitTests bans MSTest Assert/StringAssert/CollectionAssert and requires AwesomeAssertions — all updated test call sites use .Should() correctly.

• Project references: MSTestAdapter.PlatformServices.UnitTests.csproj already references MSTest.TestAdapter.csproj, so TestElementFilterProvider is accessible from the updated tests.

[Amaury Levé (Evangelink)]

Phase 6d-1 of the PlatformServices platform-agnostic initiative

Part of removing the VSTest object model (Microsoft.TestPlatform.ObjectModel) dependency from MSTestAdapter.PlatformServices.

This phase moves the test-case filter parsing to the adapter boundary. TestMethodFilter (which parses the VSTest ITestCaseFilterExpression from IRunContext/IDiscoveryContext.GetTestCaseFilter) moves out of PlatformServices into MSTest.TestAdapter, and the engine/discoverer receive an injected neutral ITestElementFilter via a new ITestElementFilterProvider abstraction.

What changed

• New ITestElementFilterProvider (PlatformServices.Interface): ITestElementFilter? GetTestElementFilter(IAdapterMessageLogger, out bool filterHasError).
• Moved TestMethodFilter (+ nested TestElementFilter) → MSTest.TestAdapter (class body byte-identical); added a boundary TestElementFilterProvider that closes over the VSTest context.
• The boundary (MSTestExecutor, MSTestDiscoverer — which the MTP MSTestBridgedTestFramework also routes through) builds new TestElementFilterProvider(context) and injects it into TestExecutionManager.RunTestsAsync/ExecuteTestsAsync and UnitTestDiscoverer.DiscoverTests.
• The engine/discoverer invoke the provider at the exact same call sites they previously built the filter (per source), so parse-error reporting keeps the same timing and per-source count.

No behavior change

TestElementFilter.Matches still does element.ToTestCase() (byte-for-byte; the #9568 no-round-trip optimization is deferred as its own follow-up). This removes ITestCaseFilterExpression / GetTestCaseFilter / MatchTestCase / the VSTest filter TestProperty set from PlatformServices code. IRunContext/IDiscoveryContext remain only for deployment + settings extraction (removed in 6d-2).

Verification

• Full build green across all TFMs (net462, net8.0, net9.0, UWP, WinUI).
• MSTestAdapter.PlatformServices.UnitTests: 897 (net8.0) / 935 (net462); MSTestAdapter.UnitTests: 21; MSTest.IntegrationTests: 47 pass / 1 skip — including TestCaseFilteringTests, the out-of-proc filter regression net.
• Expert MSTest/MTP reviewer: no material findings; definitive byte-for-byte verdict on the per-source parse-error timing/count and the null-provider equivalence.

Base / stacking

• Stacked on Phase 6c2 (Neutralize run-settings input in PlatformServices host layer (Phase 6c2) #9590). Base = dev/amauryleve/vstest-decoupling-settings; review/merge after Neutralize run-settings input in PlatformServices host layer (Phase 6c2) #9590. When 6c2 merges into vstest-decoupling-base, this PR is rebased onto the updated base (diff is 6d-1 only, 10 files).

Remaining work

• 6d-2: remove IRunContext/IDiscoveryContext from PlatformServices entirely (deploy-context + settings extraction to the boundary).
• Avoid double TestCase construction when filtering during discovery/execution (platform-agnostic refactor follow-up) #9568: filter no-round-trip optimization (only if provably byte-for-byte).
• 6e: relocate remaining bridges + the deep UnitTestElement↔TestCase conversion + EngineConstants.
• 7: remove the Microsoft.TestPlatform.ObjectModel PackageReference + guard test.

[github-actions]

Note

🤖 Automated review by GitHub Copilot. Posted via a maintainer's GitHub token, so it appears under their account — the account owner did not write or approve this content personally. Generated by the Expert Code Review workflow. To request a follow-up action, reply by tagging @copilot directly.

✅ 22/22 dimensions clean — no findings.

Folder hotspot coverage: All changed files fall under src/Adapter/ (correctness, threading, API) and test/ (assertions, isolation, flakiness) — both clusters received priority analysis.

Spot-checks verified:

• Threading safety of _testElementFilterProvider: The new non-readonly field is written once in ExecuteTestsAsync before the sequential foreach/await loop; the parallel workers spawned inside ExecuteTestsInSourceAsync capture a local ITestElementFilter? variable (the result of GetTestElementFilter) and never touch the field directly. No unsynchronized cross-thread access.

• ?. + out bool initialization pattern: bool filterHasError = false; ITestElementFilter? filter = filterProvider?.GetTestElementFilter(logger, out filterHasError); — when filterProvider is null the pre-init false is the correct value (no filter = no error), and the if (filterHasError) return; guard is not triggered. Correct for the MTP no-filter path.

• Per-source call count: GetTestElementFilter is called once per source in discovery and once per source in execution (same as the old code with separate TestMethodFilter instances). Error-message count is unchanged.

• TestMethodFilter state: _supportedProperties is populated once in the constructor and only read thereafter; concurrent TryGetValue reads from parallel test-filter matching are safe on an unmodified Dictionary<K,V>.

• Public API surface: ITestElementFilterProvider and TestElementFilterProvider are both internal; no public API is added, removed, or changed.

• Assertion library: MSTestAdapter.PlatformServices.UnitTests bans MSTest Assert/StringAssert/CollectionAssert and requires AwesomeAssertions — all updated test call sites use .Should() correctly.

• Project references: MSTestAdapter.PlatformServices.UnitTests.csproj already references MSTest.TestAdapter.csproj, so TestElementFilterProvider is accessible from the updated tests.