@@ -36,7 +36,8 @@ public class EventFiringWebDriver : IWebDriver, IJavaScriptExecutor, ITakesScree
3636 /// <exception cref="ArgumentNullException">If <paramref name="parentDriver"/> is <see langword="null"/>.</exception>
3737 public EventFiringWebDriver ( IWebDriver parentDriver )
3838 {
39- this . WrappedDriver = parentDriver ?? throw new ArgumentNullException ( nameof ( parentDriver ) ) ;
39+ ArgumentNullException . ThrowIfNull ( parentDriver ) ;
40+ this . WrappedDriver = parentDriver ;
4041 }
4142
4243 /// <summary>
@@ -537,10 +538,7 @@ protected virtual async ValueTask DisposeAsyncCore()
537538 /// </remarks>
538539 public object ? ExecuteScript ( PinnedScript script , params object ? [ ] args )
539540 {
540- if ( script == null )
541- {
542- throw new ArgumentNullException ( nameof ( script ) ) ;
543- }
541+ ArgumentNullException . ThrowIfNull ( script ) ;
544542
545543 if ( this . WrappedDriver is not IJavaScriptExecutor javascriptDriver )
546544 {
@@ -808,7 +806,8 @@ private class EventFiringNavigation : INavigation
808806 /// <param name="driver">Driver in use</param>
809807 public EventFiringNavigation ( EventFiringWebDriver driver )
810808 {
811- this . parentDriver = driver ?? throw new ArgumentNullException ( nameof ( driver ) ) ;
809+ ArgumentNullException . ThrowIfNull ( driver ) ;
810+ this . parentDriver = driver ;
812811 this . wrappedNavigation = this . parentDriver . WrappedDriver . Navigate ( ) ;
813812 }
814813
@@ -1025,7 +1024,8 @@ private class EventFiringTargetLocator : ITargetLocator
10251024 /// <param name="driver">The driver that is currently in use</param>
10261025 public EventFiringTargetLocator ( EventFiringWebDriver driver )
10271026 {
1028- this . parentDriver = driver ?? throw new ArgumentNullException ( nameof ( driver ) ) ;
1027+ ArgumentNullException . ThrowIfNull ( driver ) ;
1028+ this . parentDriver = driver ;
10291029 this . wrappedLocator = this . parentDriver . WrappedDriver . SwitchTo ( ) ;
10301030 }
10311031
@@ -1297,8 +1297,10 @@ private class EventFiringWebElement : ITakesScreenshot, IWebElement, IWrapsEleme
12971297 /// <param name="element">The <see cref="IWebElement"/> to wrap for event firing.</param>
12981298 public EventFiringWebElement ( EventFiringWebDriver driver , IWebElement element )
12991299 {
1300- this . WrappedElement = element ?? throw new ArgumentNullException ( nameof ( element ) ) ;
1301- this . parentDriver = driver ?? throw new ArgumentNullException ( nameof ( driver ) ) ;
1300+ ArgumentNullException . ThrowIfNull ( element ) ;
1301+ ArgumentNullException . ThrowIfNull ( driver ) ;
1302+ this . WrappedElement = element ;
1303+ this . parentDriver = driver ;
13021304 }
13031305
13041306 /// <summary>
@@ -1773,7 +1775,8 @@ private class EventFiringShadowRoot : ISearchContext, IWrapsDriver, IEquatable<I
17731775 /// <param name="searchContext">The <see cref="ISearchContext"/> to wrap for event firing.</param>
17741776 public EventFiringShadowRoot ( EventFiringWebDriver driver , ISearchContext searchContext )
17751777 {
1776- this . WrappedSearchContext = searchContext ?? throw new ArgumentNullException ( nameof ( searchContext ) ) ;
1778+ ArgumentNullException . ThrowIfNull ( searchContext ) ;
1779+ this . WrappedSearchContext = searchContext ;
17771780 this . parentDriver = driver ;
17781781 }
17791782
0 commit comments