Refactor TestClassModelBuilder into focused files (#9910) by Evangelink · Pull Request #9911 · microsoft/testfx

Evangelink · 2026-07-13T19:46:19Z

Summary

Splits the 933-line src/Analyzers/MSTest.SourceGeneration/Generators/TestClassModelBuilder.cs into smaller, single-responsibility files. All new types remain internal static in the same ...SourceGeneration.Generators namespace, so there is no change to the internal or public API surface and behavior is preserved.

New files (all under 300 lines)

File	Lines	Responsibility
`TestClassModelBuilder.cs` (slimmed)	207	Top-level orchestration: walks the inheritance chain, assembles the `TestClassModel`, delegates to helpers
`DynamicDataSourceBuilder.cs`	288	Resolving/validating `[DynamicData]` sources (incl. the `DynamicDataSourceType` enum)
`AttributeMaterializationHelper.cs`	245	Attribute inheritance collection, trimming/AOT materializability, `AttributeData` → model conversion
`TestMemberValidationHelper.cs`	131	Member eligibility, unsupported-shape diagnostics (AOTSG0004/0005), method signature keys
`SymbolReferenceabilityHelper.cs`	81	Reusable accessibility/referenceability predicates over Roslyn symbols
`DataRowBuilder.cs`	74	`[DataRow]` parsing
`SymbolDisplayFormats.cs`	21	Shared fully-qualified `SymbolDisplayFormat` used across the builders

The public BuildAttributes entry point moved to AttributeMaterializationHelper; its only external caller (MSTestReflectionMetadataGenerator) was updated accordingly.

Notes

The existing shared MSTest.Analyzers.Shared.SymbolAccessibilityHelper (linked from ../Shared/) was not merged into, since it is a separate, cross-project concern. The builder's private referenceability predicates went into a new SymbolReferenceabilityHelper to avoid a name/namespace clash.
Namespace remains Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.SourceGeneration.Generators.

Validation

.\build.cmd — Build succeeded, 0 warnings, 0 errors.
MSTest.SourceGeneration.UnitTests (net8.0) — 113/113 passed.

Split the 933-line TestClassModelBuilder.cs into smaller, single-responsibility files within the same Generators namespace: - DynamicDataSourceBuilder: [DynamicData] source resolution - AttributeMaterializationHelper: attribute collection/materialization + TypedConstant conversion - DataRowBuilder: [DataRow] parsing - SymbolReferenceabilityHelper: reusable accessibility/referenceability predicates - TestMemberValidationHelper: member eligibility, unsupported-shape reporting, signature keys - SymbolDisplayFormats: shared fully-qualified SymbolDisplayFormat TestClassModelBuilder now only holds top-level orchestration. Behavior is unchanged; all files are under 300 lines. Updated the BuildAttributes call site in MSTestReflectionMetadataGenerator. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 2fc1a0b3-faab-4c48-a40a-23eae6fa9386

Copilot

Pull request overview

Refactors the source-generation model builder into focused helpers while preserving behavior and API visibility.

Changes:

Extracts dynamic data, data row, attribute, validation, and symbol logic.
Centralizes symbol display formatting.
Updates orchestration and assembly metadata call sites.

Show a summary per file

File	Description
`TestClassModelBuilder.cs`	Retains top-level model orchestration.
`DynamicDataSourceBuilder.cs`	Handles dynamic-data resolution.
`AttributeMaterializationHelper.cs`	Handles attribute inheritance and conversion.
`TestMemberValidationHelper.cs`	Handles member validation and signatures.
`SymbolReferenceabilityHelper.cs`	Centralizes referenceability checks.
`DataRowBuilder.cs`	Handles data-row parsing.
`SymbolDisplayFormats.cs`	Shares symbol display formatting.
`MSTestReflectionMetadataGenerator.cs`	Uses the extracted attribute helper.

Review details

Files reviewed: 8/8 changed files
Comments generated: 0
Review effort level: Medium

…ach filters Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 2fc1a0b3-faab-4c48-a40a-23eae6fa9386

Copilot

Review details

Files reviewed: 8/8 changed files
Comments generated: 6
Review effort level: Medium

Regenerated via UpdateXlf. The last localized check-in added translations for 'GlobalTestFixtureShouldBeValidClassLayout' (fr) and 'SlowTestStillRunning' (ru) that XliffTasks rejects (placeholder mismatch), breaking the build with "xlf is out-of-date with resx". UpdateXlf resets those two units to state="new" so the build passes; they will be re-translated on the next localization pass. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 4350f662-0e5d-4e05-b156-1ef619da3b9e

Copilot

Review details

Files reviewed: 10/10 changed files
Comments generated: 2
Review effort level: Medium

Copilot

Review details

Files reviewed: 10/10 changed files
Comments generated: 5
Review effort level: Low

Copilot

Review details

Files reviewed: 10/10 changed files
Comments generated: 2
Review effort level: Medium

github-actions · 2026-07-14T10:10:53Z

🔍 Build Failure Analysis

Root Cause: Duplicate `<target>` elements in XLF localization files

The build fails because two XLF files contain duplicate <target> elements within a single <trans-unit>, which violates the XLIFF 1.2 schema (exactly one <target> per <trans-unit> is required). MSBuild's XlfTransformer task rejects the malformed XML.

Error Group 1: `src/Analyzers/MSTest.Analyzers/xlf/Resources.fr.xlf`

Lines 566–595: The GlobalTestFixtureShouldBeValidDescription trans-unit has two <target> elements:

Lines 566–580: Contains a partial French translation (state="new")
Lines 581–595: Duplicate English-only fallback (state="new")

Fix: Remove the duplicate second <target> block (lines 581–595). Keep the first one which contains the actual French translation.

Error Group 2: `src/Platform/Microsoft.Testing.Extensions.GitHubActionsReport/Resources/xlf/GitHubActionsResources.ru.xlf`

Lines 77–78: The SlowTestStillRunning trans-unit has two <target> elements:

Line 77: Correct Russian translation (state="translated")
Line 78: Duplicate English-only fallback (state="new")

Fix: Remove line 78 (the duplicate <target state="new"> element).

Summary

File	Issue	Fix
`src/Analyzers/MSTest.Analyzers/xlf/Resources.fr.xlf`	Duplicate `<target>` in `GlobalTestFixtureShouldBeValidDescription`	Remove lines 581–595
`src/Platform/.../GitHubActionsResources.ru.xlf`	Duplicate `<target>` in `SlowTestStillRunning`	Remove line 78

Both issues appear to be from a OneLocBuild merge that inserted a translated <target> without removing the pre-existing state="new" placeholder.

Warning

Firewall blocked 1 domain

The following domain was blocked by the firewall during workflow execution:

awmgmcpg

To allow these domains, add them to the network.allowed list in your workflow frontmatter:

network:
  allowed:
    - defaults
    - "awmgmcpg"

See Network Configuration for more information.

🤖 Automated content by GitHub Copilot. Generated by the Build Failure Analysis workflow. · 360.1 AIC · ⌖ 5.2 AIC · ⊞ 6K · [◷]( · ◷)

github-actions

Warning

Firewall blocked 1 domain

The following domain was blocked by the firewall during workflow execution:

awmgmcpg

To allow these domains, add them to the network.allowed list in your workflow frontmatter:

network:
  allowed:
    - defaults
    - "awmgmcpg"

See Network Configuration for more information.

🤖 Automated content by GitHub Copilot. Generated by the Build Failure Analysis workflow. · 360.1 AIC · ⌖ 5.2 AIC · ⊞ 6K · ◷

Comments that could not be inline-anchored

src/Platform/Microsoft.Testing.Extensions.GitHubActionsReport/Resources/xlf/GitHubActionsResources.ru.xlf:78

Duplicate <target> element — XLF schema allows only one per <trans-unit>. The Russian translation on the line above is correct; remove this English fallback.

src/Analyzers/MSTest.Analyzers/xlf/Resources.fr.xlf:595

Duplicate <target> element — XLF allows only one per <trans-unit>. The French translation is in the target above (lines 566-580). Remove this duplicate English-only block.

Copilot AI review requested due to automatic review settings July 13, 2026 19:46

Copilot started reviewing on behalf of Evangelink July 13, 2026 19:48 View session

Copilot AI reviewed Jul 13, 2026

View reviewed changes

Evangelink added the state/needs-review Awaiting review from the team. label Jul 13, 2026

Evangelink enabled auto-merge (squash) July 13, 2026 19:51

0101 approved these changes Jul 13, 2026

View reviewed changes

github-code-quality Bot found potential problems Jul 13, 2026

View reviewed changes

Address review: use explicit .Where/.Any filtering over implicit fore…

a84587b

…ach filters Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 2fc1a0b3-faab-4c48-a40a-23eae6fa9386

Copilot AI review requested due to automatic review settings July 13, 2026 20:12

Copilot started reviewing on behalf of Evangelink July 13, 2026 20:12 View session

Copilot AI reviewed Jul 13, 2026

View reviewed changes

0101 approved these changes Jul 13, 2026

View reviewed changes

Copilot AI review requested due to automatic review settings July 14, 2026 08:01

Copilot started reviewing on behalf of Evangelink July 14, 2026 08:02 View session

Copilot AI reviewed Jul 14, 2026

View reviewed changes

Comment thread ...Microsoft.Testing.Extensions.GitHubActionsReport/Resources/xlf/GitHubActionsResources.ru.xlf

Comment thread src/Analyzers/MSTest.Analyzers/xlf/Resources.fr.xlf

0101 approved these changes Jul 14, 2026

View reviewed changes

Merge branch 'main' into dev/amauryleve/glowing-fortnight

9aa25d9

Copilot AI review requested due to automatic review settings July 14, 2026 09:06

Copilot started reviewing on behalf of Evangelink July 14, 2026 09:07 View session

0101 approved these changes Jul 14, 2026

View reviewed changes

Copilot AI reviewed Jul 14, 2026

View reviewed changes

Merge branch 'main' into dev/amauryleve/glowing-fortnight

1b17423

Copilot AI review requested due to automatic review settings July 14, 2026 09:47

Copilot started reviewing on behalf of Evangelink July 14, 2026 09:49 View session

Copilot AI reviewed Jul 14, 2026

View reviewed changes

Comment thread ...Microsoft.Testing.Extensions.GitHubActionsReport/Resources/xlf/GitHubActionsResources.ru.xlf

Comment thread src/Analyzers/MSTest.Analyzers/xlf/Resources.fr.xlf

0101 approved these changes Jul 14, 2026

View reviewed changes

github-actions Bot reviewed Jul 14, 2026

View reviewed changes

Evangelink disabled auto-merge July 14, 2026 11:01

Evangelink merged commit 0d96d48 into main Jul 14, 2026
31 of 38 checks passed

Evangelink deleted the dev/amauryleve/glowing-fortnight branch July 14, 2026 11:01

Uh oh!

Conversation

Evangelink commented Jul 13, 2026

Summary

New files (all under 300 lines)

Notes

Validation

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Review details

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Review details

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Review details

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Review details

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Review details

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Jul 14, 2026

🔍 Build Failure Analysis

Root Cause: Duplicate <target> elements in XLF localization files

Error Group 1: src/Analyzers/MSTest.Analyzers/xlf/Resources.fr.xlf

Error Group 2: src/Platform/Microsoft.Testing.Extensions.GitHubActionsReport/Resources/xlf/GitHubActionsResources.ru.xlf

Summary

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Comments that could not be inline-anchored

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Root Cause: Duplicate `<target>` elements in XLF localization files

Error Group 1: `src/Analyzers/MSTest.Analyzers/xlf/Resources.fr.xlf`

Error Group 2: `src/Platform/Microsoft.Testing.Extensions.GitHubActionsReport/Resources/xlf/GitHubActionsResources.ru.xlf`