Skip to content

Commit 2141b98

Browse files
committed
Migrate to MSTest
1 parent e4eb189 commit 2141b98

File tree

134 files changed

+5411
-5404
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+5411
-5404
lines changed

test/Directory.Build.props

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PropertyGroup>
88
<!--
99
.NET 9 preview 2 or later run tests in parallel by default.
10-
It is necessary to disable this feature because there are tests that need to be executed sequentially that are marked with `[Collection("docfx STA")]`.
10+
It is necessary to disable this feature because there are tests that need to be executed sequentially that are marked with `[DoNotParallelize]`.
1111
-->
1212
<TestTfmsInParallel>false</TestTfmsInParallel>
1313
</PropertyGroup>
@@ -30,8 +30,14 @@
3030

3131
<ItemGroup>
3232
<PackageReference Include="AwesomeAssertions" />
33-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
34-
<PackageReference Include="xunit.runner.visualstudio" />
35-
<PackageReference Include="xunit" />
33+
<PackageReference Include="MSTest" />
34+
35+
<Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
36+
<AssemblyAttribute Include="Microsoft.VisualStudio.TestTools.UnitTesting.Parallelize">
37+
<_Parameter1>Workers = 0</_Parameter1>
38+
<_Parameter1_IsLiteral>true</_Parameter1_IsLiteral>
39+
<_Parameter2>Scope = Microsoft.VisualStudio.TestTools.UnitTesting.ExecutionScope.MethodLevel</_Parameter2>
40+
<_Parameter2_IsLiteral>true</_Parameter2_IsLiteral>
41+
</AssemblyAttribute>
3642
</ItemGroup>
3743
</Project>

test/Directory.Packages.props

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44

55
<ItemGroup>
66
<PackageVersion Include="AwesomeAssertions" Version="8.0.2" />
7-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
87
<PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
9-
<PackageVersion Include="Verify.Xunit" Version="28.16.0" />
10-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
11-
<PackageVersion Include="xunit" Version="2.9.3" />
8+
<PackageVersion Include="Verify.MSTest" Version="28.16.0" />
9+
<PackageVersion Include="MSTest" Version="3.8.3" />
1210
</ItemGroup>
1311

1412
<ItemGroup>

test/Docfx.Build.Common.Tests/FileLinkInfoTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
using Docfx.Common;
55
using FluentAssertions;
6-
using Xunit;
76

87
namespace Docfx.MarkdigEngine.Tests;
98

9+
[TestClass]
1010
public class FileLinkInfoTest
1111
{
12-
[Fact]
12+
[TestMethod]
1313
public void TestFileLinkInfo_EncodedWorkspaceCharacter()
1414
{
1515
string fromFileInSource = "articles/vpn-gateway/vpn-gateway-verify-connection-resource-manager.md";

test/Docfx.Build.Common.Tests/MarkdownReaderTest.cs

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
using Docfx.Build.Engine;
77
using Docfx.MarkdigEngine;
88
using Docfx.Plugins;
9-
using Xunit;
109

1110
namespace Docfx.Build.Common.Tests;
1211

12+
[TestClass]
1313
public class MarkdownReaderTest
1414
{
15-
[Fact]
15+
[TestMethod]
1616
public void TestReadMarkdownAsOverwrite()
1717
{
1818
var content = @"---
@@ -34,11 +34,11 @@ public void TestReadMarkdownAsOverwrite()
3434

3535
var ft = new FileAndType(baseDir, fileName, DocumentType.Overwrite);
3636
var results = MarkdownReader.ReadMarkdownAsOverwrite(host, ft).ToList();
37-
Assert.NotNull(results);
38-
Assert.Single(results);
39-
Assert.Equal("Test", results[0].Uid);
40-
Assert.Equal("Hello", results[0].Metadata["remarks"]);
41-
Assert.Equal("\n<p sourcefile=\"ut_ReadMarkdownAsOverwrite.md\" sourcestartlinenumber=\"6\">This is unit test!</p>\n", results[0].Conceptual);
37+
Assert.IsNotNull(results);
38+
Assert.ContainsSingle(results);
39+
Assert.AreEqual("Test", results[0].Uid);
40+
Assert.AreEqual("Hello", results[0].Metadata["remarks"]);
41+
Assert.AreEqual("\n<p sourcefile=\"ut_ReadMarkdownAsOverwrite.md\" sourcestartlinenumber=\"6\">This is unit test!</p>\n", results[0].Conceptual);
4242
File.Delete(fileName);
4343

4444
// Test conceptual content between two yamlheader
@@ -55,13 +55,13 @@ This is unit test!
5555
content = Regex.Replace(content, "\r?\n", "\r\n");
5656
File.WriteAllText(fileName, content);
5757
results = MarkdownReader.ReadMarkdownAsOverwrite(host, ft).ToList();
58-
Assert.NotNull(results);
59-
Assert.Equal(2, results.Count);
60-
Assert.Equal("Test1", results[0].Uid);
61-
Assert.Equal("Test2", results[1].Uid);
62-
Assert.Equal("Hello", results[0].Metadata["remarks"]);
63-
Assert.Equal("\n<p sourcefile=\"ut_ReadMarkdownAsOverwrite.md\" sourcestartlinenumber=\"5\">This is unit test!</p>\n", results[0].Conceptual);
64-
Assert.Equal(string.Empty, results[1].Conceptual);
58+
Assert.IsNotNull(results);
59+
Assert.AreEqual(2, results.Count);
60+
Assert.AreEqual("Test1", results[0].Uid);
61+
Assert.AreEqual("Test2", results[1].Uid);
62+
Assert.AreEqual("Hello", results[0].Metadata["remarks"]);
63+
Assert.AreEqual("\n<p sourcefile=\"ut_ReadMarkdownAsOverwrite.md\" sourcestartlinenumber=\"5\">This is unit test!</p>\n", results[0].Conceptual);
64+
Assert.AreEqual(string.Empty, results[1].Conceptual);
6565
File.Delete(fileName);
6666

6767
content = @"---
@@ -76,13 +76,13 @@ This is unit test!
7676
content = Regex.Replace(content, "\r?\n", "\r\n");
7777
File.WriteAllText(fileName, content);
7878
results = MarkdownReader.ReadMarkdownAsOverwrite(host, ft).ToList();
79-
Assert.NotNull(results);
80-
Assert.Equal(2, results.Count);
81-
Assert.Equal("Test1", results[0].Uid);
82-
Assert.Equal("Hello", results[0].Metadata["remarks"]);
83-
Assert.Equal("\n<p sourcefile=\"ut_ReadMarkdownAsOverwrite.md\" sourcestartlinenumber=\"5\">This is unit test!</p>\n", results[0].Conceptual);
84-
Assert.Equal("Test2", results[1].Uid);
85-
Assert.Equal("", results[1].Conceptual);
79+
Assert.IsNotNull(results);
80+
Assert.AreEqual(2, results.Count);
81+
Assert.AreEqual("Test1", results[0].Uid);
82+
Assert.AreEqual("Hello", results[0].Metadata["remarks"]);
83+
Assert.AreEqual("\n<p sourcefile=\"ut_ReadMarkdownAsOverwrite.md\" sourcestartlinenumber=\"5\">This is unit test!</p>\n", results[0].Conceptual);
84+
Assert.AreEqual("Test2", results[1].Uid);
85+
Assert.AreEqual("", results[1].Conceptual);
8686
File.Delete(fileName);
8787

8888
// Test conceptual content with extra empty line between two yamlheader
@@ -102,24 +102,24 @@ This is unit test!
102102
content = Regex.Replace(content, "\r?\n", "\r\n");
103103
File.WriteAllText(fileName, content);
104104
results = MarkdownReader.ReadMarkdownAsOverwrite(host, ft).ToList();
105-
Assert.NotNull(results);
106-
Assert.Equal(2, results.Count);
107-
Assert.Equal("Test1", results[0].Uid);
108-
Assert.Equal("Test2", results[1].Uid);
109-
Assert.Equal("Hello", results[0].Metadata["remarks"]);
110-
Assert.Equal("\n<p sourcefile=\"ut_ReadMarkdownAsOverwrite.md\" sourcestartlinenumber=\"7\">This is unit test!</p>\n", results[0].Conceptual);
111-
Assert.Equal(string.Empty, results[1].Conceptual);
105+
Assert.IsNotNull(results);
106+
Assert.AreEqual(2, results.Count);
107+
Assert.AreEqual("Test1", results[0].Uid);
108+
Assert.AreEqual("Test2", results[1].Uid);
109+
Assert.AreEqual("Hello", results[0].Metadata["remarks"]);
110+
Assert.AreEqual("\n<p sourcefile=\"ut_ReadMarkdownAsOverwrite.md\" sourcestartlinenumber=\"7\">This is unit test!</p>\n", results[0].Conceptual);
111+
Assert.AreEqual(string.Empty, results[1].Conceptual);
112112
File.Delete(fileName);
113113

114114
// Test different line ending
115115
content = "---\nuid: Test\nremarks: Hello\n---\nThis is unit test!\n";
116116
File.WriteAllText(fileName, content);
117117
results = MarkdownReader.ReadMarkdownAsOverwrite(host, ft).ToList();
118-
Assert.NotNull(results);
119-
Assert.Single(results);
120-
Assert.Equal("Test", results[0].Uid);
121-
Assert.Equal("Hello", results[0].Metadata["remarks"]);
122-
Assert.Equal("\n<p sourcefile=\"ut_ReadMarkdownAsOverwrite.md\" sourcestartlinenumber=\"5\">This is unit test!</p>\n", results[0].Conceptual);
118+
Assert.IsNotNull(results);
119+
Assert.ContainsSingle(results);
120+
Assert.AreEqual("Test", results[0].Uid);
121+
Assert.AreEqual("Hello", results[0].Metadata["remarks"]);
122+
Assert.AreEqual("\n<p sourcefile=\"ut_ReadMarkdownAsOverwrite.md\" sourcestartlinenumber=\"5\">This is unit test!</p>\n", results[0].Conceptual);
123123
File.Delete(fileName);
124124

125125
// Test link to files and Uids in overwrite document
@@ -136,47 +136,47 @@ [Not exist link2](link2.md)
136136
content = Regex.Replace(content, "\r?\n", "\r\n");
137137
File.WriteAllText(fileName, content);
138138
results = MarkdownReader.ReadMarkdownAsOverwrite(host, ft).ToList();
139-
Assert.NotNull(results);
140-
Assert.Single(results);
141-
Assert.Equal("Test", results[0].Uid);
142-
Assert.Equal("Hello", results[0].Metadata["remarks"]);
143-
Assert.Equal(2, results[0].LinkToFiles.Count);
144-
Assert.True(results[0].LinkToFiles.OrderBy(f => f).SequenceEqual(new[] { "~/link.md", "~/link2.md", }));
145-
Assert.Single(results[0].LinkToUids);
146-
Assert.Equal("NotExistUid", results[0].LinkToUids.ElementAt(0));
147-
Assert.Equal(2, results[0].FileLinkSources.Count);
139+
Assert.IsNotNull(results);
140+
Assert.ContainsSingle(results);
141+
Assert.AreEqual("Test", results[0].Uid);
142+
Assert.AreEqual("Hello", results[0].Metadata["remarks"]);
143+
Assert.AreEqual(2, results[0].LinkToFiles.Count);
144+
Assert.IsTrue(results[0].LinkToFiles.OrderBy(f => f).SequenceEqual(new[] { "~/link.md", "~/link2.md", }));
145+
Assert.ContainsSingle(results[0].LinkToUids);
146+
Assert.AreEqual("NotExistUid", results[0].LinkToUids.ElementAt(0));
147+
Assert.AreEqual(2, results[0].FileLinkSources.Count);
148148
var fileLinkSource0 = results[0].FileLinkSources["~/link.md"];
149-
Assert.NotNull(fileLinkSource0);
150-
Assert.Single(fileLinkSource0);
151-
Assert.Null(fileLinkSource0[0].Anchor);
152-
Assert.Equal(7, fileLinkSource0[0].LineNumber);
153-
Assert.Equal(fileName, fileLinkSource0[0].SourceFile);
154-
Assert.Equal("~/link.md", fileLinkSource0[0].Target);
155-
Assert.Single(results[0].UidLinkSources);
149+
Assert.IsNotNull(fileLinkSource0);
150+
Assert.ContainsSingle(fileLinkSource0);
151+
Assert.IsNull(fileLinkSource0[0].Anchor);
152+
Assert.AreEqual(7, fileLinkSource0[0].LineNumber);
153+
Assert.AreEqual(fileName, fileLinkSource0[0].SourceFile);
154+
Assert.AreEqual("~/link.md", fileLinkSource0[0].Target);
155+
Assert.ContainsSingle(results[0].UidLinkSources);
156156
var fileLinkSource1 = results[0].FileLinkSources["~/link2.md"];
157-
Assert.NotNull(fileLinkSource1);
158-
Assert.Single(fileLinkSource1);
159-
Assert.Null(fileLinkSource1[0].Anchor);
160-
Assert.Equal(8, fileLinkSource1[0].LineNumber);
161-
Assert.Equal(fileName, fileLinkSource1[0].SourceFile);
162-
Assert.Equal("~/link2.md", fileLinkSource1[0].Target);
163-
Assert.Single(results[0].UidLinkSources);
157+
Assert.IsNotNull(fileLinkSource1);
158+
Assert.ContainsSingle(fileLinkSource1);
159+
Assert.IsNull(fileLinkSource1[0].Anchor);
160+
Assert.AreEqual(8, fileLinkSource1[0].LineNumber);
161+
Assert.AreEqual(fileName, fileLinkSource1[0].SourceFile);
162+
Assert.AreEqual("~/link2.md", fileLinkSource1[0].Target);
163+
Assert.ContainsSingle(results[0].UidLinkSources);
164164
var uidLinkSource = results[0].UidLinkSources["NotExistUid"];
165-
Assert.NotNull(uidLinkSource);
166-
Assert.Single(uidLinkSource);
167-
Assert.Null(uidLinkSource[0].Anchor);
168-
Assert.Equal(5, uidLinkSource[0].LineNumber);
169-
Assert.Equal(fileName, uidLinkSource[0].SourceFile);
170-
Assert.Equal("NotExistUid", uidLinkSource[0].Target);
171-
Assert.Equal(
165+
Assert.IsNotNull(uidLinkSource);
166+
Assert.ContainsSingle(uidLinkSource);
167+
Assert.IsNull(uidLinkSource[0].Anchor);
168+
Assert.AreEqual(5, uidLinkSource[0].LineNumber);
169+
Assert.AreEqual(fileName, uidLinkSource[0].SourceFile);
170+
Assert.AreEqual("NotExistUid", uidLinkSource[0].Target);
171+
// TODO: ignoreLineEndingDifferences (if needed)
172+
Assert.AreEqual(
172173
"""
173174
<p sourcefile="ut_ReadMarkdownAsOverwrite.md" sourcestartlinenumber="5"><xref href="NotExistUid" data-throw-if-not-resolved="False" data-raw-source="@NotExistUid" sourcefile="ut_ReadMarkdownAsOverwrite.md" sourcestartlinenumber="5"></xref></p>
174175
<p sourcefile="ut_ReadMarkdownAsOverwrite.md" sourcestartlinenumber="7"><a href="link.md" sourcefile="ut_ReadMarkdownAsOverwrite.md" sourcestartlinenumber="7">Not exist link</a>
175176
<a href="link2.md" sourcefile="ut_ReadMarkdownAsOverwrite.md" sourcestartlinenumber="8">Not exist link2</a></p>
176177
<p sourcefile="ut_ReadMarkdownAsOverwrite.md" sourcestartlinenumber="10">This is unit test!</p>
177178
""",
178-
results[0].Conceptual.Trim(),
179-
ignoreLineEndingDifferences: true);
179+
results[0].Conceptual.Trim());
180180
File.Delete(fileName);
181181
}
182182
}

0 commit comments

Comments
 (0)