Uh oh!
There was an error while loading. Please reload this page.
Abstract VSTest test filtering in PlatformServices (Phase 2 of platform-agnostic effort) - #9567
Merged
Merged
Conversation
…rm-agnostic effort) (#9555) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR continues the platform-agnostic refactor of MSTestAdapter.PlatformServices by abstracting VSTest’s filter object model behind a neutral ITestElementFilter predicate, so discovery/execution can apply filtering without referencing ITestCaseFilterExpression directly.
Changes:
- Add internal
ITestElementFilterand aTestMethodFilter.GetTestElementFilter(...)bridge that wraps the VSTest filter expression behind aMatches(UnitTestElement)predicate. - Update discovery (
UnitTestDiscoverer.SendTestCases) and execution (TestExecutionManagerfiltering path) to route filtering throughITestElementFilter. - Add unit + integration regression tests covering discovery and execution filtering by
FullyQualifiedNameandId, including a cross-process simulation (LocalExtensionData = null).
Show a summary per file
| File | Description |
|---|---|
| test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TestMethodFilterTests.cs | Adds unit coverage for GetTestElementFilter behavior (null/no-filter/match/error). |
| test/IntegrationTests/MSTest.IntegrationTests/Utilities/CLITestBase.discovery.cs | Adds a run-context helper overload to execute with a filter string for integration testing. |
| test/IntegrationTests/MSTest.IntegrationTests/TestCaseFilteringTests.cs | New end-to-end regression guard for discovery+execution filtering by FullyQualifiedName and Id. |
| src/Adapter/MSTestAdapter.PlatformServices/TestMethodFilter.cs | Introduces GetTestElementFilter and private TestElementFilter wrapper bridging to VSTest matching. |
| src/Adapter/MSTestAdapter.PlatformServices/Interfaces/ITestElementFilter.cs | Adds the neutral internal filter interface used by PlatformServices consumers. |
| src/Adapter/MSTestAdapter.PlatformServices/Execution/TestExecutionManager.Runner.cs | Refactors test filtering helper to use ITestElementFilter over reconstructed UnitTestElement. |
| src/Adapter/MSTestAdapter.PlatformServices/Execution/TestExecutionManager.Parallelization.cs | Switches execution-time filter acquisition from GetFilterExpression to GetTestElementFilter. |
| src/Adapter/MSTestAdapter.PlatformServices/Discovery/UnitTestDiscoverer.cs | Switches discovery-time filtering to use ITestElementFilter rather than VSTest filter expression directly. |
Review details
- Files reviewed: 8/8 changed files
- Comments generated: 2
- Review effort level: Low
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Amaury Levé (Evangelink)
enabled auto-merge (squash)
July 3, 2026 09:53
…lter The logger param docs on GetFilterExpression and GetTestElementFilter were copied from a recorder-style summary and inaccurately said the logger reports test start/end/results. IAdapterMessageLogger only reports diagnostic messages (e.g. filter parse errors); the docs now say so. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Petr Pokorny (0101)
approved these changes
Jul 3, 2026
ServerControlMessageSerializer is part of the shared 'dotnet test' protocol contract source, which must be standalone-compilable (no dependency on the rest of Microsoft.Testing.Platform). Using RoslynDebug broke the standalone contract test compile (CS0122). Replace it with BaseSerializer.DebugAssert, the self-contained helper intended for exactly this purpose. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Petr Pokorny (0101)
approved these changes
Jul 3, 2026
…-double return - TestExecutionManager: convert each TestCase to UnitTestElement exactly once by carrying a (TestCase, UnitTestElement) pair through filtering and shuffling, then projecting to both arrays. Previously the filtered path built one element in MatchTestFilter and a second when constructing unitTestElements. MatchTestFilter now takes the pre-converted element. - TestMethodFilterTests: return string.Empty instead of null! from the ITestCaseFilterExpression.TestCaseFilterValue test doubles, honoring the non-null contract. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Petr Pokorny (0101)
approved these changes
Jul 3, 2026
Uh oh!
There was an error while loading. Please reload this page.
Amaury Levé (Evangelink) added a commit
that referenced
this pull request
Jul 5, 2026
…ervices Squashed rebase of the vstest-decoupling PlatformServices stack onto main. Phases 1, 2 and 5 already landed on main via #9548/#9567/#9550; this commit carries the remaining net-new work: - Phase 3 (#9566): abstract the VSTest discovery sink (IUnitTestElementSink). - Phase 4 (#9572): abstract VSTest execution input. - Phase 6a (#9576): neutralize deployment input (DeploymentContext). - Phase 6b (#9579): neutralize test result recording (ITestResultRecorder). - Phase 6c (#9585): neutralize test message logging. - Phase 6c2: neutralize run-settings input in the host layer (settingsXml). - Phase 6d-1: move test-case filter parsing to the adapter boundary (ITestElementFilterProvider / TestElementFilterProvider). - Phase 6d-2: remove IRunContext/IDiscoveryContext from PlatformServices. - Phase 6e-1 (#9622): remove IFrameworkHandle from the execution engine. - Phase 6e-2 (#9623): relocate VSTest logger/sink bridges to the adapter. - Phase 6e-3a (#9624): neutralize the trait type on UnitTestElement. Result: MSTestAdapter.PlatformServices no longer references the VSTest run/discovery context or result object model; those types live only at the MSTest.TestAdapter boundary. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Amaury Levé (Evangelink) added a commit
that referenced
this pull request
Jul 5, 2026
…ervices Squashed rebase of the vstest-decoupling PlatformServices stack onto main. Phases 1, 2 and 5 already landed on main via #9548/#9567/#9550; this commit carries the remaining net-new work: - Phase 3 (#9566): abstract the VSTest discovery sink (IUnitTestElementSink). - Phase 4 (#9572): abstract VSTest execution input. - Phase 6a (#9576): neutralize deployment input (DeploymentContext). - Phase 6b (#9579): neutralize test result recording (ITestResultRecorder). - Phase 6c (#9585): neutralize test message logging. - Phase 6c2: neutralize run-settings input in the host layer (settingsXml). - Phase 6d-1: move test-case filter parsing to the adapter boundary (ITestElementFilterProvider / TestElementFilterProvider). - Phase 6d-2: remove IRunContext/IDiscoveryContext from PlatformServices. - Phase 6e-1 (#9622): remove IFrameworkHandle from the execution engine. - Phase 6e-2 (#9623): relocate VSTest logger/sink bridges to the adapter. - Phase 6e-3a (#9624): neutralize the trait type on UnitTestElement. Result: MSTestAdapter.PlatformServices no longer references the VSTest run/discovery context or result object model; those types live only at the MSTest.TestAdapter boundary. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
Continues the effort to make
MSTestAdapter.PlatformServicesplatform-agnostic by removing its dependency on the VSTest object model. Phase 1 (message logging, #9548) and Phase 5 (result reporting, #9550) have merged tomain; this brings Phase 2 (test filtering) tomain.This is the same change previously reviewed and approved as #9555 (which merged into the integration branch
dev/amauryleve/vstest-decoupling-base). It is re-based cleanly onto currentmainhere as a standalone, Phase-2-only PR now that its prerequisites have landed.What
ITestElementFilter { bool Matches(UnitTestElement testElement); }inPlatformServices/Interfaces(null= include all).TestMethodFilteras the single VSTest translation bridge in PlatformServices (consistent with the Phase 1/5 bridges): it now exposesGetTestElementFilter(...)wrapping the parsedITestCaseFilterExpressionin a privateTestElementFilterthat reuseselement.ToTestCase()+MatchTestCase+PropertyValueProvider.UnitTestDiscoverer.SendTestCasesandTestExecutionManager(MatchTestFilter+ExecuteTestsInSourceAsync). Neither consumer referencesITestCaseFilterExpression/MatchTestCase/TestPropertyanymore.filterHasErrorbail-outs preserved byte-for-byte (discovery still enumerates + logs warnings before bailing; execution still early-bails before creating the isolationUnitTestRunner).No behavior change
Pure refactor. Filter parse errors, the supported-property set, the discovery-context vs run-context code paths, and every match result stay identical. Execution still filters on
TestCasethen converts survivors toUnitTestElementat the same logical point (unchanged surviving set / order / grouping).Includes an out-of-proc
--filterregression guard (TestCaseFilteringTests.cs) that nullsTestCase.LocalExtensionDatato force theTestCase → UnitTestElement → TestCasereconstruction path and asserts filtering by bothFullyQualifiedNameandIdselects exactly the expected test(s) on discovery and execution.Remaining move-to-adapter work (future phase)
TestMethodFilter(the VSTest filter parser) intentionally remains the lone VSTest filter bridge in PlatformServices for now; physically relocating it toMSTest.TestAdapteris entangled with per-sidefilterHasErrorsemantics and is deferred to a later phase.Verification
.\build.cmd -c Debuggreen across all TFMs; PlatformServices + adapter unit-test projects green; the 4 filtering regression tests pass.main(which already has Phase 1 + Phase 5); PlatformServices and its unit-test project rebuild with 0 errors on the new base.