Skip to content

Commit 7cb2ce7

Browse files
committed
Complete refactor of SampleGen tests
1 parent c42c1fd commit 7cb2ce7

3 files changed

Lines changed: 9 additions & 12 deletions

File tree

CommunityToolkit.Tooling.SampleGen.Tests/SampleGenTestHelpers.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ internal static void VerifyGeneratedDiagnostics<TGenerator>(SyntaxTree syntaxTre
2929

3030
_ = driver.RunGeneratorsAndUpdateCompilation(compilation, out Compilation generatorCompilation, out ImmutableArray<Diagnostic> postGeneratorCompilationDiagnostics);
3131

32-
VerifyCompilationErrors(compilation);
3332
VerifyCompilationErrors(generatorCompilation);
3433
VerifyDiagnostics(diagnosticsIds, postGeneratorCompilationDiagnostics);
3534
}
@@ -48,7 +47,7 @@ internal static void VerifyGenerateSources(string assemblyName, string source, I
4847
CollectionAssert.AreEquivalent(Array.Empty<Diagnostic>(), diagnostics);
4948
}
5049

51-
VerifyCompilationErrors(compilation);
50+
VerifyCompilationErrors(generatorCompilation);
5251
VerifyGeneratedSources(results, generatorCompilation);
5352
}
5453

CommunityToolkit.Tooling.SampleGen.Tests/ToolkitSampleGeneratedPaneTests.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ public partial class Sample : Windows.UI.Xaml.Controls.UserControl
5858
{
5959
public Sample()
6060
{
61-
var x = this.Test;
62-
var y = this.TextFontFamily;
6361
}
6462
}
6563
}
@@ -83,7 +81,7 @@ public static class ToolkitSampleRegistry
8381
}
8482
""";
8583

86-
ToolkitSampleMetadataTests.VerifyGenerateSources("MyApp.Tests", source, new[] { new ToolkitSampleMetadataGenerator() }, ignoreDiagnostics: true, ("ToolkitSampleRegistry.g.cs", result));
84+
TestHelpers.VerifyGenerateSources("MyApp.Tests", source, new[] { new ToolkitSampleMetadataGenerator() }, ignoreDiagnostics: true, ("ToolkitSampleRegistry.g.cs", result));
8785
}
8886

8987
// https://github.com/CommunityToolkit/Labs-Windows/issues/175

CommunityToolkit.Tooling.SampleGen.Tests/ToolkitSampleMetadataTests.Documentation.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void MissingFrontMatterSection()
4040
Without any front matter.
4141
";
4242

43-
VerifyGeneratedDiagnostics<ToolkitSampleMetadataGenerator>(SimpleSource, markdown, DiagnosticDescriptors.MarkdownYAMLFrontMatterException.Id, DiagnosticDescriptors.SampleNotReferencedInMarkdown.Id);
43+
TestHelpers.VerifyGeneratedDiagnostics<ToolkitSampleMetadataGenerator>(SimpleSource, markdown, DiagnosticDescriptors.MarkdownYAMLFrontMatterException.Id, DiagnosticDescriptors.SampleNotReferencedInMarkdown.Id);
4444
}
4545

4646
[DataRow(1, DisplayName = "Title")]
@@ -74,7 +74,7 @@ public void MissingFrontMatterField(int removeline)
7474
lines.RemoveAt(removeline);
7575
markdown = String.Join('\n', lines);
7676

77-
VerifyGeneratedDiagnostics<ToolkitSampleMetadataGenerator>(SimpleSource, markdown, DiagnosticDescriptors.MarkdownYAMLFrontMatterMissingField.Id, DiagnosticDescriptors.SampleNotReferencedInMarkdown.Id); // We won't see the sample reference as we bail out when the front matter fails to be complete...
77+
TestHelpers.VerifyGeneratedDiagnostics<ToolkitSampleMetadataGenerator>(SimpleSource, markdown, DiagnosticDescriptors.MarkdownYAMLFrontMatterMissingField.Id, DiagnosticDescriptors.SampleNotReferencedInMarkdown.Id); // We won't see the sample reference as we bail out when the front matter fails to be complete...
7878
}
7979

8080
[TestMethod]
@@ -97,7 +97,7 @@ public void MarkdownInvalidSampleReference()
9797
Without any front matter.
9898
";
9999

100-
VerifyGeneratedDiagnostics<ToolkitSampleMetadataGenerator>(SimpleSource, markdown,
100+
TestHelpers.VerifyGeneratedDiagnostics<ToolkitSampleMetadataGenerator>(SimpleSource, markdown,
101101
DiagnosticDescriptors.MarkdownSampleIdNotFound.Id,
102102
DiagnosticDescriptors.SampleNotReferencedInMarkdown.Id);
103103
}
@@ -120,7 +120,7 @@ public void DocumentationMissingSample()
120120
# This is some test documentation...
121121
Without any sample.";
122122

123-
VerifyGeneratedDiagnostics<ToolkitSampleMetadataGenerator>(SimpleSource, markdown,
123+
TestHelpers.VerifyGeneratedDiagnostics<ToolkitSampleMetadataGenerator>(SimpleSource, markdown,
124124
DiagnosticDescriptors.DocumentationHasNoSamples.Id,
125125
DiagnosticDescriptors.SampleNotReferencedInMarkdown.Id);
126126
}
@@ -144,7 +144,7 @@ public void DocumentationValid()
144144
Which is valid.
145145
> [!SAMPLE Sample]";
146146

147-
VerifyGeneratedDiagnostics<ToolkitSampleMetadataGenerator>(SimpleSource, markdown);
147+
TestHelpers.VerifyGeneratedDiagnostics<ToolkitSampleMetadataGenerator>(SimpleSource, markdown);
148148
}
149149

150150
[TestMethod]
@@ -165,7 +165,7 @@ public void DocumentationInvalidDiscussionId()
165165
# This is some test documentation...
166166
Without an invalid discussion id.";
167167

168-
VerifyGeneratedDiagnostics<ToolkitSampleMetadataGenerator>(string.Empty, markdown,
168+
TestHelpers.VerifyGeneratedDiagnostics<ToolkitSampleMetadataGenerator>(string.Empty, markdown,
169169
DiagnosticDescriptors.MarkdownYAMLFrontMatterException.Id,
170170
DiagnosticDescriptors.DocumentationHasNoSamples.Id);
171171
}
@@ -188,7 +188,7 @@ public void DocumentationInvalidIssueId()
188188
# This is some test documentation...
189189
Without an invalid discussion id.";
190190

191-
VerifyGeneratedDiagnostics<ToolkitSampleMetadataGenerator>(string.Empty, markdown,
191+
TestHelpers.VerifyGeneratedDiagnostics<ToolkitSampleMetadataGenerator>(string.Empty, markdown,
192192
DiagnosticDescriptors.MarkdownYAMLFrontMatterException.Id,
193193
DiagnosticDescriptors.DocumentationHasNoSamples.Id);
194194
}

0 commit comments

Comments
 (0)