Update tests style per PR feedback part 1

Author: RenderMichael

dotnet/src/webdriver/WebDriver.cs

@@ -935,7 +935,7 @@ private static object ConvertObjectToJavaScriptObject(object arg)
             }
             else
             {
-                throw new ArgumentException("Argument is of an illegal type" + arg.ToString(), nameof(arg));
+                throw new ArgumentException("Argument is of an illegal type: " + arg.ToString(), nameof(arg));
             }
 
             return converted;

dotnet/test/common/AlertsTest.cs

@@ -60,7 +60,9 @@ public void ShouldThrowArgumentNullExceptionWhenKeysNull()
             IAlert alert = WaitFor<IAlert>(AlertToBePresent, "No alert found");
             try
             {
-                Assert.That(() => alert.SendKeys(null), Throws.ArgumentNullException);
+                Assert.That(
+                    () => alert.SendKeys(null),
+                    Throws.ArgumentNullException);
             }
             finally
             {
@@ -147,13 +149,12 @@ public void SettingTheValueOfAnAlertThrows()
             driver.FindElement(By.Id("alert")).Click();
 
             IAlert alert = WaitFor<IAlert>(AlertToBePresent, "No alert found");
+
             try
             {
-                alert.SendKeys("cheese");
-                Assert.Fail("Expected exception");
-            }
-            catch (ElementNotInteractableException)
-            {
+                Assert.That(
+                    () => alert.SendKeys("cheese"),
+                    Throws.InstanceOf<ElementNotInteractableException>());
             }
             finally
             {
@@ -198,8 +199,10 @@ public void AlertShouldNotAllowAdditionalCommandsIfDismissed()
 
             IAlert alert = WaitFor<IAlert>(AlertToBePresent, "No alert found");
             alert.Dismiss();
-            string text;
-            Assert.That(() => text = alert.Text, Throws.InstanceOf<NoAlertPresentException>());
+
+            Assert.That(
+                () => alert.Text,
+                Throws.InstanceOf<NoAlertPresentException>());
         }
 
         [Test]
@@ -249,7 +252,9 @@ public void SwitchingToMissingAlertThrows()
         {
             driver.Url = CreateAlertPage("cheese");
 
-            Assert.That(() => AlertToBePresent(), Throws.InstanceOf<NoAlertPresentException>());
+            Assert.That(
+                AlertToBePresent,
+                Throws.InstanceOf<NoAlertPresentException>());
         }
 
         [Test]
@@ -270,15 +275,9 @@ public void SwitchingToMissingAlertInAClosedWindowThrows()
                 driver.Close();
                 WaitFor(WindowHandleCountToBe(1), "Window count was not 1");
 
-                try
-                {
-                    AlertToBePresent().Accept();
-                    Assert.Fail("Expected exception");
-                }
-                catch (NoSuchWindowException)
-                {
-                    // Expected
-                }
+                Assert.That(
+                    () => AlertToBePresent().Accept(),
+                    Throws.InstanceOf<NoSuchWindowException>());
 
             }
             finally
@@ -321,17 +320,22 @@ public void HandlesTwoAlertsFromOneInteraction()
         {
             driver.Url = EnvironmentManager.Instance.UrlBuilder.CreateInlinePage(new InlinePage()
                 .WithScripts(
-                    "function setInnerText(id, value) {",
-                    "  document.getElementById(id).innerHTML = '<p>' + value + '</p>';",
-                    "}",
-                    "function displayTwoPrompts() {",
-                    "  setInnerText('text1', prompt('First'));",
-                    "  setInnerText('text2', prompt('Second'));",
-                    "}")
+                    """
+                    function setInnerText(id, value) {
+                      document.getElementById(id).innerHTML = '<p>' + value + '</p>';
+                    }
+
+                    function displayTwoPrompts() {
+                      setInnerText('text1', prompt('First'));
+                      setInnerText('text2', prompt('Second'));
+                    }
+                    """)
                 .WithBody(
-                    "<a href='#' id='double-prompt' onclick='displayTwoPrompts();'>click me</a>",
-                    "<div id='text1'></div>",
-                    "<div id='text2'></div>"));
+                    """
+                    <a href='#' id='double-prompt' onclick='displayTwoPrompts();'>click me</a>
+                    <div id='text1'></div>
+                    <div id='text2'></div>
+                    """));
 
             driver.FindElement(By.Id("double-prompt")).Click();
 
@@ -355,7 +359,7 @@ public void HandlesTwoAlertsFromOneInteraction()
         public void ShouldHandleAlertOnPageLoad()
         {
             string pageWithOnLoad = EnvironmentManager.Instance.UrlBuilder.CreateInlinePage(new InlinePage()
-                .WithOnLoad("javascript:alert(\"onload\")")
+                .WithOnLoad("""javascript:alert("onload")""")
                 .WithBody("<p>Page with onload event handler</p>"));
             driver.Url = EnvironmentManager.Instance.UrlBuilder.CreateInlinePage(new InlinePage()
                 .WithBody(string.Format("<a id='open-page-with-onload-alert' href='{0}'>open new page</a>", pageWithOnLoad)));
@@ -411,17 +415,12 @@ public void ShouldNotHandleAlertInAnotherWindow()
                 Assert.AreEqual(1, allWindows.Count);
                 onloadWindow = allWindows[0];
 
-                try
+                Assert.That(() =>
                 {
                     IWebElement el = driver.FindElement(By.Id("open-new-window"));
                     WaitFor<IAlert>(AlertToBePresent, TimeSpan.FromSeconds(5), "No alert found");
-                    Assert.Fail("Expected exception");
-                }
-                catch (WebDriverException)
-                {
-                    // An operation timed out exception is expected,
-                    // since we're using WaitFor<T>.
-                }
+                },
+                Throws.InstanceOf<WebDriverException>());
 
             }
             finally

dotnet/test/common/ElementAttributeTest.cs

@@ -131,16 +131,15 @@ public void ShouldThrowExceptionIfSendingKeysToElementDisabledUsingRandomDisable
             Assert.That(() =>
             {
                 disabledTextElement1.SendKeys("foo");
-            }, Throws.InstanceOf<InvalidElementStateException>());
+            }, Throws.TypeOf<ElementNotInteractableException>());
 
             Assert.AreEqual(string.Empty, disabledTextElement1.Text);
 
             IWebElement disabledTextElement2 = driver.FindElement(By.Id("disabledTextElement2"));
 
-            Assert.That(() =>
-            {
-                disabledTextElement2.SendKeys("bar");
-            }, Throws.InstanceOf<InvalidElementStateException>());
+            Assert.That(
+                () => disabledTextElement2.SendKeys("bar"),
+                Throws.TypeOf<ElementNotInteractableException>());
 
             Assert.AreEqual(string.Empty, disabledTextElement2.Text);
         }

dotnet/test/common/ExecutingJavascriptTest.cs

@@ -391,14 +391,17 @@ public void ShouldBeAbleToPassACollectionAsArgument()
             Assert.AreEqual(collection.Count, length);
         }
 
-
+        [Test]
         public void ShouldThrowAnExceptionIfAnArgumentIsNotValid()
         {
             if (!(driver is IJavaScriptExecutor))
                 return;
 
             driver.Url = javascriptPage;
-            Assert.That(() => ExecuteScript("return arguments[0];", driver), Throws.InstanceOf<ArgumentException>());
+
+            Assert.That(
+                () => ExecuteScript("return arguments[0];", driver),
+                Throws.TypeOf<ArgumentException>().With.Message.StartsWith("Argument is of an illegal type: "));
         }
 
         [Test]
@@ -490,10 +493,9 @@ public async Task ShouldBeAbleToPinJavascriptCodeAndExecuteRepeatedly()
 
             await jsEngine.UnpinScript(script);
 
-            Assert.That(() =>
-            {
-                _ = ((IJavaScriptExecutor)driver).ExecuteScript(script);
-            }, Throws.TypeOf<JavaScriptException>());
+            Assert.That(
+                () => ((IJavaScriptExecutor)driver).ExecuteScript(script),
+                Throws.TypeOf<JavaScriptException>());
         }
 
         [Test]
@@ -566,7 +568,9 @@ public void ShouldThrowAnExceptionWhenArgumentsWithStaleElementPassed()
 
             Dictionary<string, object> args = new Dictionary<string, object>();
             args["key"] = new object[] { "a", new object[] { "zero", 1, true, 3.14159, false, el }, "c" };
-            Assert.That(() => executor.ExecuteScript("return undefined;", args), Throws.InstanceOf<StaleElementReferenceException>());
+            Assert.That(
+                () => executor.ExecuteScript("return undefined;", args),
+                Throws.TypeOf<StaleElementReferenceException>());
         }
 
         [Test]
@@ -611,7 +615,17 @@ public void ShouldHandleRecursiveStructures()
         {
             driver.Url = simpleTestPage;
 
-            Assert.That(() => ExecuteScript("var obj1 = {}; var obj2 = {}; obj1['obj2'] = obj2; obj2['obj1'] = obj1; return obj1"), Throws.InstanceOf<WebDriverException>());
+            Assert.That(
+                () => ExecuteScript(
+                    """
+                    var obj1 = {};
+                    var obj2 = {};
+                    obj1['obj2'] = obj2;
+                    obj2['obj1'] = obj1;
+                    return obj1
+                    """
+                    ),
+                Throws.TypeOf<JavaScriptException>());
         }
 
         //------------------------------------------------------------------
@@ -622,10 +636,9 @@ public void ShouldHandleRecursiveStructures()
         [Ignore("Reason for ignore: Failure indicates hang condition, which would break the test suite. Really needs a timeout set.")]
         public void ShouldThrowExceptionIfExecutingOnNoPage()
         {
-            Assert.That(() =>
-            {
-                ((IJavaScriptExecutor)driver).ExecuteScript("return 1;");
-            }, Throws.InstanceOf<WebDriverException>());
+            Assert.That(
+                () => ((IJavaScriptExecutor)driver).ExecuteScript("return 1;"),
+                Throws.InstanceOf<WebDriverException>());
         }
 
         [Test]

dotnet/test/common/WindowSwitchingTest.cs

@@ -61,10 +61,9 @@ public void ShouldThrowNoSuchWindowException()
             driver.Url = xhtmlTestPage;
             String current = driver.CurrentWindowHandle;
 
-            Assert.That(() =>
-            {
-                driver.SwitchTo().Window("invalid name");
-            }, Throws.InstanceOf<NoSuchWindowException>());
+            Assert.That(
+                () => driver.SwitchTo().Window("invalid name"),
+                Throws.InstanceOf<NoSuchWindowException>());
 
             driver.SwitchTo().Window(current);
         }
@@ -88,10 +87,9 @@ public void ShouldThrowNoSuchWindowExceptionOnAnAttemptToGetItsHandle()
 
             try
             {
-                Assert.That(() =>
-                {
-                    _ = driver.CurrentWindowHandle;
-                }, Throws.InstanceOf<NoSuchWindowException>());
+                Assert.That(
+                    () => driver.CurrentWindowHandle,
+                    Throws.InstanceOf<NoSuchWindowException>());
             }
             finally
             {
@@ -118,15 +116,13 @@ public void ShouldThrowNoSuchWindowExceptionOnAnyOperationIfAWindowIsClosed()
 
             try
             {
-                Assert.That(() =>
-                {
-                    _ = driver.Title;
-                }, Throws.InstanceOf<NoSuchWindowException>());
+                Assert.That(
+                    () => driver.Title,
+                    Throws.InstanceOf<NoSuchWindowException>());
 
-                Assert.That(() =>
-                {
-                    driver.FindElement(By.TagName("body"));
-                }, Throws.InstanceOf<NoSuchWindowException>());
+                Assert.That(
+                    () => driver.FindElement(By.TagName("body")),
+                    Throws.InstanceOf<NoSuchWindowException>());
             }
             finally
             {
@@ -154,10 +150,9 @@ public void ShouldThrowNoSuchWindowExceptionOnAnyElementOperationIfAWindowIsClos
 
             try
             {
-                Assert.That(() =>
-                {
-                    _ = body.Text;
-                }, Throws.InstanceOf<NoSuchWindowException>());
+                Assert.That(
+                    () => body.Text,
+                    Throws.InstanceOf<NoSuchWindowException>());
             }
             finally
             {
@@ -263,10 +258,10 @@ public void FailingToSwitchToAWindowLeavesTheCurrentWindowAsIs()
             driver.Url = xhtmlTestPage;
             String current = driver.CurrentWindowHandle;
 
-            Assert.That(() =>
-            {
-                driver.SwitchTo().Window("i will never exist");
-            }, Throws.InstanceOf<NoSuchWindowException>());
+            Assert.That(
+                () => driver.SwitchTo().Window("i will never exist"),
+                Throws.InstanceOf<NoSuchWindowException>(),
+                "Should not be able to change to a non-existant window");
 
             String newHandle = driver.CurrentWindowHandle;