Skip to content

Commit e359e4a

Browse files
JoeRobichJoeRobich
committed
Update tests to use InlineData
1 parent 7b80eb0 commit e359e4a

File tree

2 files changed

+24
-165
lines changed

2 files changed

+24
-165
lines changed

‎src/EditorFeatures/CSharpTest/Classification/SyntacticClassifierTests.cs‎

Lines changed: 13 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1712,94 +1712,25 @@ await TestAsync(code,
17121712
Punctuation.CloseCurly);
17131713
}
17141714

1715-
[Theory, CombinatorialData]
1716-
public async Task XmlDocComment_LangWordAttribute_Keyword(TestHost testHost)
1715+
[Theory]
1716+
[InlineData(TestHost.InProcess, "true", false)]
1717+
[InlineData(TestHost.OutOfProcess, "true", false)]
1718+
[InlineData(TestHost.InProcess, "return", true)]
1719+
[InlineData(TestHost.OutOfProcess, "return", true)]
1720+
[InlineData(TestHost.InProcess, "with", false)]
1721+
[InlineData(TestHost.OutOfProcess, "with", false)]
1722+
public async Task XmlDocComment_LangWordAttribute_Keywords(TestHost testHost, string langword, bool isControlKeyword)
17171723
{
17181724
await TestAsync(
1719-
"""
1725+
$$"""
17201726
/// <summary>
1721-
/// <see langword="true"/>
1727+
/// <see langword="{{langword}}"/>
17221728
/// </summary>
17231729
class MyClass
17241730
{
17251731
}
1726-
""", testHost,
1727-
XmlDoc.Delimiter("///"),
1728-
XmlDoc.Text(" "),
1729-
XmlDoc.Delimiter("<"),
1730-
XmlDoc.Name("summary"),
1731-
XmlDoc.Delimiter(">"),
1732-
XmlDoc.Delimiter("///"),
1733-
XmlDoc.Text(" "),
1734-
XmlDoc.Delimiter("<"),
1735-
XmlDoc.Name("see"),
1736-
XmlDoc.AttributeName("langword"),
1737-
XmlDoc.Delimiter("="),
1738-
XmlDoc.AttributeQuotes("\""),
1739-
Keyword("true"),
1740-
XmlDoc.AttributeQuotes("\""),
1741-
XmlDoc.Delimiter("/>"),
1742-
XmlDoc.Delimiter("///"),
1743-
XmlDoc.Text(" "),
1744-
XmlDoc.Delimiter("</"),
1745-
XmlDoc.Name("summary"),
1746-
XmlDoc.Delimiter(">"),
1747-
Keyword("class"),
1748-
Class("MyClass"),
1749-
Punctuation.OpenCurly,
1750-
Punctuation.CloseCurly);
1751-
}
1752-
1753-
[Theory, CombinatorialData]
1754-
public async Task XmlDocComment_LangWordAttribute_ControlKeyword(TestHost testHost)
1755-
{
1756-
await TestAsync(
1757-
"""
1758-
/// <summary>
1759-
/// <see langword="return"/>
1760-
/// </summary>
1761-
class MyClass
1762-
{
1763-
}
1764-
""", testHost,
1765-
XmlDoc.Delimiter("///"),
1766-
XmlDoc.Text(" "),
1767-
XmlDoc.Delimiter("<"),
1768-
XmlDoc.Name("summary"),
1769-
XmlDoc.Delimiter(">"),
1770-
XmlDoc.Delimiter("///"),
1771-
XmlDoc.Text(" "),
1772-
XmlDoc.Delimiter("<"),
1773-
XmlDoc.Name("see"),
1774-
XmlDoc.AttributeName("langword"),
1775-
XmlDoc.Delimiter("="),
1776-
XmlDoc.AttributeQuotes("\""),
1777-
ControlKeyword("return"),
1778-
XmlDoc.AttributeQuotes("\""),
1779-
XmlDoc.Delimiter("/>"),
1780-
XmlDoc.Delimiter("///"),
1781-
XmlDoc.Text(" "),
1782-
XmlDoc.Delimiter("</"),
1783-
XmlDoc.Name("summary"),
1784-
XmlDoc.Delimiter(">"),
1785-
Keyword("class"),
1786-
Class("MyClass"),
1787-
Punctuation.OpenCurly,
1788-
Punctuation.CloseCurly);
1789-
}
1790-
1791-
[Theory, CombinatorialData]
1792-
public async Task XmlDocComment_LangWordAttribute_ContextualKeyword(TestHost testHost)
1793-
{
1794-
await TestAsync(
1795-
"""
1796-
/// <summary>
1797-
/// <see langword="with"/>
1798-
/// </summary>
1799-
class MyClass
1800-
{
1801-
}
1802-
""", testHost,
1732+
""",
1733+
testHost,
18031734
XmlDoc.Delimiter("///"),
18041735
XmlDoc.Text(" "),
18051736
XmlDoc.Delimiter("<"),
@@ -1812,7 +1743,7 @@ class MyClass
18121743
XmlDoc.AttributeName("langword"),
18131744
XmlDoc.Delimiter("="),
18141745
XmlDoc.AttributeQuotes("\""),
1815-
Keyword("with"),
1746+
isControlKeyword ? ControlKeyword(langword) : Keyword(langword),
18161747
XmlDoc.AttributeQuotes("\""),
18171748
XmlDoc.Delimiter("/>"),
18181749
XmlDoc.Delimiter("///"),

‎src/EditorFeatures/VisualBasicTest/Classification/SyntacticClassifierTests.vb‎

Lines changed: 11 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -2670,89 +2670,17 @@ End Class"
26702670
Keyword("Class"))
26712671
End Function
26722672

2673-
<Theory, CombinatorialData>
2674-
Public Async Function TestXmlDocComment_LangWordAttribute_Keyword(testHost As TestHost) As Task
2675-
Dim code =
2676-
"''' <summary>
2677-
''' <see langword=""True"" />
2678-
''' </summary>
2679-
Class MyClass
2680-
End Class"
2681-
2682-
Await TestAsync(code,
2683-
testHost,
2684-
XmlDoc.Delimiter("'''"),
2685-
XmlDoc.Text(" "),
2686-
XmlDoc.Delimiter("<"),
2687-
XmlDoc.Name("summary"),
2688-
XmlDoc.Delimiter(">"),
2689-
XmlDoc.Delimiter("'''"),
2690-
XmlDoc.Text(" "),
2691-
XmlDoc.Delimiter("<"),
2692-
XmlDoc.Name("see"),
2693-
XmlDoc.Name(" "),
2694-
XmlDoc.AttributeName("langword"),
2695-
XmlDoc.Delimiter("="),
2696-
XmlDoc.AttributeQuotes(""""),
2697-
Keyword("True"),
2698-
XmlDoc.AttributeQuotes(""""),
2699-
XmlDoc.AttributeQuotes(" "),
2700-
XmlDoc.Delimiter("/>"),
2701-
XmlDoc.Delimiter("'''"),
2702-
XmlDoc.Text(" "),
2703-
XmlDoc.Delimiter("</"),
2704-
XmlDoc.Name("summary"),
2705-
XmlDoc.Delimiter(">"),
2706-
Keyword("Class"),
2707-
[Class]("MyClass"),
2708-
Keyword("End"),
2709-
Keyword("Class"))
2710-
End Function
2711-
2712-
<Theory, CombinatorialData>
2713-
Public Async Function TestXmlDocComment_LangWordAttribute_ControlKeyword(testHost As TestHost) As Task
2673+
<Theory>
2674+
<InlineData(TestHost.InProcess, "True", False)>
2675+
<InlineData(TestHost.OutOfProcess, "True", False)>
2676+
<InlineData(TestHost.InProcess, "Return", True)>
2677+
<InlineData(TestHost.OutOfProcess, "Return", True)>
2678+
<InlineData(TestHost.InProcess, "All", False)>
2679+
<InlineData(TestHost.OutOfProcess, "All", False)>
2680+
Public Async Function TestXmlDocComment_LangWordAttribute_Keywords(testHost As TestHost, langword As String, isControlKeyword As Boolean) As Task
27142681
Dim code =
2715-
"''' <summary>
2716-
''' <see langword=""Return"" />
2717-
''' </summary>
2718-
Class MyClass
2719-
End Class"
2720-
2721-
Await TestAsync(code,
2722-
testHost,
2723-
XmlDoc.Delimiter("'''"),
2724-
XmlDoc.Text(" "),
2725-
XmlDoc.Delimiter("<"),
2726-
XmlDoc.Name("summary"),
2727-
XmlDoc.Delimiter(">"),
2728-
XmlDoc.Delimiter("'''"),
2729-
XmlDoc.Text(" "),
2730-
XmlDoc.Delimiter("<"),
2731-
XmlDoc.Name("see"),
2732-
XmlDoc.Name(" "),
2733-
XmlDoc.AttributeName("langword"),
2734-
XmlDoc.Delimiter("="),
2735-
XmlDoc.AttributeQuotes(""""),
2736-
ControlKeyword("Return"),
2737-
XmlDoc.AttributeQuotes(""""),
2738-
XmlDoc.AttributeQuotes(" "),
2739-
XmlDoc.Delimiter("/>"),
2740-
XmlDoc.Delimiter("'''"),
2741-
XmlDoc.Text(" "),
2742-
XmlDoc.Delimiter("</"),
2743-
XmlDoc.Name("summary"),
2744-
XmlDoc.Delimiter(">"),
2745-
Keyword("Class"),
2746-
[Class]("MyClass"),
2747-
Keyword("End"),
2748-
Keyword("Class"))
2749-
End Function
2750-
2751-
<Theory, CombinatorialData>
2752-
Public Async Function TestXmlDocComment_LangWordAttribute_ContextualKeyword(testHost As TestHost) As Task
2753-
Dim code =
2754-
"''' <summary>
2755-
''' <see langword=""All"" />
2682+
$"''' <summary>
2683+
''' <see langword=""{langword}"" />
27562684
''' </summary>
27572685
Class MyClass
27582686
End Class"
@@ -2772,7 +2700,7 @@ End Class"
27722700
XmlDoc.AttributeName("langword"),
27732701
XmlDoc.Delimiter("="),
27742702
XmlDoc.AttributeQuotes(""""),
2775-
Keyword("All"),
2703+
If(isControlKeyword, ControlKeyword(langword), Keyword(langword)),
27762704
XmlDoc.AttributeQuotes(""""),
27772705
XmlDoc.AttributeQuotes(" "),
27782706
XmlDoc.Delimiter("/>"),

0 commit comments

Comments
 (0)