Uh oh!
There was an error while loading. Please reload this page.
Reduce duplication in CTRF/JUnit/HTML report extensions (#9129, #9131, #9132) - #9134
Merged
Amaury Levé (Evangelink) merged 1 commit intoJun 15, 2026
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR primarily refactors the CTRF/JUnit/HTML report extensions to reduce duplicated logic (shared report-generator command line base, shared test-result capture helper usage, and consistent builder-guard behavior), and also adds an unrelated VSTestBridge enhancement to emit managed type/method metadata on TestNodes when available.
Changes:
- Refactor report-generator command line providers to derive from a new shared
ReportGeneratorCommandLineBase. - Align CTRF report extension behavior with the other report extensions (shared truncate/constants +
TestApplicationBuilderguard + localized resource addition). - Add propagation of VSTest
TestCase.ManagedType/TestCase.ManagedMethodinto emittedTestNodeproperties, with new unit tests.
Show a summary per file
| File | Description |
|---|---|
| test/UnitTests/Microsoft.Testing.Extensions.VSTestBridge.UnitTests/ObjectModel/ObjectModelConvertersTests.cs | Adds unit coverage for managed type/method propagation into TestNode properties. |
| src/Platform/SharedExtensionHelpers/ReportGeneratorCommandLineBase.cs | New shared base class to de-duplicate common report command-line validation logic. |
| src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/ObjectModelConverters.cs | Emits managed type/method properties from VSTest TestCase onto TestNode. |
| src/Platform/Microsoft.Testing.Extensions.VSTestBridge/Helpers/VSTestTestNodeProperties.cs | Adds constants for the new managed type/method wire property keys. |
| src/Platform/Microsoft.Testing.Extensions.JUnitReport/Microsoft.Testing.Extensions.JUnitReport.csproj | Links the new shared ReportGeneratorCommandLineBase helper into the JUnit extension. |
| src/Platform/Microsoft.Testing.Extensions.JUnitReport/JUnitReportGeneratorCommandLine.cs | Refactors to inherit from ReportGeneratorCommandLineBase. |
| src/Platform/Microsoft.Testing.Extensions.HtmlReport/Microsoft.Testing.Extensions.HtmlReport.csproj | Links the new shared ReportGeneratorCommandLineBase helper into the HTML extension. |
| src/Platform/Microsoft.Testing.Extensions.HtmlReport/HtmlReportGeneratorCommandLine.cs | Refactors to inherit from ReportGeneratorCommandLineBase. |
| src/Platform/Microsoft.Testing.Extensions.CtrfReport/TestResultCapture.cs | Switches CTRF truncation/constants to delegate to shared TestResultCaptureHelper. |
| src/Platform/Microsoft.Testing.Extensions.CtrfReport/Resources/xlf/ExtensionResources.zh-Hant.xlf | Adds new localized string entry for invalid builder type guard. |
| src/Platform/Microsoft.Testing.Extensions.CtrfReport/Resources/xlf/ExtensionResources.zh-Hans.xlf | Adds new localized string entry for invalid builder type guard. |
| src/Platform/Microsoft.Testing.Extensions.CtrfReport/Resources/xlf/ExtensionResources.tr.xlf | Adds new localized string entry for invalid builder type guard. |
| src/Platform/Microsoft.Testing.Extensions.CtrfReport/Resources/xlf/ExtensionResources.ru.xlf | Adds new localized string entry for invalid builder type guard. |
| src/Platform/Microsoft.Testing.Extensions.CtrfReport/Resources/xlf/ExtensionResources.pt-BR.xlf | Adds new localized string entry for invalid builder type guard. |
| src/Platform/Microsoft.Testing.Extensions.CtrfReport/Resources/xlf/ExtensionResources.pl.xlf | Adds new localized string entry for invalid builder type guard. |
| src/Platform/Microsoft.Testing.Extensions.CtrfReport/Resources/xlf/ExtensionResources.ko.xlf | Adds new localized string entry for invalid builder type guard. |
| src/Platform/Microsoft.Testing.Extensions.CtrfReport/Resources/xlf/ExtensionResources.ja.xlf | Adds new localized string entry for invalid builder type guard. |
| src/Platform/Microsoft.Testing.Extensions.CtrfReport/Resources/xlf/ExtensionResources.it.xlf | Adds new localized string entry for invalid builder type guard. |
| src/Platform/Microsoft.Testing.Extensions.CtrfReport/Resources/xlf/ExtensionResources.fr.xlf | Adds new localized string entry for invalid builder type guard. |
| src/Platform/Microsoft.Testing.Extensions.CtrfReport/Resources/xlf/ExtensionResources.es.xlf | Adds new localized string entry for invalid builder type guard. |
| src/Platform/Microsoft.Testing.Extensions.CtrfReport/Resources/xlf/ExtensionResources.de.xlf | Adds new localized string entry for invalid builder type guard. |
| src/Platform/Microsoft.Testing.Extensions.CtrfReport/Resources/xlf/ExtensionResources.cs.xlf | Adds new localized string entry for invalid builder type guard. |
| src/Platform/Microsoft.Testing.Extensions.CtrfReport/Resources/ExtensionResources.resx | Adds the new InvalidTestApplicationBuilderType resource string. |
| src/Platform/Microsoft.Testing.Extensions.CtrfReport/Microsoft.Testing.Extensions.CtrfReport.csproj | Links shared helpers (command line base + test-result capture helper) into CTRF extension. |
| src/Platform/Microsoft.Testing.Extensions.CtrfReport/CtrfReportGeneratorCommandLine.cs | Refactors to inherit from ReportGeneratorCommandLineBase. |
| src/Platform/Microsoft.Testing.Extensions.CtrfReport/CtrfReportExtensions.cs | Adds a TestApplicationBuilder guard consistent with other report extensions. |
Copilot's findings
- Files reviewed: 26/26 changed files
- Comments generated: 2
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
…, microsoft#9132) - microsoft#9129: CTRF TestResultCapture now delegates constants and Truncate to the shared TestResultCaptureHelper (fixes surrogate-pair truncation bug); link helper into CtrfReport project. - microsoft#9131: Add missing 'builder is not TestApplicationBuilder' guard to CtrfReportExtensions.AddCtrfReportProvider to match JUnit/Html; add InvalidTestApplicationBuilderType resource + regenerated xlf. - microsoft#9132: Extract shared ReportGeneratorCommandLineBase into SharedExtensionHelpers; Ctrf/JUnit/Html command-line providers now derive from it with identical behavior (provider names, option names, descriptions, arity, validation unchanged). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Amaury Levé (Evangelink)force-pushed
the
dev/amauryleve/fix-duplicate-code-9129-9131-9132
branch
from
June 15, 2026 08:26
685b40d to
3c55680CompareAmaury Levé (Evangelink)
enabled auto-merge (squash)
June 15, 2026 09:42
Azat Mukhametshin (azat-msft)
approved these changes
Jun 15, 2026
Uh oh!
There was an error while loading. Please reload this page.
Amaury Levé (Evangelink)
deleted the
dev/amauryleve/fix-duplicate-code-9129-9131-9132
branch
June 15, 2026 11:28
This was referenced Jun 15, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes#9129, #9131, #9132 (sub-issues of the #9130 Duplicate Code Detector group).
All three are duplicate-code findings across the CTRF / JUnit / HTML report extensions. The changes touch disjoint files and were validated together.
#9129 — CTRF
TestResultCaptureduplicated constants + divergentTruncateCtrfReport/TestResultCapture.csnow delegates the 5 size constants andTruncateto the canonicalTestResultCaptureHelper(matching JUnit/HTML).Truncatecould split a UTF-16 surrogate pair, producing an invalid string; the shared helper guards against that.TestResultCaptureHelper.csinto the CtrfReport project (it was not previously linked).#9131 — Missing
TestApplicationBuilderguard inCtrfReportExtensionsif (builder is not TestApplicationBuilder) throw ...guard toAddCtrfReportProviderso CTRF fails fast like JUnit/HTML instead of silently succeeding against unsupported custom builders.InvalidTestApplicationBuilderTyperesource string and regenerated all 13.xlffiles via/t:UpdateXlf.#9132 — Identical
*ReportGeneratorCommandLinestructureReportGeneratorCommandLineBaseintoSharedExtensionHelpers, holding the two validation overrides once.--help/--infooutput is unaffected.Validation
Microsoft.Testing.Extensions.UnitTests(net9.0): 507 passed, 0 failed, 4 skipped (unrelated Windows crash-report tests).