Abstract VSTest message logging in PlatformServices (Phase 1 of platform-agnostic effort) - #9548

Merged
Amaury Levé (Evangelink) merged 2 commits into
mainfrom
dev/amauryleve/abstract-vstest-types-platformservices
Jul 3, 2026
Merged

Abstract VSTest message logging in PlatformServices (Phase 1 of platform-agnostic effort)#9548
Amaury Levé (Evangelink) merged 2 commits into
mainfrom
dev/amauryleve/abstract-vstest-types-platformservices

Conversation

@Evangelink

Copy link
Copy Markdown
Member

Why

This is the first, self-contained slice of a larger effort to make MSTestAdapter.PlatformServices platform-agnostic by removing its dependency on the VSTest object model (Microsoft.TestPlatform.ObjectModel). The end goal is for the VSTest coupling to live only in the adapter layer (MSTest.TestAdapter), so the platform-services engine can eventually be driven by an MTP-native adapter without round-tripping through the VSTest bridge.

The full phased plan (0–8) is tracked separately; this PR delivers Phase 0 + Phase 1 (message logging) only, to keep the change reviewable.

What

Introduces a platform-agnostic message-logging abstraction and migrates the standalone logger role in PlatformServices off VSTest types. The VSTest connection is now made at the adapter boundary.

  • New neutral abstraction (functional, non-VSTest naming):
    • IAdapterMessageLoggerSendMessage(MessageLevel, string), reusing the existing neutral MessageLevel enum from TestFramework.Extensions.
    • AdapterMessageLoggerExtensions.ToAdapterMessageLogger(this IMessageLogger) — the single VSTest → neutral bridge (internal HostMessageLogger, maps via the pre-existing ToTestMessageLevel()).
  • Migrated to the neutral logger (IMessageLogger/TestMessageLevelIAdapterMessageLogger/MessageLevel): MSTestDiscovererHelpers, MSTestSettings.Configuration, MSTestSettings.RunSettingsXml, UnitTestDiscoverer, TestMethodFilter.
  • Adapter boundary wraps via frameworkHandle.ToAdapterMessageLogger() in MSTestDiscoverer / MSTestExecutor, plus the two execution sites that reuse the framework handle as a logger.

Deliberately out of scope

The recorder's dual logger role (IFrameworkHandle / ITestExecutionRecorder.SendMessage) is intentionally left for the later recorder phase, since there the logger and the recorder are the same object. The ToAdapterMessageLogger bridge stays in PlatformServices as a temporary translation point until that phase.

No behavior change

This is a pure refactor. The MessageLevelTestMessageLevel mapping is 1:1, and no message levels or paths were dropped. Tests keep their Mock<IMessageLogger> and wrap with .ToAdapterMessageLogger() at migrated call sites, so the existing Verify(... TestMessageLevel ...) assertions still exercise the mapping end-to-end.

Verification

  • Full Debug src build green across all TFMs (net462, net8.0, net9.0, UWP, WinUI).
  • MSTestAdapter.PlatformServices.UnitTests: 889 passed.
  • MSTestAdapter.UnitTests: 21 passed.
  • Reviewed with the expert MSTest reviewer agent (two passes); all findings addressed.

Introduce a platform-agnostic IAdapterMessageLogger abstraction (reusing the
existing MessageLevel enum) so the platform services layer no longer depends on
the VSTest IMessageLogger/TestMessageLevel for the standalone message-logger
role. The VSTest bridge (ToAdapterMessageLogger) lives in the adapter-facing
extension and is applied at the MSTestDiscoverer/MSTestExecutor boundary and at
the two execution sites that reuse the framework handle as a logger.
The recorder's dual logger role (IFrameworkHandle/ITestExecutionRecorder) is
intentionally left for the later recorder phase, since logger and recorder are
the same object there.
Tests keep their Mock<IMessageLogger> and wrap with .ToAdapterMessageLogger() at
migrated call sites, so TestMessageLevel Verify assertions are unchanged.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings July 1, 2026 15:08

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR is Phase 1 of the effort to make MSTestAdapter.PlatformServices platform-agnostic by abstracting adapter-to-host message logging away from VSTest’s object model and shifting the translation to the adapter boundary.

Changes:

  • Introduces a neutral message-logging contract (IAdapterMessageLogger) based on the existing MessageLevel enum.
  • Adds a single VSTest→neutral bridge (ToAdapterMessageLogger(this IMessageLogger)) and migrates PlatformServices call sites from IMessageLogger/TestMessageLevel to IAdapterMessageLogger/MessageLevel.
  • Updates adapter and test call sites to wrap existing IMessageLogger mocks/handles with .ToAdapterMessageLogger().
Show a summary per file
FileDescription
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/RunConfigurationSettingsTests.csUpdates settings population tests to pass the new adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/ObjectModel/UnitTestResultTests.csWraps logger when retrieving settings to keep outcome mapping tests exercising the bridge.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestSettingsTests.csMigrates settings/config tests to the new logger abstraction while retaining TestMessageLevel verifications.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Helpers/UnitTestOutcomeHelperTests.csUpdates settings initialization to use .ToAdapterMessageLogger().
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/UnitTestRunnerTests.csWraps logger in runner-related settings reads.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TypeCacheTests.csUpdates settings read/population paths to use the adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TestMethodFilterTests.csPasses an IAdapterMessageLogger into filter expression paths via wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TestExecutionManagerTests.csUpdates settings population during execution tests to use the adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/UnitTestDiscovererTests.csMigrates discovery tests and test doubles to IAdapterMessageLogger.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/TypeEnumeratorTests.csUpdates discovery settings initialization to use .ToAdapterMessageLogger().
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/AssemblyEnumeratorTests.csWraps logger when constructing settings for discovery enumerator tests.
test/IntegrationTests/MSTest.IntegrationTests/Utilities/CLITestBase.discovery.csUpdates integration discovery helper to pass the adapter logger wrapper.
src/Adapter/MSTestAdapter.PlatformServices/TestMethodFilter.csSwitches filter logging from IMessageLogger/TestMessageLevel to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/Services/AdapterMessageLoggerExtensions.csAdds the VSTest IMessageLoggerIAdapterMessageLogger bridge.
src/Adapter/MSTestAdapter.PlatformServices/MSTestSettings.RunSettingsXml.csMigrates runsettings parsing logging to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/MSTestSettings.Configuration.csMigrates configuration/runsettings warning logging to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/Interfaces/IAdapterMessageLogger.csIntroduces the platform-agnostic adapter message logger contract.
src/Adapter/MSTestAdapter.PlatformServices/Helpers/MSTestDiscovererHelpers.csUpdates discovery initialization logging to use the neutral logger.
src/Adapter/MSTestAdapter.PlatformServices/Execution/TestExecutionManager.Parallelization.csUpdates filter-expression acquisition to pass an adapter logger wrapper.
src/Adapter/MSTestAdapter.PlatformServices/Execution/TestExecutionManager.csCaches an IAdapterMessageLogger wrapper for framework-handle logging during discovery in execution.
src/Adapter/MSTest.TestAdapter/VSTestAdapter/MSTestExecutor.csWraps frameworkHandle at the adapter boundary before calling into PlatformServices.
src/Adapter/MSTest.TestAdapter/VSTestAdapter/MSTestDiscoverer.csWraps the VSTest logger once and threads the neutral logger through discovery.

Review details

  • Files reviewed: 23/23 changed files
  • Comments generated: 2
  • Review effort level: Low

- AdapterMessageLoggerExtensions: validate the logger argument (throw
ArgumentNullException instead of a later NullReferenceException) and make
ToAdapterMessageLogger internal to match the containing internal class.
- TestExecutionManager.Parallelization: cache a single IAdapterMessageLogger per
source instead of allocating a wrapper per call, and route the parallelization
banner and error SendMessage calls through it (removing the file's remaining
TestMessageLevel usage).
- MSTestSettingsTests: drop two dead-store local assignments flagged by CodeQL;
the GetSettings calls remain as statements so logging side effects and Verify
assertions are unchanged.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@EvangelinkAmaury Levé (Evangelink) added the state/needs-review Awaiting review from the team. label Jul 2, 2026
@Evangelink
Amaury Levé (Evangelink) merged commit f538608 into mainJul 3, 2026
51 of 52 checks passed
@Evangelink
Amaury Levé (Evangelink) deleted the dev/amauryleve/abstract-vstest-types-platformservices branch July 3, 2026 09:19
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>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

state/needs-reviewAwaiting review from the team.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Evangelink@0101
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Abstract VSTest message logging in PlatformServices (Phase 1 of platform-agnostic effort) - #9548

Merged
Amaury Levé (Evangelink) merged 2 commits into
mainfrom
dev/amauryleve/abstract-vstest-types-platformservices
Jul 3, 2026
Merged

Abstract VSTest message logging in PlatformServices (Phase 1 of platform-agnostic effort)#9548
Amaury Levé (Evangelink) merged 2 commits into
mainfrom
dev/amauryleve/abstract-vstest-types-platformservices

Conversation

@Evangelink

Copy link
Copy Markdown
Member

Why

This is the first, self-contained slice of a larger effort to make MSTestAdapter.PlatformServices platform-agnostic by removing its dependency on the VSTest object model (Microsoft.TestPlatform.ObjectModel). The end goal is for the VSTest coupling to live only in the adapter layer (MSTest.TestAdapter), so the platform-services engine can eventually be driven by an MTP-native adapter without round-tripping through the VSTest bridge.

The full phased plan (0–8) is tracked separately; this PR delivers Phase 0 + Phase 1 (message logging) only, to keep the change reviewable.

What

Introduces a platform-agnostic message-logging abstraction and migrates the standalone logger role in PlatformServices off VSTest types. The VSTest connection is now made at the adapter boundary.

  • New neutral abstraction (functional, non-VSTest naming):
    • IAdapterMessageLoggerSendMessage(MessageLevel, string), reusing the existing neutral MessageLevel enum from TestFramework.Extensions.
    • AdapterMessageLoggerExtensions.ToAdapterMessageLogger(this IMessageLogger) — the single VSTest → neutral bridge (internal HostMessageLogger, maps via the pre-existing ToTestMessageLevel()).
  • Migrated to the neutral logger (IMessageLogger/TestMessageLevelIAdapterMessageLogger/MessageLevel): MSTestDiscovererHelpers, MSTestSettings.Configuration, MSTestSettings.RunSettingsXml, UnitTestDiscoverer, TestMethodFilter.
  • Adapter boundary wraps via frameworkHandle.ToAdapterMessageLogger() in MSTestDiscoverer / MSTestExecutor, plus the two execution sites that reuse the framework handle as a logger.

Deliberately out of scope

The recorder's dual logger role (IFrameworkHandle / ITestExecutionRecorder.SendMessage) is intentionally left for the later recorder phase, since there the logger and the recorder are the same object. The ToAdapterMessageLogger bridge stays in PlatformServices as a temporary translation point until that phase.

No behavior change

This is a pure refactor. The MessageLevelTestMessageLevel mapping is 1:1, and no message levels or paths were dropped. Tests keep their Mock<IMessageLogger> and wrap with .ToAdapterMessageLogger() at migrated call sites, so the existing Verify(... TestMessageLevel ...) assertions still exercise the mapping end-to-end.

Verification

  • Full Debug src build green across all TFMs (net462, net8.0, net9.0, UWP, WinUI).
  • MSTestAdapter.PlatformServices.UnitTests: 889 passed.
  • MSTestAdapter.UnitTests: 21 passed.
  • Reviewed with the expert MSTest reviewer agent (two passes); all findings addressed.

Introduce a platform-agnostic IAdapterMessageLogger abstraction (reusing the
existing MessageLevel enum) so the platform services layer no longer depends on
the VSTest IMessageLogger/TestMessageLevel for the standalone message-logger
role. The VSTest bridge (ToAdapterMessageLogger) lives in the adapter-facing
extension and is applied at the MSTestDiscoverer/MSTestExecutor boundary and at
the two execution sites that reuse the framework handle as a logger.
The recorder's dual logger role (IFrameworkHandle/ITestExecutionRecorder) is
intentionally left for the later recorder phase, since logger and recorder are
the same object there.
Tests keep their Mock<IMessageLogger> and wrap with .ToAdapterMessageLogger() at
migrated call sites, so TestMessageLevel Verify assertions are unchanged.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings July 1, 2026 15:08

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR is Phase 1 of the effort to make MSTestAdapter.PlatformServices platform-agnostic by abstracting adapter-to-host message logging away from VSTest’s object model and shifting the translation to the adapter boundary.

Changes:

  • Introduces a neutral message-logging contract (IAdapterMessageLogger) based on the existing MessageLevel enum.
  • Adds a single VSTest→neutral bridge (ToAdapterMessageLogger(this IMessageLogger)) and migrates PlatformServices call sites from IMessageLogger/TestMessageLevel to IAdapterMessageLogger/MessageLevel.
  • Updates adapter and test call sites to wrap existing IMessageLogger mocks/handles with .ToAdapterMessageLogger().
Show a summary per file
FileDescription
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/RunConfigurationSettingsTests.csUpdates settings population tests to pass the new adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/ObjectModel/UnitTestResultTests.csWraps logger when retrieving settings to keep outcome mapping tests exercising the bridge.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestSettingsTests.csMigrates settings/config tests to the new logger abstraction while retaining TestMessageLevel verifications.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Helpers/UnitTestOutcomeHelperTests.csUpdates settings initialization to use .ToAdapterMessageLogger().
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/UnitTestRunnerTests.csWraps logger in runner-related settings reads.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TypeCacheTests.csUpdates settings read/population paths to use the adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TestMethodFilterTests.csPasses an IAdapterMessageLogger into filter expression paths via wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TestExecutionManagerTests.csUpdates settings population during execution tests to use the adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/UnitTestDiscovererTests.csMigrates discovery tests and test doubles to IAdapterMessageLogger.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/TypeEnumeratorTests.csUpdates discovery settings initialization to use .ToAdapterMessageLogger().
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/AssemblyEnumeratorTests.csWraps logger when constructing settings for discovery enumerator tests.
test/IntegrationTests/MSTest.IntegrationTests/Utilities/CLITestBase.discovery.csUpdates integration discovery helper to pass the adapter logger wrapper.
src/Adapter/MSTestAdapter.PlatformServices/TestMethodFilter.csSwitches filter logging from IMessageLogger/TestMessageLevel to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/Services/AdapterMessageLoggerExtensions.csAdds the VSTest IMessageLoggerIAdapterMessageLogger bridge.
src/Adapter/MSTestAdapter.PlatformServices/MSTestSettings.RunSettingsXml.csMigrates runsettings parsing logging to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/MSTestSettings.Configuration.csMigrates configuration/runsettings warning logging to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/Interfaces/IAdapterMessageLogger.csIntroduces the platform-agnostic adapter message logger contract.
src/Adapter/MSTestAdapter.PlatformServices/Helpers/MSTestDiscovererHelpers.csUpdates discovery initialization logging to use the neutral logger.
src/Adapter/MSTestAdapter.PlatformServices/Execution/TestExecutionManager.Parallelization.csUpdates filter-expression acquisition to pass an adapter logger wrapper.
src/Adapter/MSTestAdapter.PlatformServices/Execution/TestExecutionManager.csCaches an IAdapterMessageLogger wrapper for framework-handle logging during discovery in execution.
src/Adapter/MSTest.TestAdapter/VSTestAdapter/MSTestExecutor.csWraps frameworkHandle at the adapter boundary before calling into PlatformServices.
src/Adapter/MSTest.TestAdapter/VSTestAdapter/MSTestDiscoverer.csWraps the VSTest logger once and threads the neutral logger through discovery.

Review details

  • Files reviewed: 23/23 changed files
  • Comments generated: 2
  • Review effort level: Low

- AdapterMessageLoggerExtensions: validate the logger argument (throw
ArgumentNullException instead of a later NullReferenceException) and make
ToAdapterMessageLogger internal to match the containing internal class.
- TestExecutionManager.Parallelization: cache a single IAdapterMessageLogger per
source instead of allocating a wrapper per call, and route the parallelization
banner and error SendMessage calls through it (removing the file's remaining
TestMessageLevel usage).
- MSTestSettingsTests: drop two dead-store local assignments flagged by CodeQL;
the GetSettings calls remain as statements so logging side effects and Verify
assertions are unchanged.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@EvangelinkAmaury Levé (Evangelink) added the state/needs-review Awaiting review from the team. label Jul 2, 2026
@Evangelink
Amaury Levé (Evangelink) merged commit f538608 into mainJul 3, 2026
51 of 52 checks passed
@Evangelink
Amaury Levé (Evangelink) deleted the dev/amauryleve/abstract-vstest-types-platformservices branch July 3, 2026 09:19
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>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

state/needs-reviewAwaiting review from the team.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Evangelink@0101
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Abstract VSTest message logging in PlatformServices (Phase 1 of platform-agnostic effort) - #9548

Merged
Amaury Levé (Evangelink) merged 2 commits into
mainfrom
dev/amauryleve/abstract-vstest-types-platformservices
Jul 3, 2026
Merged

Abstract VSTest message logging in PlatformServices (Phase 1 of platform-agnostic effort)#9548
Amaury Levé (Evangelink) merged 2 commits into
mainfrom
dev/amauryleve/abstract-vstest-types-platformservices

Conversation

@Evangelink

Copy link
Copy Markdown
Member

Why

This is the first, self-contained slice of a larger effort to make MSTestAdapter.PlatformServices platform-agnostic by removing its dependency on the VSTest object model (Microsoft.TestPlatform.ObjectModel). The end goal is for the VSTest coupling to live only in the adapter layer (MSTest.TestAdapter), so the platform-services engine can eventually be driven by an MTP-native adapter without round-tripping through the VSTest bridge.

The full phased plan (0–8) is tracked separately; this PR delivers Phase 0 + Phase 1 (message logging) only, to keep the change reviewable.

What

Introduces a platform-agnostic message-logging abstraction and migrates the standalone logger role in PlatformServices off VSTest types. The VSTest connection is now made at the adapter boundary.

  • New neutral abstraction (functional, non-VSTest naming):
    • IAdapterMessageLoggerSendMessage(MessageLevel, string), reusing the existing neutral MessageLevel enum from TestFramework.Extensions.
    • AdapterMessageLoggerExtensions.ToAdapterMessageLogger(this IMessageLogger) — the single VSTest → neutral bridge (internal HostMessageLogger, maps via the pre-existing ToTestMessageLevel()).
  • Migrated to the neutral logger (IMessageLogger/TestMessageLevelIAdapterMessageLogger/MessageLevel): MSTestDiscovererHelpers, MSTestSettings.Configuration, MSTestSettings.RunSettingsXml, UnitTestDiscoverer, TestMethodFilter.
  • Adapter boundary wraps via frameworkHandle.ToAdapterMessageLogger() in MSTestDiscoverer / MSTestExecutor, plus the two execution sites that reuse the framework handle as a logger.

Deliberately out of scope

The recorder's dual logger role (IFrameworkHandle / ITestExecutionRecorder.SendMessage) is intentionally left for the later recorder phase, since there the logger and the recorder are the same object. The ToAdapterMessageLogger bridge stays in PlatformServices as a temporary translation point until that phase.

No behavior change

This is a pure refactor. The MessageLevelTestMessageLevel mapping is 1:1, and no message levels or paths were dropped. Tests keep their Mock<IMessageLogger> and wrap with .ToAdapterMessageLogger() at migrated call sites, so the existing Verify(... TestMessageLevel ...) assertions still exercise the mapping end-to-end.

Verification

  • Full Debug src build green across all TFMs (net462, net8.0, net9.0, UWP, WinUI).
  • MSTestAdapter.PlatformServices.UnitTests: 889 passed.
  • MSTestAdapter.UnitTests: 21 passed.
  • Reviewed with the expert MSTest reviewer agent (two passes); all findings addressed.

Introduce a platform-agnostic IAdapterMessageLogger abstraction (reusing the
existing MessageLevel enum) so the platform services layer no longer depends on
the VSTest IMessageLogger/TestMessageLevel for the standalone message-logger
role. The VSTest bridge (ToAdapterMessageLogger) lives in the adapter-facing
extension and is applied at the MSTestDiscoverer/MSTestExecutor boundary and at
the two execution sites that reuse the framework handle as a logger.
The recorder's dual logger role (IFrameworkHandle/ITestExecutionRecorder) is
intentionally left for the later recorder phase, since logger and recorder are
the same object there.
Tests keep their Mock<IMessageLogger> and wrap with .ToAdapterMessageLogger() at
migrated call sites, so TestMessageLevel Verify assertions are unchanged.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings July 1, 2026 15:08

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR is Phase 1 of the effort to make MSTestAdapter.PlatformServices platform-agnostic by abstracting adapter-to-host message logging away from VSTest’s object model and shifting the translation to the adapter boundary.

Changes:

  • Introduces a neutral message-logging contract (IAdapterMessageLogger) based on the existing MessageLevel enum.
  • Adds a single VSTest→neutral bridge (ToAdapterMessageLogger(this IMessageLogger)) and migrates PlatformServices call sites from IMessageLogger/TestMessageLevel to IAdapterMessageLogger/MessageLevel.
  • Updates adapter and test call sites to wrap existing IMessageLogger mocks/handles with .ToAdapterMessageLogger().
Show a summary per file
FileDescription
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/RunConfigurationSettingsTests.csUpdates settings population tests to pass the new adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/ObjectModel/UnitTestResultTests.csWraps logger when retrieving settings to keep outcome mapping tests exercising the bridge.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestSettingsTests.csMigrates settings/config tests to the new logger abstraction while retaining TestMessageLevel verifications.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Helpers/UnitTestOutcomeHelperTests.csUpdates settings initialization to use .ToAdapterMessageLogger().
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/UnitTestRunnerTests.csWraps logger in runner-related settings reads.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TypeCacheTests.csUpdates settings read/population paths to use the adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TestMethodFilterTests.csPasses an IAdapterMessageLogger into filter expression paths via wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TestExecutionManagerTests.csUpdates settings population during execution tests to use the adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/UnitTestDiscovererTests.csMigrates discovery tests and test doubles to IAdapterMessageLogger.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/TypeEnumeratorTests.csUpdates discovery settings initialization to use .ToAdapterMessageLogger().
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/AssemblyEnumeratorTests.csWraps logger when constructing settings for discovery enumerator tests.
test/IntegrationTests/MSTest.IntegrationTests/Utilities/CLITestBase.discovery.csUpdates integration discovery helper to pass the adapter logger wrapper.
src/Adapter/MSTestAdapter.PlatformServices/TestMethodFilter.csSwitches filter logging from IMessageLogger/TestMessageLevel to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/Services/AdapterMessageLoggerExtensions.csAdds the VSTest IMessageLoggerIAdapterMessageLogger bridge.
src/Adapter/MSTestAdapter.PlatformServices/MSTestSettings.RunSettingsXml.csMigrates runsettings parsing logging to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/MSTestSettings.Configuration.csMigrates configuration/runsettings warning logging to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/Interfaces/IAdapterMessageLogger.csIntroduces the platform-agnostic adapter message logger contract.
src/Adapter/MSTestAdapter.PlatformServices/Helpers/MSTestDiscovererHelpers.csUpdates discovery initialization logging to use the neutral logger.
src/Adapter/MSTestAdapter.PlatformServices/Execution/TestExecutionManager.Parallelization.csUpdates filter-expression acquisition to pass an adapter logger wrapper.
src/Adapter/MSTestAdapter.PlatformServices/Execution/TestExecutionManager.csCaches an IAdapterMessageLogger wrapper for framework-handle logging during discovery in execution.
src/Adapter/MSTest.TestAdapter/VSTestAdapter/MSTestExecutor.csWraps frameworkHandle at the adapter boundary before calling into PlatformServices.
src/Adapter/MSTest.TestAdapter/VSTestAdapter/MSTestDiscoverer.csWraps the VSTest logger once and threads the neutral logger through discovery.

Review details

  • Files reviewed: 23/23 changed files
  • Comments generated: 2
  • Review effort level: Low

- AdapterMessageLoggerExtensions: validate the logger argument (throw
ArgumentNullException instead of a later NullReferenceException) and make
ToAdapterMessageLogger internal to match the containing internal class.
- TestExecutionManager.Parallelization: cache a single IAdapterMessageLogger per
source instead of allocating a wrapper per call, and route the parallelization
banner and error SendMessage calls through it (removing the file's remaining
TestMessageLevel usage).
- MSTestSettingsTests: drop two dead-store local assignments flagged by CodeQL;
the GetSettings calls remain as statements so logging side effects and Verify
assertions are unchanged.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@EvangelinkAmaury Levé (Evangelink) added the state/needs-review Awaiting review from the team. label Jul 2, 2026
@Evangelink
Amaury Levé (Evangelink) merged commit f538608 into mainJul 3, 2026
51 of 52 checks passed
@Evangelink
Amaury Levé (Evangelink) deleted the dev/amauryleve/abstract-vstest-types-platformservices branch July 3, 2026 09:19
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>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

state/needs-reviewAwaiting review from the team.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Evangelink@0101
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Abstract VSTest message logging in PlatformServices (Phase 1 of platform-agnostic effort) - #9548

Merged
Amaury Levé (Evangelink) merged 2 commits into
mainfrom
dev/amauryleve/abstract-vstest-types-platformservices
Jul 3, 2026
Merged

Abstract VSTest message logging in PlatformServices (Phase 1 of platform-agnostic effort)#9548
Amaury Levé (Evangelink) merged 2 commits into
mainfrom
dev/amauryleve/abstract-vstest-types-platformservices

Conversation

@Evangelink

Copy link
Copy Markdown
Member

Why

This is the first, self-contained slice of a larger effort to make MSTestAdapter.PlatformServices platform-agnostic by removing its dependency on the VSTest object model (Microsoft.TestPlatform.ObjectModel). The end goal is for the VSTest coupling to live only in the adapter layer (MSTest.TestAdapter), so the platform-services engine can eventually be driven by an MTP-native adapter without round-tripping through the VSTest bridge.

The full phased plan (0–8) is tracked separately; this PR delivers Phase 0 + Phase 1 (message logging) only, to keep the change reviewable.

What

Introduces a platform-agnostic message-logging abstraction and migrates the standalone logger role in PlatformServices off VSTest types. The VSTest connection is now made at the adapter boundary.

  • New neutral abstraction (functional, non-VSTest naming):
    • IAdapterMessageLoggerSendMessage(MessageLevel, string), reusing the existing neutral MessageLevel enum from TestFramework.Extensions.
    • AdapterMessageLoggerExtensions.ToAdapterMessageLogger(this IMessageLogger) — the single VSTest → neutral bridge (internal HostMessageLogger, maps via the pre-existing ToTestMessageLevel()).
  • Migrated to the neutral logger (IMessageLogger/TestMessageLevelIAdapterMessageLogger/MessageLevel): MSTestDiscovererHelpers, MSTestSettings.Configuration, MSTestSettings.RunSettingsXml, UnitTestDiscoverer, TestMethodFilter.
  • Adapter boundary wraps via frameworkHandle.ToAdapterMessageLogger() in MSTestDiscoverer / MSTestExecutor, plus the two execution sites that reuse the framework handle as a logger.

Deliberately out of scope

The recorder's dual logger role (IFrameworkHandle / ITestExecutionRecorder.SendMessage) is intentionally left for the later recorder phase, since there the logger and the recorder are the same object. The ToAdapterMessageLogger bridge stays in PlatformServices as a temporary translation point until that phase.

No behavior change

This is a pure refactor. The MessageLevelTestMessageLevel mapping is 1:1, and no message levels or paths were dropped. Tests keep their Mock<IMessageLogger> and wrap with .ToAdapterMessageLogger() at migrated call sites, so the existing Verify(... TestMessageLevel ...) assertions still exercise the mapping end-to-end.

Verification

  • Full Debug src build green across all TFMs (net462, net8.0, net9.0, UWP, WinUI).
  • MSTestAdapter.PlatformServices.UnitTests: 889 passed.
  • MSTestAdapter.UnitTests: 21 passed.
  • Reviewed with the expert MSTest reviewer agent (two passes); all findings addressed.

Introduce a platform-agnostic IAdapterMessageLogger abstraction (reusing the
existing MessageLevel enum) so the platform services layer no longer depends on
the VSTest IMessageLogger/TestMessageLevel for the standalone message-logger
role. The VSTest bridge (ToAdapterMessageLogger) lives in the adapter-facing
extension and is applied at the MSTestDiscoverer/MSTestExecutor boundary and at
the two execution sites that reuse the framework handle as a logger.
The recorder's dual logger role (IFrameworkHandle/ITestExecutionRecorder) is
intentionally left for the later recorder phase, since logger and recorder are
the same object there.
Tests keep their Mock<IMessageLogger> and wrap with .ToAdapterMessageLogger() at
migrated call sites, so TestMessageLevel Verify assertions are unchanged.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings July 1, 2026 15:08

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR is Phase 1 of the effort to make MSTestAdapter.PlatformServices platform-agnostic by abstracting adapter-to-host message logging away from VSTest’s object model and shifting the translation to the adapter boundary.

Changes:

  • Introduces a neutral message-logging contract (IAdapterMessageLogger) based on the existing MessageLevel enum.
  • Adds a single VSTest→neutral bridge (ToAdapterMessageLogger(this IMessageLogger)) and migrates PlatformServices call sites from IMessageLogger/TestMessageLevel to IAdapterMessageLogger/MessageLevel.
  • Updates adapter and test call sites to wrap existing IMessageLogger mocks/handles with .ToAdapterMessageLogger().
Show a summary per file
FileDescription
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/RunConfigurationSettingsTests.csUpdates settings population tests to pass the new adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/ObjectModel/UnitTestResultTests.csWraps logger when retrieving settings to keep outcome mapping tests exercising the bridge.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestSettingsTests.csMigrates settings/config tests to the new logger abstraction while retaining TestMessageLevel verifications.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Helpers/UnitTestOutcomeHelperTests.csUpdates settings initialization to use .ToAdapterMessageLogger().
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/UnitTestRunnerTests.csWraps logger in runner-related settings reads.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TypeCacheTests.csUpdates settings read/population paths to use the adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TestMethodFilterTests.csPasses an IAdapterMessageLogger into filter expression paths via wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TestExecutionManagerTests.csUpdates settings population during execution tests to use the adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/UnitTestDiscovererTests.csMigrates discovery tests and test doubles to IAdapterMessageLogger.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/TypeEnumeratorTests.csUpdates discovery settings initialization to use .ToAdapterMessageLogger().
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/AssemblyEnumeratorTests.csWraps logger when constructing settings for discovery enumerator tests.
test/IntegrationTests/MSTest.IntegrationTests/Utilities/CLITestBase.discovery.csUpdates integration discovery helper to pass the adapter logger wrapper.
src/Adapter/MSTestAdapter.PlatformServices/TestMethodFilter.csSwitches filter logging from IMessageLogger/TestMessageLevel to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/Services/AdapterMessageLoggerExtensions.csAdds the VSTest IMessageLoggerIAdapterMessageLogger bridge.
src/Adapter/MSTestAdapter.PlatformServices/MSTestSettings.RunSettingsXml.csMigrates runsettings parsing logging to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/MSTestSettings.Configuration.csMigrates configuration/runsettings warning logging to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/Interfaces/IAdapterMessageLogger.csIntroduces the platform-agnostic adapter message logger contract.
src/Adapter/MSTestAdapter.PlatformServices/Helpers/MSTestDiscovererHelpers.csUpdates discovery initialization logging to use the neutral logger.
src/Adapter/MSTestAdapter.PlatformServices/Execution/TestExecutionManager.Parallelization.csUpdates filter-expression acquisition to pass an adapter logger wrapper.
src/Adapter/MSTestAdapter.PlatformServices/Execution/TestExecutionManager.csCaches an IAdapterMessageLogger wrapper for framework-handle logging during discovery in execution.
src/Adapter/MSTest.TestAdapter/VSTestAdapter/MSTestExecutor.csWraps frameworkHandle at the adapter boundary before calling into PlatformServices.
src/Adapter/MSTest.TestAdapter/VSTestAdapter/MSTestDiscoverer.csWraps the VSTest logger once and threads the neutral logger through discovery.

Review details

  • Files reviewed: 23/23 changed files
  • Comments generated: 2
  • Review effort level: Low

- AdapterMessageLoggerExtensions: validate the logger argument (throw
ArgumentNullException instead of a later NullReferenceException) and make
ToAdapterMessageLogger internal to match the containing internal class.
- TestExecutionManager.Parallelization: cache a single IAdapterMessageLogger per
source instead of allocating a wrapper per call, and route the parallelization
banner and error SendMessage calls through it (removing the file's remaining
TestMessageLevel usage).
- MSTestSettingsTests: drop two dead-store local assignments flagged by CodeQL;
the GetSettings calls remain as statements so logging side effects and Verify
assertions are unchanged.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@EvangelinkAmaury Levé (Evangelink) added the state/needs-review Awaiting review from the team. label Jul 2, 2026
@Evangelink
Amaury Levé (Evangelink) merged commit f538608 into mainJul 3, 2026
51 of 52 checks passed
@Evangelink
Amaury Levé (Evangelink) deleted the dev/amauryleve/abstract-vstest-types-platformservices branch July 3, 2026 09:19
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>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

state/needs-reviewAwaiting review from the team.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Evangelink@0101
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Abstract VSTest message logging in PlatformServices (Phase 1 of platform-agnostic effort) - #9548

Merged
Amaury Levé (Evangelink) merged 2 commits into
mainfrom
dev/amauryleve/abstract-vstest-types-platformservices
Jul 3, 2026
Merged

Abstract VSTest message logging in PlatformServices (Phase 1 of platform-agnostic effort)#9548
Amaury Levé (Evangelink) merged 2 commits into
mainfrom
dev/amauryleve/abstract-vstest-types-platformservices

Conversation

@Evangelink

Copy link
Copy Markdown
Member

Why

This is the first, self-contained slice of a larger effort to make MSTestAdapter.PlatformServices platform-agnostic by removing its dependency on the VSTest object model (Microsoft.TestPlatform.ObjectModel). The end goal is for the VSTest coupling to live only in the adapter layer (MSTest.TestAdapter), so the platform-services engine can eventually be driven by an MTP-native adapter without round-tripping through the VSTest bridge.

The full phased plan (0–8) is tracked separately; this PR delivers Phase 0 + Phase 1 (message logging) only, to keep the change reviewable.

What

Introduces a platform-agnostic message-logging abstraction and migrates the standalone logger role in PlatformServices off VSTest types. The VSTest connection is now made at the adapter boundary.

  • New neutral abstraction (functional, non-VSTest naming):
    • IAdapterMessageLoggerSendMessage(MessageLevel, string), reusing the existing neutral MessageLevel enum from TestFramework.Extensions.
    • AdapterMessageLoggerExtensions.ToAdapterMessageLogger(this IMessageLogger) — the single VSTest → neutral bridge (internal HostMessageLogger, maps via the pre-existing ToTestMessageLevel()).
  • Migrated to the neutral logger (IMessageLogger/TestMessageLevelIAdapterMessageLogger/MessageLevel): MSTestDiscovererHelpers, MSTestSettings.Configuration, MSTestSettings.RunSettingsXml, UnitTestDiscoverer, TestMethodFilter.
  • Adapter boundary wraps via frameworkHandle.ToAdapterMessageLogger() in MSTestDiscoverer / MSTestExecutor, plus the two execution sites that reuse the framework handle as a logger.

Deliberately out of scope

The recorder's dual logger role (IFrameworkHandle / ITestExecutionRecorder.SendMessage) is intentionally left for the later recorder phase, since there the logger and the recorder are the same object. The ToAdapterMessageLogger bridge stays in PlatformServices as a temporary translation point until that phase.

No behavior change

This is a pure refactor. The MessageLevelTestMessageLevel mapping is 1:1, and no message levels or paths were dropped. Tests keep their Mock<IMessageLogger> and wrap with .ToAdapterMessageLogger() at migrated call sites, so the existing Verify(... TestMessageLevel ...) assertions still exercise the mapping end-to-end.

Verification

  • Full Debug src build green across all TFMs (net462, net8.0, net9.0, UWP, WinUI).
  • MSTestAdapter.PlatformServices.UnitTests: 889 passed.
  • MSTestAdapter.UnitTests: 21 passed.
  • Reviewed with the expert MSTest reviewer agent (two passes); all findings addressed.

Introduce a platform-agnostic IAdapterMessageLogger abstraction (reusing the
existing MessageLevel enum) so the platform services layer no longer depends on
the VSTest IMessageLogger/TestMessageLevel for the standalone message-logger
role. The VSTest bridge (ToAdapterMessageLogger) lives in the adapter-facing
extension and is applied at the MSTestDiscoverer/MSTestExecutor boundary and at
the two execution sites that reuse the framework handle as a logger.
The recorder's dual logger role (IFrameworkHandle/ITestExecutionRecorder) is
intentionally left for the later recorder phase, since logger and recorder are
the same object there.
Tests keep their Mock<IMessageLogger> and wrap with .ToAdapterMessageLogger() at
migrated call sites, so TestMessageLevel Verify assertions are unchanged.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings July 1, 2026 15:08

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR is Phase 1 of the effort to make MSTestAdapter.PlatformServices platform-agnostic by abstracting adapter-to-host message logging away from VSTest’s object model and shifting the translation to the adapter boundary.

Changes:

  • Introduces a neutral message-logging contract (IAdapterMessageLogger) based on the existing MessageLevel enum.
  • Adds a single VSTest→neutral bridge (ToAdapterMessageLogger(this IMessageLogger)) and migrates PlatformServices call sites from IMessageLogger/TestMessageLevel to IAdapterMessageLogger/MessageLevel.
  • Updates adapter and test call sites to wrap existing IMessageLogger mocks/handles with .ToAdapterMessageLogger().
Show a summary per file
FileDescription
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/RunConfigurationSettingsTests.csUpdates settings population tests to pass the new adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/ObjectModel/UnitTestResultTests.csWraps logger when retrieving settings to keep outcome mapping tests exercising the bridge.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestSettingsTests.csMigrates settings/config tests to the new logger abstraction while retaining TestMessageLevel verifications.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Helpers/UnitTestOutcomeHelperTests.csUpdates settings initialization to use .ToAdapterMessageLogger().
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/UnitTestRunnerTests.csWraps logger in runner-related settings reads.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TypeCacheTests.csUpdates settings read/population paths to use the adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TestMethodFilterTests.csPasses an IAdapterMessageLogger into filter expression paths via wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TestExecutionManagerTests.csUpdates settings population during execution tests to use the adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/UnitTestDiscovererTests.csMigrates discovery tests and test doubles to IAdapterMessageLogger.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/TypeEnumeratorTests.csUpdates discovery settings initialization to use .ToAdapterMessageLogger().
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/AssemblyEnumeratorTests.csWraps logger when constructing settings for discovery enumerator tests.
test/IntegrationTests/MSTest.IntegrationTests/Utilities/CLITestBase.discovery.csUpdates integration discovery helper to pass the adapter logger wrapper.
src/Adapter/MSTestAdapter.PlatformServices/TestMethodFilter.csSwitches filter logging from IMessageLogger/TestMessageLevel to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/Services/AdapterMessageLoggerExtensions.csAdds the VSTest IMessageLoggerIAdapterMessageLogger bridge.
src/Adapter/MSTestAdapter.PlatformServices/MSTestSettings.RunSettingsXml.csMigrates runsettings parsing logging to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/MSTestSettings.Configuration.csMigrates configuration/runsettings warning logging to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/Interfaces/IAdapterMessageLogger.csIntroduces the platform-agnostic adapter message logger contract.
src/Adapter/MSTestAdapter.PlatformServices/Helpers/MSTestDiscovererHelpers.csUpdates discovery initialization logging to use the neutral logger.
src/Adapter/MSTestAdapter.PlatformServices/Execution/TestExecutionManager.Parallelization.csUpdates filter-expression acquisition to pass an adapter logger wrapper.
src/Adapter/MSTestAdapter.PlatformServices/Execution/TestExecutionManager.csCaches an IAdapterMessageLogger wrapper for framework-handle logging during discovery in execution.
src/Adapter/MSTest.TestAdapter/VSTestAdapter/MSTestExecutor.csWraps frameworkHandle at the adapter boundary before calling into PlatformServices.
src/Adapter/MSTest.TestAdapter/VSTestAdapter/MSTestDiscoverer.csWraps the VSTest logger once and threads the neutral logger through discovery.

Review details

  • Files reviewed: 23/23 changed files
  • Comments generated: 2
  • Review effort level: Low

- AdapterMessageLoggerExtensions: validate the logger argument (throw
ArgumentNullException instead of a later NullReferenceException) and make
ToAdapterMessageLogger internal to match the containing internal class.
- TestExecutionManager.Parallelization: cache a single IAdapterMessageLogger per
source instead of allocating a wrapper per call, and route the parallelization
banner and error SendMessage calls through it (removing the file's remaining
TestMessageLevel usage).
- MSTestSettingsTests: drop two dead-store local assignments flagged by CodeQL;
the GetSettings calls remain as statements so logging side effects and Verify
assertions are unchanged.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@EvangelinkAmaury Levé (Evangelink) added the state/needs-review Awaiting review from the team. label Jul 2, 2026
@Evangelink
Amaury Levé (Evangelink) merged commit f538608 into mainJul 3, 2026
51 of 52 checks passed
@Evangelink
Amaury Levé (Evangelink) deleted the dev/amauryleve/abstract-vstest-types-platformservices branch July 3, 2026 09:19
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>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

state/needs-reviewAwaiting review from the team.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Evangelink@0101
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Abstract VSTest message logging in PlatformServices (Phase 1 of platform-agnostic effort) - #9548

Merged
Amaury Levé (Evangelink) merged 2 commits into
mainfrom
dev/amauryleve/abstract-vstest-types-platformservices
Jul 3, 2026
Merged

Abstract VSTest message logging in PlatformServices (Phase 1 of platform-agnostic effort)#9548
Amaury Levé (Evangelink) merged 2 commits into
mainfrom
dev/amauryleve/abstract-vstest-types-platformservices

Conversation

@Evangelink

Copy link
Copy Markdown
Member

Why

This is the first, self-contained slice of a larger effort to make MSTestAdapter.PlatformServices platform-agnostic by removing its dependency on the VSTest object model (Microsoft.TestPlatform.ObjectModel). The end goal is for the VSTest coupling to live only in the adapter layer (MSTest.TestAdapter), so the platform-services engine can eventually be driven by an MTP-native adapter without round-tripping through the VSTest bridge.

The full phased plan (0–8) is tracked separately; this PR delivers Phase 0 + Phase 1 (message logging) only, to keep the change reviewable.

What

Introduces a platform-agnostic message-logging abstraction and migrates the standalone logger role in PlatformServices off VSTest types. The VSTest connection is now made at the adapter boundary.

  • New neutral abstraction (functional, non-VSTest naming):
    • IAdapterMessageLoggerSendMessage(MessageLevel, string), reusing the existing neutral MessageLevel enum from TestFramework.Extensions.
    • AdapterMessageLoggerExtensions.ToAdapterMessageLogger(this IMessageLogger) — the single VSTest → neutral bridge (internal HostMessageLogger, maps via the pre-existing ToTestMessageLevel()).
  • Migrated to the neutral logger (IMessageLogger/TestMessageLevelIAdapterMessageLogger/MessageLevel): MSTestDiscovererHelpers, MSTestSettings.Configuration, MSTestSettings.RunSettingsXml, UnitTestDiscoverer, TestMethodFilter.
  • Adapter boundary wraps via frameworkHandle.ToAdapterMessageLogger() in MSTestDiscoverer / MSTestExecutor, plus the two execution sites that reuse the framework handle as a logger.

Deliberately out of scope

The recorder's dual logger role (IFrameworkHandle / ITestExecutionRecorder.SendMessage) is intentionally left for the later recorder phase, since there the logger and the recorder are the same object. The ToAdapterMessageLogger bridge stays in PlatformServices as a temporary translation point until that phase.

No behavior change

This is a pure refactor. The MessageLevelTestMessageLevel mapping is 1:1, and no message levels or paths were dropped. Tests keep their Mock<IMessageLogger> and wrap with .ToAdapterMessageLogger() at migrated call sites, so the existing Verify(... TestMessageLevel ...) assertions still exercise the mapping end-to-end.

Verification

  • Full Debug src build green across all TFMs (net462, net8.0, net9.0, UWP, WinUI).
  • MSTestAdapter.PlatformServices.UnitTests: 889 passed.
  • MSTestAdapter.UnitTests: 21 passed.
  • Reviewed with the expert MSTest reviewer agent (two passes); all findings addressed.

Introduce a platform-agnostic IAdapterMessageLogger abstraction (reusing the
existing MessageLevel enum) so the platform services layer no longer depends on
the VSTest IMessageLogger/TestMessageLevel for the standalone message-logger
role. The VSTest bridge (ToAdapterMessageLogger) lives in the adapter-facing
extension and is applied at the MSTestDiscoverer/MSTestExecutor boundary and at
the two execution sites that reuse the framework handle as a logger.
The recorder's dual logger role (IFrameworkHandle/ITestExecutionRecorder) is
intentionally left for the later recorder phase, since logger and recorder are
the same object there.
Tests keep their Mock<IMessageLogger> and wrap with .ToAdapterMessageLogger() at
migrated call sites, so TestMessageLevel Verify assertions are unchanged.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings July 1, 2026 15:08

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR is Phase 1 of the effort to make MSTestAdapter.PlatformServices platform-agnostic by abstracting adapter-to-host message logging away from VSTest’s object model and shifting the translation to the adapter boundary.

Changes:

  • Introduces a neutral message-logging contract (IAdapterMessageLogger) based on the existing MessageLevel enum.
  • Adds a single VSTest→neutral bridge (ToAdapterMessageLogger(this IMessageLogger)) and migrates PlatformServices call sites from IMessageLogger/TestMessageLevel to IAdapterMessageLogger/MessageLevel.
  • Updates adapter and test call sites to wrap existing IMessageLogger mocks/handles with .ToAdapterMessageLogger().
Show a summary per file
FileDescription
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/RunConfigurationSettingsTests.csUpdates settings population tests to pass the new adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/ObjectModel/UnitTestResultTests.csWraps logger when retrieving settings to keep outcome mapping tests exercising the bridge.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestSettingsTests.csMigrates settings/config tests to the new logger abstraction while retaining TestMessageLevel verifications.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Helpers/UnitTestOutcomeHelperTests.csUpdates settings initialization to use .ToAdapterMessageLogger().
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/UnitTestRunnerTests.csWraps logger in runner-related settings reads.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TypeCacheTests.csUpdates settings read/population paths to use the adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TestMethodFilterTests.csPasses an IAdapterMessageLogger into filter expression paths via wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TestExecutionManagerTests.csUpdates settings population during execution tests to use the adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/UnitTestDiscovererTests.csMigrates discovery tests and test doubles to IAdapterMessageLogger.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/TypeEnumeratorTests.csUpdates discovery settings initialization to use .ToAdapterMessageLogger().
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/AssemblyEnumeratorTests.csWraps logger when constructing settings for discovery enumerator tests.
test/IntegrationTests/MSTest.IntegrationTests/Utilities/CLITestBase.discovery.csUpdates integration discovery helper to pass the adapter logger wrapper.
src/Adapter/MSTestAdapter.PlatformServices/TestMethodFilter.csSwitches filter logging from IMessageLogger/TestMessageLevel to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/Services/AdapterMessageLoggerExtensions.csAdds the VSTest IMessageLoggerIAdapterMessageLogger bridge.
src/Adapter/MSTestAdapter.PlatformServices/MSTestSettings.RunSettingsXml.csMigrates runsettings parsing logging to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/MSTestSettings.Configuration.csMigrates configuration/runsettings warning logging to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/Interfaces/IAdapterMessageLogger.csIntroduces the platform-agnostic adapter message logger contract.
src/Adapter/MSTestAdapter.PlatformServices/Helpers/MSTestDiscovererHelpers.csUpdates discovery initialization logging to use the neutral logger.
src/Adapter/MSTestAdapter.PlatformServices/Execution/TestExecutionManager.Parallelization.csUpdates filter-expression acquisition to pass an adapter logger wrapper.
src/Adapter/MSTestAdapter.PlatformServices/Execution/TestExecutionManager.csCaches an IAdapterMessageLogger wrapper for framework-handle logging during discovery in execution.
src/Adapter/MSTest.TestAdapter/VSTestAdapter/MSTestExecutor.csWraps frameworkHandle at the adapter boundary before calling into PlatformServices.
src/Adapter/MSTest.TestAdapter/VSTestAdapter/MSTestDiscoverer.csWraps the VSTest logger once and threads the neutral logger through discovery.

Review details

  • Files reviewed: 23/23 changed files
  • Comments generated: 2
  • Review effort level: Low

- AdapterMessageLoggerExtensions: validate the logger argument (throw
ArgumentNullException instead of a later NullReferenceException) and make
ToAdapterMessageLogger internal to match the containing internal class.
- TestExecutionManager.Parallelization: cache a single IAdapterMessageLogger per
source instead of allocating a wrapper per call, and route the parallelization
banner and error SendMessage calls through it (removing the file's remaining
TestMessageLevel usage).
- MSTestSettingsTests: drop two dead-store local assignments flagged by CodeQL;
the GetSettings calls remain as statements so logging side effects and Verify
assertions are unchanged.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@EvangelinkAmaury Levé (Evangelink) added the state/needs-review Awaiting review from the team. label Jul 2, 2026
@Evangelink
Amaury Levé (Evangelink) merged commit f538608 into mainJul 3, 2026
51 of 52 checks passed
@Evangelink
Amaury Levé (Evangelink) deleted the dev/amauryleve/abstract-vstest-types-platformservices branch July 3, 2026 09:19
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>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

state/needs-reviewAwaiting review from the team.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Evangelink@0101
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Abstract VSTest message logging in PlatformServices (Phase 1 of platform-agnostic effort) - #9548

Merged
Amaury Levé (Evangelink) merged 2 commits into
mainfrom
dev/amauryleve/abstract-vstest-types-platformservices
Jul 3, 2026
Merged

Abstract VSTest message logging in PlatformServices (Phase 1 of platform-agnostic effort)#9548
Amaury Levé (Evangelink) merged 2 commits into
mainfrom
dev/amauryleve/abstract-vstest-types-platformservices

Conversation

@Evangelink

Copy link
Copy Markdown
Member

Why

This is the first, self-contained slice of a larger effort to make MSTestAdapter.PlatformServices platform-agnostic by removing its dependency on the VSTest object model (Microsoft.TestPlatform.ObjectModel). The end goal is for the VSTest coupling to live only in the adapter layer (MSTest.TestAdapter), so the platform-services engine can eventually be driven by an MTP-native adapter without round-tripping through the VSTest bridge.

The full phased plan (0–8) is tracked separately; this PR delivers Phase 0 + Phase 1 (message logging) only, to keep the change reviewable.

What

Introduces a platform-agnostic message-logging abstraction and migrates the standalone logger role in PlatformServices off VSTest types. The VSTest connection is now made at the adapter boundary.

  • New neutral abstraction (functional, non-VSTest naming):
    • IAdapterMessageLoggerSendMessage(MessageLevel, string), reusing the existing neutral MessageLevel enum from TestFramework.Extensions.
    • AdapterMessageLoggerExtensions.ToAdapterMessageLogger(this IMessageLogger) — the single VSTest → neutral bridge (internal HostMessageLogger, maps via the pre-existing ToTestMessageLevel()).
  • Migrated to the neutral logger (IMessageLogger/TestMessageLevelIAdapterMessageLogger/MessageLevel): MSTestDiscovererHelpers, MSTestSettings.Configuration, MSTestSettings.RunSettingsXml, UnitTestDiscoverer, TestMethodFilter.
  • Adapter boundary wraps via frameworkHandle.ToAdapterMessageLogger() in MSTestDiscoverer / MSTestExecutor, plus the two execution sites that reuse the framework handle as a logger.

Deliberately out of scope

The recorder's dual logger role (IFrameworkHandle / ITestExecutionRecorder.SendMessage) is intentionally left for the later recorder phase, since there the logger and the recorder are the same object. The ToAdapterMessageLogger bridge stays in PlatformServices as a temporary translation point until that phase.

No behavior change

This is a pure refactor. The MessageLevelTestMessageLevel mapping is 1:1, and no message levels or paths were dropped. Tests keep their Mock<IMessageLogger> and wrap with .ToAdapterMessageLogger() at migrated call sites, so the existing Verify(... TestMessageLevel ...) assertions still exercise the mapping end-to-end.

Verification

  • Full Debug src build green across all TFMs (net462, net8.0, net9.0, UWP, WinUI).
  • MSTestAdapter.PlatformServices.UnitTests: 889 passed.
  • MSTestAdapter.UnitTests: 21 passed.
  • Reviewed with the expert MSTest reviewer agent (two passes); all findings addressed.

Introduce a platform-agnostic IAdapterMessageLogger abstraction (reusing the
existing MessageLevel enum) so the platform services layer no longer depends on
the VSTest IMessageLogger/TestMessageLevel for the standalone message-logger
role. The VSTest bridge (ToAdapterMessageLogger) lives in the adapter-facing
extension and is applied at the MSTestDiscoverer/MSTestExecutor boundary and at
the two execution sites that reuse the framework handle as a logger.
The recorder's dual logger role (IFrameworkHandle/ITestExecutionRecorder) is
intentionally left for the later recorder phase, since logger and recorder are
the same object there.
Tests keep their Mock<IMessageLogger> and wrap with .ToAdapterMessageLogger() at
migrated call sites, so TestMessageLevel Verify assertions are unchanged.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings July 1, 2026 15:08

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR is Phase 1 of the effort to make MSTestAdapter.PlatformServices platform-agnostic by abstracting adapter-to-host message logging away from VSTest’s object model and shifting the translation to the adapter boundary.

Changes:

  • Introduces a neutral message-logging contract (IAdapterMessageLogger) based on the existing MessageLevel enum.
  • Adds a single VSTest→neutral bridge (ToAdapterMessageLogger(this IMessageLogger)) and migrates PlatformServices call sites from IMessageLogger/TestMessageLevel to IAdapterMessageLogger/MessageLevel.
  • Updates adapter and test call sites to wrap existing IMessageLogger mocks/handles with .ToAdapterMessageLogger().
Show a summary per file
FileDescription
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/RunConfigurationSettingsTests.csUpdates settings population tests to pass the new adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/ObjectModel/UnitTestResultTests.csWraps logger when retrieving settings to keep outcome mapping tests exercising the bridge.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestSettingsTests.csMigrates settings/config tests to the new logger abstraction while retaining TestMessageLevel verifications.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Helpers/UnitTestOutcomeHelperTests.csUpdates settings initialization to use .ToAdapterMessageLogger().
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/UnitTestRunnerTests.csWraps logger in runner-related settings reads.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TypeCacheTests.csUpdates settings read/population paths to use the adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TestMethodFilterTests.csPasses an IAdapterMessageLogger into filter expression paths via wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TestExecutionManagerTests.csUpdates settings population during execution tests to use the adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/UnitTestDiscovererTests.csMigrates discovery tests and test doubles to IAdapterMessageLogger.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/TypeEnumeratorTests.csUpdates discovery settings initialization to use .ToAdapterMessageLogger().
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/AssemblyEnumeratorTests.csWraps logger when constructing settings for discovery enumerator tests.
test/IntegrationTests/MSTest.IntegrationTests/Utilities/CLITestBase.discovery.csUpdates integration discovery helper to pass the adapter logger wrapper.
src/Adapter/MSTestAdapter.PlatformServices/TestMethodFilter.csSwitches filter logging from IMessageLogger/TestMessageLevel to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/Services/AdapterMessageLoggerExtensions.csAdds the VSTest IMessageLoggerIAdapterMessageLogger bridge.
src/Adapter/MSTestAdapter.PlatformServices/MSTestSettings.RunSettingsXml.csMigrates runsettings parsing logging to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/MSTestSettings.Configuration.csMigrates configuration/runsettings warning logging to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/Interfaces/IAdapterMessageLogger.csIntroduces the platform-agnostic adapter message logger contract.
src/Adapter/MSTestAdapter.PlatformServices/Helpers/MSTestDiscovererHelpers.csUpdates discovery initialization logging to use the neutral logger.
src/Adapter/MSTestAdapter.PlatformServices/Execution/TestExecutionManager.Parallelization.csUpdates filter-expression acquisition to pass an adapter logger wrapper.
src/Adapter/MSTestAdapter.PlatformServices/Execution/TestExecutionManager.csCaches an IAdapterMessageLogger wrapper for framework-handle logging during discovery in execution.
src/Adapter/MSTest.TestAdapter/VSTestAdapter/MSTestExecutor.csWraps frameworkHandle at the adapter boundary before calling into PlatformServices.
src/Adapter/MSTest.TestAdapter/VSTestAdapter/MSTestDiscoverer.csWraps the VSTest logger once and threads the neutral logger through discovery.

Review details

  • Files reviewed: 23/23 changed files
  • Comments generated: 2
  • Review effort level: Low

- AdapterMessageLoggerExtensions: validate the logger argument (throw
ArgumentNullException instead of a later NullReferenceException) and make
ToAdapterMessageLogger internal to match the containing internal class.
- TestExecutionManager.Parallelization: cache a single IAdapterMessageLogger per
source instead of allocating a wrapper per call, and route the parallelization
banner and error SendMessage calls through it (removing the file's remaining
TestMessageLevel usage).
- MSTestSettingsTests: drop two dead-store local assignments flagged by CodeQL;
the GetSettings calls remain as statements so logging side effects and Verify
assertions are unchanged.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@EvangelinkAmaury Levé (Evangelink) added the state/needs-review Awaiting review from the team. label Jul 2, 2026
@Evangelink
Amaury Levé (Evangelink) merged commit f538608 into mainJul 3, 2026
51 of 52 checks passed
@Evangelink
Amaury Levé (Evangelink) deleted the dev/amauryleve/abstract-vstest-types-platformservices branch July 3, 2026 09:19
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>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

state/needs-reviewAwaiting review from the team.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Evangelink@0101
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Abstract VSTest message logging in PlatformServices (Phase 1 of platform-agnostic effort) - #9548

Merged
Amaury Levé (Evangelink) merged 2 commits into
mainfrom
dev/amauryleve/abstract-vstest-types-platformservices
Jul 3, 2026
Merged

Abstract VSTest message logging in PlatformServices (Phase 1 of platform-agnostic effort)#9548
Amaury Levé (Evangelink) merged 2 commits into
mainfrom
dev/amauryleve/abstract-vstest-types-platformservices

Conversation

@Evangelink

Copy link
Copy Markdown
Member

Why

This is the first, self-contained slice of a larger effort to make MSTestAdapter.PlatformServices platform-agnostic by removing its dependency on the VSTest object model (Microsoft.TestPlatform.ObjectModel). The end goal is for the VSTest coupling to live only in the adapter layer (MSTest.TestAdapter), so the platform-services engine can eventually be driven by an MTP-native adapter without round-tripping through the VSTest bridge.

The full phased plan (0–8) is tracked separately; this PR delivers Phase 0 + Phase 1 (message logging) only, to keep the change reviewable.

What

Introduces a platform-agnostic message-logging abstraction and migrates the standalone logger role in PlatformServices off VSTest types. The VSTest connection is now made at the adapter boundary.

  • New neutral abstraction (functional, non-VSTest naming):
    • IAdapterMessageLoggerSendMessage(MessageLevel, string), reusing the existing neutral MessageLevel enum from TestFramework.Extensions.
    • AdapterMessageLoggerExtensions.ToAdapterMessageLogger(this IMessageLogger) — the single VSTest → neutral bridge (internal HostMessageLogger, maps via the pre-existing ToTestMessageLevel()).
  • Migrated to the neutral logger (IMessageLogger/TestMessageLevelIAdapterMessageLogger/MessageLevel): MSTestDiscovererHelpers, MSTestSettings.Configuration, MSTestSettings.RunSettingsXml, UnitTestDiscoverer, TestMethodFilter.
  • Adapter boundary wraps via frameworkHandle.ToAdapterMessageLogger() in MSTestDiscoverer / MSTestExecutor, plus the two execution sites that reuse the framework handle as a logger.

Deliberately out of scope

The recorder's dual logger role (IFrameworkHandle / ITestExecutionRecorder.SendMessage) is intentionally left for the later recorder phase, since there the logger and the recorder are the same object. The ToAdapterMessageLogger bridge stays in PlatformServices as a temporary translation point until that phase.

No behavior change

This is a pure refactor. The MessageLevelTestMessageLevel mapping is 1:1, and no message levels or paths were dropped. Tests keep their Mock<IMessageLogger> and wrap with .ToAdapterMessageLogger() at migrated call sites, so the existing Verify(... TestMessageLevel ...) assertions still exercise the mapping end-to-end.

Verification

  • Full Debug src build green across all TFMs (net462, net8.0, net9.0, UWP, WinUI).
  • MSTestAdapter.PlatformServices.UnitTests: 889 passed.
  • MSTestAdapter.UnitTests: 21 passed.
  • Reviewed with the expert MSTest reviewer agent (two passes); all findings addressed.

Introduce a platform-agnostic IAdapterMessageLogger abstraction (reusing the
existing MessageLevel enum) so the platform services layer no longer depends on
the VSTest IMessageLogger/TestMessageLevel for the standalone message-logger
role. The VSTest bridge (ToAdapterMessageLogger) lives in the adapter-facing
extension and is applied at the MSTestDiscoverer/MSTestExecutor boundary and at
the two execution sites that reuse the framework handle as a logger.
The recorder's dual logger role (IFrameworkHandle/ITestExecutionRecorder) is
intentionally left for the later recorder phase, since logger and recorder are
the same object there.
Tests keep their Mock<IMessageLogger> and wrap with .ToAdapterMessageLogger() at
migrated call sites, so TestMessageLevel Verify assertions are unchanged.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
CopilotAI review requested due to automatic review settings July 1, 2026 15:08

CopilotAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR is Phase 1 of the effort to make MSTestAdapter.PlatformServices platform-agnostic by abstracting adapter-to-host message logging away from VSTest’s object model and shifting the translation to the adapter boundary.

Changes:

  • Introduces a neutral message-logging contract (IAdapterMessageLogger) based on the existing MessageLevel enum.
  • Adds a single VSTest→neutral bridge (ToAdapterMessageLogger(this IMessageLogger)) and migrates PlatformServices call sites from IMessageLogger/TestMessageLevel to IAdapterMessageLogger/MessageLevel.
  • Updates adapter and test call sites to wrap existing IMessageLogger mocks/handles with .ToAdapterMessageLogger().
Show a summary per file
FileDescription
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/RunConfigurationSettingsTests.csUpdates settings population tests to pass the new adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/ObjectModel/UnitTestResultTests.csWraps logger when retrieving settings to keep outcome mapping tests exercising the bridge.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestSettingsTests.csMigrates settings/config tests to the new logger abstraction while retaining TestMessageLevel verifications.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Helpers/UnitTestOutcomeHelperTests.csUpdates settings initialization to use .ToAdapterMessageLogger().
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/UnitTestRunnerTests.csWraps logger in runner-related settings reads.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TypeCacheTests.csUpdates settings read/population paths to use the adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TestMethodFilterTests.csPasses an IAdapterMessageLogger into filter expression paths via wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Execution/TestExecutionManagerTests.csUpdates settings population during execution tests to use the adapter logger wrapper.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/UnitTestDiscovererTests.csMigrates discovery tests and test doubles to IAdapterMessageLogger.
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/TypeEnumeratorTests.csUpdates discovery settings initialization to use .ToAdapterMessageLogger().
test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Discovery/AssemblyEnumeratorTests.csWraps logger when constructing settings for discovery enumerator tests.
test/IntegrationTests/MSTest.IntegrationTests/Utilities/CLITestBase.discovery.csUpdates integration discovery helper to pass the adapter logger wrapper.
src/Adapter/MSTestAdapter.PlatformServices/TestMethodFilter.csSwitches filter logging from IMessageLogger/TestMessageLevel to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/Services/AdapterMessageLoggerExtensions.csAdds the VSTest IMessageLoggerIAdapterMessageLogger bridge.
src/Adapter/MSTestAdapter.PlatformServices/MSTestSettings.RunSettingsXml.csMigrates runsettings parsing logging to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/MSTestSettings.Configuration.csMigrates configuration/runsettings warning logging to IAdapterMessageLogger/MessageLevel.
src/Adapter/MSTestAdapter.PlatformServices/Interfaces/IAdapterMessageLogger.csIntroduces the platform-agnostic adapter message logger contract.
src/Adapter/MSTestAdapter.PlatformServices/Helpers/MSTestDiscovererHelpers.csUpdates discovery initialization logging to use the neutral logger.
src/Adapter/MSTestAdapter.PlatformServices/Execution/TestExecutionManager.Parallelization.csUpdates filter-expression acquisition to pass an adapter logger wrapper.
src/Adapter/MSTestAdapter.PlatformServices/Execution/TestExecutionManager.csCaches an IAdapterMessageLogger wrapper for framework-handle logging during discovery in execution.
src/Adapter/MSTest.TestAdapter/VSTestAdapter/MSTestExecutor.csWraps frameworkHandle at the adapter boundary before calling into PlatformServices.
src/Adapter/MSTest.TestAdapter/VSTestAdapter/MSTestDiscoverer.csWraps the VSTest logger once and threads the neutral logger through discovery.

Review details

  • Files reviewed: 23/23 changed files
  • Comments generated: 2
  • Review effort level: Low

- AdapterMessageLoggerExtensions: validate the logger argument (throw
ArgumentNullException instead of a later NullReferenceException) and make
ToAdapterMessageLogger internal to match the containing internal class.
- TestExecutionManager.Parallelization: cache a single IAdapterMessageLogger per
source instead of allocating a wrapper per call, and route the parallelization
banner and error SendMessage calls through it (removing the file's remaining
TestMessageLevel usage).
- MSTestSettingsTests: drop two dead-store local assignments flagged by CodeQL;
the GetSettings calls remain as statements so logging side effects and Verify
assertions are unchanged.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@EvangelinkAmaury Levé (Evangelink) added the state/needs-review Awaiting review from the team. label Jul 2, 2026
@Evangelink
Amaury Levé (Evangelink) merged commit f538608 into mainJul 3, 2026
51 of 52 checks passed
@Evangelink
Amaury Levé (Evangelink) deleted the dev/amauryleve/abstract-vstest-types-platformservices branch July 3, 2026 09:19
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>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

state/needs-reviewAwaiting review from the team.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@Evangelink@0101