[dotnet] [test] Add NUnit analyzer

dotnet/paket.dependencies

@@ -11,6 +11,7 @@ nuget Microsoft.Extensions.DependencyInjection 3.1.9
 nuget Moq 4.20.72
 nuget NETStandard.Library 2.0.3
 nuget NUnit 4.6.0
+nuget NUnit.Analyzers 4.13.0
 nuget NUnit3TestAdapter 6.2.0
 nuget Microsoft.Testing.Platform 2.1.0
 nuget Microsoft.Testing.Extensions.VSTestBridge 2.1.0

dotnet/paket.lock

@@ -51,6 +51,7 @@ NUGET
     NUnit (4.6)
       System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (== net462) (&& (== net8.0) (>= net462)) (&& (== netstandard2.0) (>= net462))
       System.ValueTuple (>= 4.4) - restriction: || (== net462) (&& (== net8.0) (>= net462)) (&& (== netstandard2.0) (>= net462))
+    NUnit.Analyzers (4.13)
     NUnit3TestAdapter (6.2)
       Microsoft.Extensions.DependencyModel (>= 8.0.2) - restriction: || (&& (== net462) (>= net8.0)) (== net8.0) (&& (== netstandard2.0) (>= net8.0))
       Microsoft.Testing.Extensions.VSTestBridge (>= 2.1) - restriction: || (== net462) (== net8.0) (&& (== netstandard2.0) (>= net462)) (&& (== netstandard2.0) (>= net8.0))

dotnet/paket.nuget.bzl

@@ -28,6 +28,7 @@ def nuget():
             {"name": "Moq", "id": "Moq", "version": "4.20.72", "sha512": "sha512-HeLdAKzFe2G4fUg+tUa1WRf/Mye9zbkiv57jHRSb5IVi7GXVPgWbbEaUP8SaOpt43JJFRlWY9N5Yro32/tgRpQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Castle.Core"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": ["Castle.Core", "System.Threading.Tasks.Extensions"], "net462": ["Castle.Core", "System.Threading.Tasks.Extensions"], "net47": ["Castle.Core", "System.Threading.Tasks.Extensions"], "net471": ["Castle.Core", "System.Threading.Tasks.Extensions"], "net472": ["Castle.Core", "System.Threading.Tasks.Extensions"], "net48": ["Castle.Core", "System.Threading.Tasks.Extensions"], "net5.0": ["Castle.Core"], "net6.0": ["Castle.Core"], "net7.0": ["Castle.Core"], "net8.0": ["Castle.Core"], "net9.0": ["Castle.Core"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": ["Castle.Core", "System.Threading.Tasks.Extensions"], "netcoreapp2.1": ["Castle.Core", "System.Threading.Tasks.Extensions"], "netcoreapp2.2": ["Castle.Core", "System.Threading.Tasks.Extensions"], "netcoreapp3.0": ["Castle.Core"], "netcoreapp3.1": ["Castle.Core"], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": ["Castle.Core", "System.Threading.Tasks.Extensions"], "netstandard2.1": ["Castle.Core"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "NETStandard.Library", "id": "NETStandard.Library", "version": "2.0.3", "sha512": "sha512-548M6mnBSJWxsIlkQHfbzoYxpiYFXZZSL00p4GHYv8PkiqFBnnT68mW5mGEsA/ch9fDO9GkPgkFQpWiXZN7mAQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.NETCore.Platforms"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": ["Microsoft.NETCore.Platforms"], "net451": ["Microsoft.NETCore.Platforms"], "net452": ["Microsoft.NETCore.Platforms"], "net46": ["Microsoft.NETCore.Platforms"], "net461": ["Microsoft.NETCore.Platforms"], "net462": ["Microsoft.NETCore.Platforms"], "net47": ["Microsoft.NETCore.Platforms"], "net471": ["Microsoft.NETCore.Platforms"], "net472": ["Microsoft.NETCore.Platforms"], "net48": ["Microsoft.NETCore.Platforms"], "net5.0": ["Microsoft.NETCore.Platforms"], "net6.0": ["Microsoft.NETCore.Platforms"], "net7.0": ["Microsoft.NETCore.Platforms"], "net8.0": ["Microsoft.NETCore.Platforms"], "net9.0": ["Microsoft.NETCore.Platforms"], "netcoreapp1.0": ["Microsoft.NETCore.Platforms"], "netcoreapp1.1": ["Microsoft.NETCore.Platforms"], "netcoreapp2.0": ["Microsoft.NETCore.Platforms"], "netcoreapp2.1": ["Microsoft.NETCore.Platforms"], "netcoreapp2.2": ["Microsoft.NETCore.Platforms"], "netcoreapp3.0": ["Microsoft.NETCore.Platforms"], "netcoreapp3.1": ["Microsoft.NETCore.Platforms"], "netstandard": [], "netstandard1.0": ["Microsoft.NETCore.Platforms"], "netstandard1.1": ["Microsoft.NETCore.Platforms"], "netstandard1.2": ["Microsoft.NETCore.Platforms"], "netstandard1.3": ["Microsoft.NETCore.Platforms"], "netstandard1.4": ["Microsoft.NETCore.Platforms"], "netstandard1.5": ["Microsoft.NETCore.Platforms"], "netstandard1.6": ["Microsoft.NETCore.Platforms"], "netstandard2.0": ["Microsoft.NETCore.Platforms"], "netstandard2.1": ["Microsoft.NETCore.Platforms"]}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "NUnit", "id": "NUnit", "version": "4.6.0", "sha512": "sha512-wU1EhvacEM9P0Dv5kcPTqYDeSMVMtl9GrSZedDxLZ/050Bz2vUW9zwAVArejSTJ57ySQ3ZbUZfCPw3c/rSnE+w==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": ["System.Threading.Tasks.Extensions", "System.ValueTuple"], "net47": ["System.Threading.Tasks.Extensions", "System.ValueTuple"], "net471": ["System.Threading.Tasks.Extensions", "System.ValueTuple"], "net472": ["System.Threading.Tasks.Extensions", "System.ValueTuple"], "net48": ["System.Threading.Tasks.Extensions", "System.ValueTuple"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
+            {"name": "NUnit.Analyzers", "id": "NUnit.Analyzers", "version": "4.13.0", "sha512": "sha512-p4t6RdKT1qIxfB7OQb3U3Bp/rpJNHkVSkbDJGdnxJUnFAZjfKR4E+RypLONmzMCGc6Qcy3FVtjgh53qosJmTNw==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "NUnit3TestAdapter", "id": "NUnit3TestAdapter", "version": "6.2.0", "sha512": "sha512-cakJ6dIfgVJbtPIa0UKDIcpBLU7XAHn+Qt/5qBCVd0ROgYn1cIRgZZ9VnlWAsafVyDf6BqlrMGhHtu4DVHjwWQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": ["Microsoft.Testing.Extensions.VSTestBridge", "Microsoft.Testing.Platform.MSBuild", "Microsoft.Extensions.DependencyModel"], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": ["Microsoft.Testing.Extensions.VSTestBridge", "Microsoft.Testing.Platform.MSBuild"], "net47": ["Microsoft.Testing.Extensions.VSTestBridge", "Microsoft.Testing.Platform.MSBuild"], "net471": ["Microsoft.Testing.Extensions.VSTestBridge", "Microsoft.Testing.Platform.MSBuild"], "net472": ["Microsoft.Testing.Extensions.VSTestBridge", "Microsoft.Testing.Platform.MSBuild"], "net48": ["Microsoft.Testing.Extensions.VSTestBridge", "Microsoft.Testing.Platform.MSBuild"], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": ["Microsoft.Testing.Extensions.VSTestBridge", "Microsoft.Testing.Platform.MSBuild", "Microsoft.Extensions.DependencyModel"], "net9.0": ["Microsoft.Testing.Extensions.VSTestBridge", "Microsoft.Testing.Platform.MSBuild", "Microsoft.Extensions.DependencyModel"], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "Runfiles", "id": "Runfiles", "version": "0.14.0", "sha512": "sha512-xncDBZgH/5m3QXFXxTOSQiooXZrEhU9hPThejXvnCmFpGrXYKWq5xWzM3Lp8sL33pTWnuWySnrdIyu5W6DZDiQ==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},
             {"name": "System.Buffers", "id": "System.Buffers", "version": "4.5.1", "sha512": "sha512-gNphWOVbm89+C15jebnPRaYykU8De1PFv1YJV24814IfeGGVa3PXRHDS0MLlbdI1pe9Mpv/n4ZK4INwtAjqv8g==", "sources": ["https://api.nuget.org/v3/index.json"], "dependencies": {"net10.0": [], "net11": [], "net20": [], "net30": [], "net35": [], "net40": [], "net403": [], "net45": [], "net451": [], "net452": [], "net46": [], "net461": [], "net462": [], "net47": [], "net471": [], "net472": [], "net48": [], "net5.0": [], "net6.0": [], "net7.0": [], "net8.0": [], "net9.0": [], "netcoreapp1.0": [], "netcoreapp1.1": [], "netcoreapp2.0": [], "netcoreapp2.1": [], "netcoreapp2.2": [], "netcoreapp3.0": [], "netcoreapp3.1": [], "netstandard": [], "netstandard1.0": [], "netstandard1.1": [], "netstandard1.2": [], "netstandard1.3": [], "netstandard1.4": [], "netstandard1.5": [], "netstandard1.6": [], "netstandard2.0": [], "netstandard2.1": []}, "targeting_pack_overrides": [], "framework_list": [], "tools": {}},

dotnet/test/remote/BUILD.bazel

@@ -22,6 +22,7 @@ dotnet_nunit_test_suite(
         "//dotnet/src/webdriver:webdriver-net8.0",
         "//dotnet/test/testing.webserver",
         "//dotnet/test/webdriver",
+        nuget_package("NUnit.Analyzers"),
         nuget_package("Runfiles"),
     ],
 )

dotnet/test/remote/Selenium.WebDriver.Remote.Tests.csproj

@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="NUnit" Version="4.6.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.13.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
   </ItemGroup>
 

dotnet/test/support/BUILD.bazel

@@ -25,5 +25,6 @@ dotnet_nunit_test_suite(
         "//dotnet/test/webdriver",
         nuget_package("Microsoft.Bcl.AsyncInterfaces"),
         nuget_package("Moq"),
+        nuget_package("NUnit.Analyzers"),
     ],
 )

dotnet/test/support/Events/EventFiringWebDriverTests.cs

@@ -31,7 +31,6 @@ public class EventFiringWebDriverTests
     private Mock<IWebElement> mockElement;
     private Mock<ISearchContext> mockShadowRoot;
     private Mock<INavigation> mockNavigation;
-    private IWebDriver stubDriver;
     private StringBuilder log;
 
     [SetUp]
@@ -60,12 +59,12 @@ public void ShouldFireNavigationEvents()
         mockNavigation.Setup(_ => _.Forward());
 
         EventFiringWebDriver firingDriver = new EventFiringWebDriver(mockDriver.Object);
-        firingDriver.Navigating += new EventHandler<WebDriverNavigationEventArgs>(firingDriver_Navigating);
-        firingDriver.Navigated += new EventHandler<WebDriverNavigationEventArgs>(firingDriver_Navigated);
-        firingDriver.NavigatingBack += new EventHandler<WebDriverNavigationEventArgs>(firingDriver_NavigatingBack);
-        firingDriver.NavigatedBack += new EventHandler<WebDriverNavigationEventArgs>(firingDriver_NavigatedBack);
-        firingDriver.NavigatingForward += new EventHandler<WebDriverNavigationEventArgs>(firingDriver_NavigatingForward);
-        firingDriver.NavigatedForward += new EventHandler<WebDriverNavigationEventArgs>(firingDriver_NavigatedForward);
+        firingDriver.Navigating += (sender, e) => log.Append("Navigating ").Append(e.Url).AppendLine();
+        firingDriver.Navigated += (sender, e) => log.Append("Navigated ").Append(e.Url).AppendLine();
+        firingDriver.NavigatingBack += (sender, e) => log.AppendLine("Navigating back");
+        firingDriver.NavigatedBack += (sender, e) => log.AppendLine("Navigated back");
+        firingDriver.NavigatingForward += (sender, e) => log.AppendLine("Navigating forward");
+        firingDriver.NavigatedForward += (sender, e) => log.AppendLine("Navigated forward");
 
         firingDriver.Url = "http://www.get.com";
         firingDriver.Navigate().GoToUrl("http://www.navigate-to.com");
@@ -99,8 +98,8 @@ public void ShouldFireClickEvent()
         mockElement.Setup(_ => _.Click());
 
         EventFiringWebDriver firingDriver = new EventFiringWebDriver(mockDriver.Object);
-        firingDriver.ElementClicking += new EventHandler<WebElementEventArgs>(firingDriver_ElementClicking);
-        firingDriver.ElementClicked += new EventHandler<WebElementEventArgs>(firingDriver_ElementClicked);
+        firingDriver.ElementClicking += (sender, e) => log.AppendLine("Clicking");
+        firingDriver.ElementClicked += (sender, e) => log.AppendLine("Clicked");
 
         firingDriver.FindElement(By.Name("foo")).Click();
 
@@ -158,8 +157,8 @@ public void ShouldFireFindByEvent()
         mockDriver.Setup(_ => _.FindElements(It.Is<By>(x => x.Equals(By.XPath("//link[@type = 'text/css']"))))).Returns(new ReadOnlyCollection<IWebElement>(subElements));
 
         EventFiringWebDriver firingDriver = new EventFiringWebDriver(mockDriver.Object);
-        firingDriver.FindingElement += new EventHandler<FindElementEventArgs>(firingDriver_FindingElement);
-        firingDriver.FindElementCompleted += new EventHandler<FindElementEventArgs>(firingDriver_FindElementCompleted);
+        firingDriver.FindingElement += (sender, e) => log.Append("FindingElement from ").Append(e.Element == null ? "IWebDriver " : "IWebElement ").AppendLine(e.FindMethod.ToString());
+        firingDriver.FindElementCompleted += (sender, e) => log.Append("FindElementCompleted from ").Append(e.Element == null ? "IWebDriver " : "IWebElement ").AppendLine(e.FindMethod.ToString());
 
         IWebElement element = firingDriver.FindElement(By.Id("foo"));
         element.FindElement(By.LinkText("bar"));
@@ -186,7 +185,7 @@ public void ShouldCallListenerOnException()
         mockDriver.Setup(_ => _.FindElement(It.Is<By>(x => x.Equals(By.Id("foo"))))).Throws(exception);
 
         EventFiringWebDriver firingDriver = new EventFiringWebDriver(mockDriver.Object);
-        firingDriver.ExceptionThrown += new EventHandler<WebDriverExceptionEventArgs>(firingDriver_ExceptionThrown);
+        firingDriver.ExceptionThrown += (sender, e) => log.AppendLine(e.ThrownException.Message);
 
         Assert.That(
             () => firingDriver.FindElement(By.Id("foo")),
@@ -226,11 +225,14 @@ public void ShouldBeAbleToWrapSubclassesOfSomethingImplementingTheWebDriverInter
     [Test]
     public void ShouldBeAbleToAccessWrappedInstanceFromEventCalls()
     {
-        stubDriver = new StubDriver();
+        var stubDriver = new StubDriver();
         EventFiringWebDriver testDriver = new EventFiringWebDriver(stubDriver);
         StubDriver wrapped = ((IWrapsDriver)testDriver).WrappedDriver as StubDriver;
         Assert.That(wrapped, Is.EqualTo(stubDriver));
-        testDriver.Navigating += new EventHandler<WebDriverNavigationEventArgs>(testDriver_Navigating);
+        testDriver.Navigating += new EventHandler<WebDriverNavigationEventArgs>((sender, e) =>
+        {
+            Assert.That(stubDriver, Is.EqualTo(e.Driver));
+        });
 
         testDriver.Url = "http://example.org";
     }
@@ -288,66 +290,6 @@ public void ShouldFireFindEventsInShadowRoot()
         Assert.That(findElementCompletedArgs.Element, Is.Null);
     }
 
-    void testDriver_Navigating(object sender, WebDriverNavigationEventArgs e)
-    {
-        Assert.That(stubDriver, Is.EqualTo(e.Driver));
-    }
-
-    void firingDriver_ExceptionThrown(object sender, WebDriverExceptionEventArgs e)
-    {
-        log.AppendLine(e.ThrownException.Message);
-    }
-
-    void firingDriver_FindingElement(object sender, FindElementEventArgs e)
-    {
-        log.Append("FindingElement from ").Append(e.Element == null ? "IWebDriver " : "IWebElement ").AppendLine(e.FindMethod.ToString());
-    }
-
-    void firingDriver_FindElementCompleted(object sender, FindElementEventArgs e)
-    {
-        log.Append("FindElementCompleted from ").Append(e.Element == null ? "IWebDriver " : "IWebElement ").AppendLine(e.FindMethod.ToString());
-    }
-
-    void firingDriver_ElementClicking(object sender, WebElementEventArgs e)
-    {
-        log.AppendLine("Clicking");
-    }
-
-    void firingDriver_ElementClicked(object sender, WebElementEventArgs e)
-    {
-        log.AppendLine("Clicked");
-    }
-
-    void firingDriver_Navigating(object sender, WebDriverNavigationEventArgs e)
-    {
-        log.Append("Navigating ").Append(e.Url).AppendLine();
-    }
-
-    void firingDriver_Navigated(object sender, WebDriverNavigationEventArgs e)
-    {
-        log.Append("Navigated ").Append(e.Url).AppendLine();
-    }
-
-    void firingDriver_NavigatingBack(object sender, WebDriverNavigationEventArgs e)
-    {
-        log.AppendLine("Navigating back");
-    }
-
-    void firingDriver_NavigatedBack(object sender, WebDriverNavigationEventArgs e)
-    {
-        log.AppendLine("Navigated back");
-    }
-
-    void firingDriver_NavigatingForward(object sender, WebDriverNavigationEventArgs e)
-    {
-        log.AppendLine("Navigating forward");
-    }
-
-    void firingDriver_NavigatedForward(object sender, WebDriverNavigationEventArgs e)
-    {
-        log.AppendLine("Navigated forward");
-    }
-
     public interface IExecutingDriver : IWebDriver, IJavaScriptExecutor
     {
     }

dotnet/test/support/Selenium.Support.Tests.csproj

@@ -15,6 +15,7 @@
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="NUnit" Version="4.6.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.13.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
   </ItemGroup>
 

dotnet/test/webdriver/BUILD.bazel

@@ -50,6 +50,7 @@ dotnet_nunit_test_suite(
         "//dotnet/src/webdriver:webdriver-net8.0",
         "//dotnet/test/testing.webserver",
         nuget_package("BenderProxy"),
+        nuget_package("NUnit.Analyzers"),
         nuget_package("Runfiles"),
     ],
 )

dotnet/test/webdriver/BiDi/BiDiFixture.cs

@@ -25,7 +25,7 @@ namespace OpenQA.Selenium.Tests.BiDi;
 
 [Parallelizable(ParallelScope.All)]
 [FixtureLifeCycle(LifeCycle.InstancePerTestCase)]
-public class BiDiTestFixture
+public abstract class BiDiTestFixture
 {
     protected IWebDriver driver;
     protected IBiDi bidi;

dotnet/test/webdriver/BiDi/BrowsingContext/BrowsingContextTests.cs

@@ -141,7 +141,7 @@ public async Task CanCloseWindow()
 
         var tree = await bidi.BrowsingContext.GetTreeAsync();
 
-        Assert.That(tree.Contexts.Select(i => i.Context), Does.Not.Contain(window));
+        Assert.That(tree.Contexts.Select(i => i.Context), Does.Not.Contain(window.Context));
     }
 
     [Test]
@@ -153,7 +153,7 @@ public async Task CanCloseTab()
 
         var tree = await bidi.BrowsingContext.GetTreeAsync();
 
-        Assert.That(tree.Contexts.Select(i => i.Context), Does.Not.Contain(tab));
+        Assert.That(tree.Contexts.Select(i => i.Context), Does.Not.Contain(tab.Context));
     }
 
     [Test]

dotnet/test/webdriver/BiDi/Session/SessionTests.cs

@@ -63,7 +63,9 @@ public void ShouldRespectCancellationToken()
     [Test]
     public void AsModuleShouldReturnSameInstanceForSameType()
     {
-        Assert.That(bidi.AsModule<CustomModule>(), Is.SameAs(bidi.AsModule<CustomModule>()));
+        var module = bidi.AsModule<CustomModule>();
+
+        Assert.That(bidi.AsModule<CustomModule>(), Is.SameAs(module));
     }
 
     [Test]