Migrate to Nunit4 (#2705)

* Migrate to NUnit4

* Microsoft.NET.Test.Sdk 17.0.0 -> 17.10.0

* Move ToJToken to own file

* Mark tests methods with [Test]

* Ignore tests marked with [Test]

* Align per-test and per-class disposal

* Update what tests to ignore

* undo markdown changes

---------

Co-authored-by: Darío Kondratiuk <[email protected]>

Author: jnyrup

lib/PuppeteerSharp.Nunit/PuppeteerSharp.Nunit.csproj

@@ -6,7 +6,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 	  <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-	  <PackageReference Include="NUnit" Version="3.13.3" />
+	  <PackageReference Include="NUnit" Version="4.1.0" />
 	</ItemGroup>
 	<ItemGroup>
 	  <EmbeddedResource Include="TestExpectations\TestExpectations.local.json" />

lib/PuppeteerSharp.Tests/AccessibilityTests/AccessibilityTests.cs

@@ -104,7 +104,7 @@ await Page.SetContentAsync(@"
             };
             await Page.FocusAsync("[placeholder='Empty input']");
             var snapshot = await Page.Accessibility.SnapshotAsync();
-            Assert.AreEqual(nodeToCheck, snapshot);
+            Assert.That(snapshot, Is.EqualTo(nodeToCheck));
         }
 
         [Test, Retry(2), PuppeteerTest("accessibility.spec", "Accessibility", "should report uninteresting nodes")]
@@ -115,8 +115,12 @@ public async Task ShouldReportUninterestingNodes()
 
             // This object has more children than in upstream.
             // Because upstream uses `toMatchObject` which stops going deeper if the element has not Children.
-            Assert.AreEqual(
-                new SerializedAXNode
+            Assert.That(
+                FindFocusedNode(await Page.Accessibility.SnapshotAsync(new AccessibilitySnapshotOptions
+                {
+                    InterestingOnly = false
+                })),
+                Is.EqualTo(new SerializedAXNode
                 {
                     Role = "textbox",
                     Name = "",
@@ -144,11 +148,7 @@ public async Task ShouldReportUninterestingNodes()
                             }
                         }
                     }
-                },
-                FindFocusedNode(await Page.Accessibility.SnapshotAsync(new AccessibilitySnapshotOptions
-                {
-                    InterestingOnly = false
-                })));
+                }));
         }
 
         [Test, Retry(2), PuppeteerTest("accessibility.spec", "Accessibility", "get snapshots while the tree is re-calculated")]
@@ -188,7 +188,7 @@ await Page.SetContentAsync(@"
             </html>");
 
             var button = await Page.QuerySelectorAsync("button");
-            Assert.AreEqual("Show", await GetAccessibleNameAsync(Page, button));
+            Assert.That(await GetAccessibleNameAsync(Page, button), Is.EqualTo("Show"));
             await button!.ClickAsync();
             await Page.WaitForSelectorAsync("aria/Hide");
         }
@@ -207,39 +207,39 @@ public async Task RoleDescription()
             await Page.SetContentAsync("<div tabIndex=-1 aria-roledescription='foo'>Hi</div>");
             var snapshot = await Page.Accessibility.SnapshotAsync();
             // See https://chromium-review.googlesource.com/c/chromium/src/+/3088862
-            Assert.Null(snapshot.Children[0].RoleDescription);
+            Assert.That(snapshot.Children[0].RoleDescription, Is.Null);
         }
 
         [Test, Retry(2), PuppeteerTest("accessibility.spec", "Accessibility", "orientation")]
         public async Task Orientation()
         {
             await Page.SetContentAsync("<a href='' role='slider' aria-orientation='vertical'>11</a>");
             var snapshot = await Page.Accessibility.SnapshotAsync();
-            Assert.AreEqual("vertical", snapshot.Children[0].Orientation);
+            Assert.That(snapshot.Children[0].Orientation, Is.EqualTo("vertical"));
         }
 
         [Test, Retry(2), PuppeteerTest("accessibility.spec", "Accessibility", "autocomplete")]
         public async Task AutoComplete()
         {
             await Page.SetContentAsync("<input type='number' aria-autocomplete='list' />");
             var snapshot = await Page.Accessibility.SnapshotAsync();
-            Assert.AreEqual("list", snapshot.Children[0].AutoComplete);
+            Assert.That(snapshot.Children[0].AutoComplete, Is.EqualTo("list"));
         }
 
         [Test, Retry(2), PuppeteerTest("accessibility.spec", "Accessibility", "multiselectable")]
         public async Task MultiSelectable()
         {
             await Page.SetContentAsync("<div role='grid' tabIndex=-1 aria-multiselectable=true>hey</div>");
             var snapshot = await Page.Accessibility.SnapshotAsync();
-            Assert.True(snapshot.Children[0].Multiselectable);
+            Assert.That(snapshot.Children[0].Multiselectable, Is.True);
         }
 
         [Test, Retry(2), PuppeteerTest("accessibility.spec", "Accessibility", "keyshortcuts")]
         public async Task KeyShortcuts()
         {
             await Page.SetContentAsync("<div role='grid' tabIndex=-1 aria-keyshortcuts='foo'>hey</div>");
             var snapshot = await Page.Accessibility.SnapshotAsync();
-            Assert.AreEqual("foo", snapshot.Children[0].KeyShortcuts);
+            Assert.That(snapshot.Children[0].KeyShortcuts, Is.EqualTo("foo"));
         }
 
         [Test, Retry(2), PuppeteerTest("accessibility.spec", "filtering children of leaf nodes", "should not report text nodes inside controls")]
@@ -250,8 +250,9 @@ await Page.SetContentAsync(@"
                 <div role='tab' aria-selected='true'><b>Tab1</b></div>
                 <div role='tab'>Tab2</div>
             </div>");
-            Assert.AreEqual(
-                new SerializedAXNode
+            Assert.That(
+                await Page.Accessibility.SnapshotAsync(),
+                Is.EqualTo(new SerializedAXNode
                 {
                     Role = "RootWebArea",
                     Name = "",
@@ -267,8 +268,7 @@ await Page.SetContentAsync(@"
                             Name = "Tab2"
                         }
                     }
-                },
-                await Page.Accessibility.SnapshotAsync());
+                }));
         }
 
         [Test, Retry(2), PuppeteerTest("accessibility.spec", "filtering children of leaf nodes", "rich text editable fields should have children")]
@@ -278,8 +278,9 @@ await Page.SetContentAsync(@"
             <div contenteditable='true'>
                 Edit this image: <img src='fakeimage.png' alt='my fake image'>
             </div>");
-            Assert.AreEqual(
-                new SerializedAXNode
+            Assert.That(
+                (await Page.Accessibility.SnapshotAsync()).Children[0],
+                Is.EqualTo(new SerializedAXNode
                 {
                     Role = "generic",
                     Name = "",
@@ -295,8 +296,7 @@ await Page.SetContentAsync(@"
                             Name = "my fake image"
                         }
                     }
-                },
-                (await Page.Accessibility.SnapshotAsync()).Children[0]);
+                }));
         }
 
         [Test, Retry(2), PuppeteerTest("accessibility.spec", "filtering children of leaf nodes", "rich text editable fields with role should have children")]
@@ -306,8 +306,9 @@ await Page.SetContentAsync(@"
             <div contenteditable='true' role='textbox'>
                 Edit this image: <img src='fakeimage.png' alt='my fake image'>
             </div>");
-            Assert.AreEqual(
-                new SerializedAXNode
+            Assert.That(
+                (await Page.Accessibility.SnapshotAsync()).Children[0],
+                Is.EqualTo(new SerializedAXNode
                 {
                     Role = "textbox",
                     Name = "",
@@ -320,23 +321,22 @@ await Page.SetContentAsync(@"
                             Name = "Edit this image: "
                         },
                     }
-                },
-                (await Page.Accessibility.SnapshotAsync()).Children[0]);
+                }));
         }
 
         [Test, Retry(2), PuppeteerTest("accessibility.spec", "plaintext contenteditable", "plain text field with role should not have children")]
         public async Task PlainTextFieldWithRoleShouldNotHaveChildren()
         {
             await Page.SetContentAsync("<div contenteditable='plaintext-only' role='textbox'>Edit this image:<img src='fakeimage.png' alt='my fake image'></div>");
-            Assert.AreEqual(
-                new SerializedAXNode
+            Assert.That(
+                (await Page.Accessibility.SnapshotAsync()).Children[0],
+                Is.EqualTo(new SerializedAXNode
                 {
                     Role = "textbox",
                     Name = "",
                     Value = "Edit this image:",
                     Multiline = true,
-                },
-                (await Page.Accessibility.SnapshotAsync()).Children[0]);
+                }));
         }
 
         [Test, Retry(2), PuppeteerTest("accessibility.spec", "plaintext contenteditable", "plain text field with tabindex and without role should not have content")]
@@ -345,8 +345,8 @@ public async Task PlainTextFieldWithoutRoleShouldNotHaveContent()
             await Page.SetContentAsync(
                 "<div contenteditable='plaintext-only'>Edit this image:<img src='fakeimage.png' alt='my fake image'></div>");
             var snapshot = await Page.Accessibility.SnapshotAsync();
-            Assert.AreEqual("generic", snapshot.Children[0].Role);
-            Assert.AreEqual(string.Empty, snapshot.Children[0].Name);
+            Assert.That(snapshot.Children[0].Role, Is.EqualTo("generic"));
+            Assert.That(snapshot.Children[0].Name, Is.EqualTo(string.Empty));
         }
 
         [Test, Retry(2), PuppeteerTest("accessibility.spec", "filtering children of leaf nodes", "non editable textbox with role and tabIndex and label should not have children")]
@@ -357,14 +357,14 @@ await Page.SetContentAsync(@"
                 this is the inner content
                 <img alt='yo' src='fakeimg.png'>
             </div>");
-            Assert.AreEqual(
-                new SerializedAXNode
+            Assert.That(
+                (await Page.Accessibility.SnapshotAsync()).Children[0],
+                Is.EqualTo(new SerializedAXNode
                 {
                     Role = "textbox",
                     Name = "my favorite textbox",
                     Value = "this is the inner content "
-                },
-                (await Page.Accessibility.SnapshotAsync()).Children[0]);
+                }));
         }
 
         [Test, Retry(2), PuppeteerTest("accessibility.spec", "filtering children of leaf nodes", "checkbox with and tabIndex and label should not have children")]
@@ -375,14 +375,14 @@ await Page.SetContentAsync(@"
                 this is the inner content
                 <img alt='yo' src='fakeimg.png'>
             </div>");
-            Assert.AreEqual(
-                new SerializedAXNode
+            Assert.That(
+                (await Page.Accessibility.SnapshotAsync()).Children[0],
+                Is.EqualTo(new SerializedAXNode
                 {
                     Role = "checkbox",
                     Name = "my favorite checkbox",
                     Checked = CheckedState.True
-                },
-                (await Page.Accessibility.SnapshotAsync()).Children[0]);
+                }));
         }
 
         [Test, Retry(2), PuppeteerTest("accessibility.spec", "filtering children of leaf nodes", "checkbox without label should not have children")]
@@ -393,14 +393,14 @@ await Page.SetContentAsync(@"
                 this is the inner content
                 <img alt='yo' src='fakeimg.png'>
             </div>");
-            Assert.AreEqual(
-                new SerializedAXNode
+            Assert.That(
+                (await Page.Accessibility.SnapshotAsync()).Children[0],
+                Is.EqualTo(new SerializedAXNode
                 {
                     Role = "checkbox",
                     Name = "this is the inner content yo",
                     Checked = CheckedState.True
-                },
-                (await Page.Accessibility.SnapshotAsync()).Children[0]);
+                }));
         }
 
         private SerializedAXNode FindFocusedNode(SerializedAXNode serializedAXNode)

lib/PuppeteerSharp.Tests/AccessibilityTests/RootOptionTests.cs

@@ -13,13 +13,13 @@ public async Task ShouldWorkAButton()
             await Page.SetContentAsync("<button>My Button</button>");
 
             var button = await Page.QuerySelectorAsync("button");
-            Assert.AreEqual(
-                new SerializedAXNode
+            Assert.That(
+                await Page.Accessibility.SnapshotAsync(new AccessibilitySnapshotOptions { Root = button }),
+                Is.EqualTo(new SerializedAXNode
                 {
                     Role = "button",
                     Name = "My Button"
-                },
-                await Page.Accessibility.SnapshotAsync(new AccessibilitySnapshotOptions { Root = button }));
+                }));
         }
 
         [Test, Retry(2), PuppeteerTest("accessibility.spec", "root option", "should work an input")]
@@ -28,14 +28,14 @@ public async Task ShouldWorkAnInput()
             await Page.SetContentAsync("<input title='My Input' value='My Value'>");
 
             var input = await Page.QuerySelectorAsync("input");
-            Assert.AreEqual(
-                new SerializedAXNode
+            Assert.That(
+                await Page.Accessibility.SnapshotAsync(new AccessibilitySnapshotOptions { Root = input }),
+                Is.EqualTo(new SerializedAXNode
                 {
                     Role = "textbox",
                     Name = "My Input",
                     Value = "My Value"
-                },
-                await Page.Accessibility.SnapshotAsync(new AccessibilitySnapshotOptions { Root = input }));
+                }));
         }
 
         [Test, Retry(2), PuppeteerTest("accessibility.spec", "root option", "should work a menu")]
@@ -76,7 +76,7 @@ await Page.SetContentAsync(@"
                     }
             };
 
-            Assert.AreEqual(nodeToCheck, snapshot);
+            Assert.That(snapshot, Is.EqualTo(nodeToCheck));
         }
 
         [Test, Retry(2), PuppeteerTest("accessibility.spec", "root option", "should return null when the element is no longer in DOM")]
@@ -85,20 +85,25 @@ public async Task ShouldReturnNullWhenTheElementIsNoLongerInDOM()
             await Page.SetContentAsync("<button>My Button</button>");
             var button = await Page.QuerySelectorAsync("button");
             await Page.EvaluateFunctionAsync("button => button.remove()", button);
-            Assert.Null(await Page.Accessibility.SnapshotAsync(new AccessibilitySnapshotOptions { Root = button }));
+            Assert.That(await Page.Accessibility.SnapshotAsync(new AccessibilitySnapshotOptions { Root = button }), Is.Null);
         }
 
         [Test, Retry(2), PuppeteerTest("accessibility.spec", "root option", "should support the interestingOnly option")]
         public async Task ShouldSupportTheInterestingOnlyOption()
         {
             await Page.SetContentAsync("<div><button>My Button</button></div>");
             var div = await Page.QuerySelectorAsync("div");
-            Assert.Null(await Page.Accessibility.SnapshotAsync(new AccessibilitySnapshotOptions
+            Assert.That(await Page.Accessibility.SnapshotAsync(new AccessibilitySnapshotOptions
             {
                 Root = div
-            }));
-            Assert.AreEqual(
-                new SerializedAXNode
+            }), Is.Null);
+            Assert.That(
+                await Page.Accessibility.SnapshotAsync(new AccessibilitySnapshotOptions
+                {
+                    Root = div,
+                    InterestingOnly = false
+                }),
+                Is.EqualTo(new SerializedAXNode
                 {
                     Role = "generic",
                     Name = "",
@@ -125,11 +130,6 @@ public async Task ShouldSupportTheInterestingOnlyOption()
                             }
                         }
                     }
-                },
-                await Page.Accessibility.SnapshotAsync(new AccessibilitySnapshotOptions
-                {
-                    Root = div,
-                    InterestingOnly = false
                 }));
         }
     }

lib/PuppeteerSharp.Tests/AriaQueryHandlerTests/ParseAriaSelectorTests.cs

@@ -27,11 +27,11 @@ public async Task ShouldFindButton()
         {
             async Task ExpectFound(IElementHandle button)
             {
-                Assert.NotNull(button);
+                Assert.That(button, Is.Not.Null);
                 var id = await button.EvaluateFunctionAsync<string>(@"(button) => {
                     return button.id;
                 }");
-                Assert.AreEqual("btn", id);
+                Assert.That(id, Is.EqualTo("btn"));
             }
 
             var button = await Page.QuerySelectorAsync("aria/Submit button and some spaces[role=\"button\"]");
@@ -55,7 +55,7 @@ async Task ExpectFound(IElementHandle button)
             button = await Page.QuerySelectorAsync("aria/ignored[name=\"Submit  button and some  spaces\"][role=\"button\"]");
             await ExpectFound(button);
             var ex = Assert.ThrowsAsync<PuppeteerException>(() => Page.QuerySelectorAsync("aria/smth[smth=\"true\"]"));
-            Assert.AreEqual("Unknown aria attribute \"smth\" in selector", ex.Message);
+            Assert.That(ex.Message, Is.EqualTo("Unknown aria attribute \"smth\" in selector"));
         }
     }
 }

lib/PuppeteerSharp.Tests/AriaQueryHandlerTests/QueryAllArrayTests.cs

@@ -30,7 +30,7 @@ await Page.EvaluateExpressionAsync(@"
                 .QuerySelectorAllHandleAsync("aria/[role=\"button\"]")
                 .EvaluateFunctionAsync<int>(@"buttons => buttons.reduce((acc, button) => acc + Number(button.textContent), 0)");
 
-            Assert.AreEqual(50005000, sum);
+            Assert.That(sum, Is.EqualTo(50005000));
         }
     }
 }

lib/PuppeteerSharp.Tests/AriaQueryHandlerTests/QueryAllTests.cs

@@ -21,7 +21,7 @@ await Page.SetContentAsync(@"
             var divs = await Page.QuerySelectorAllAsync("aria/menu div");
             var ids = await Task.WhenAll(divs.Select(div => div.EvaluateFunctionAsync<string>("div => div.id")));
 
-            Assert.AreEqual("mnu1, mnu2", String.Join(", ", ids));
+            Assert.That(String.Join(", ", ids), Is.EqualTo("mnu1, mnu2"));
         }
     }
 }