Fix it and forget

Author: nvborisenko

dotnet/src/webdriver/PrintOptions.cs

@@ -106,14 +106,9 @@ public bool ShrinkToFit
         public PageSize PageDimensions
         {
             get { return pageSize; }
-            set 
-            { 
-                if (value == null) 
-                { 
-                    throw new ArgumentNullException("PageDimensions cannot be set to null"); 
-                }
-
-                pageSize = value; 
+            set
+            {
+                pageSize = value ?? throw new ArgumentNullException(nameof(value));
             }
         }
 
@@ -123,14 +118,9 @@ public PageSize PageDimensions
         public Margins PageMargins
         {
             get { return margins; }
-            set 
-            { 
-                if (value == null) 
-                { 
-                    throw new ArgumentNullException("PageMargins cannot be set to null"); 
-                }
-
-                margins = value; 
+            set
+            {
+                margins = value ?? throw new ArgumentNullException(nameof(value));
             }
         }
 
@@ -216,7 +206,7 @@ internal Dictionary<string, object> ToDictionary()
             {
                 toReturn["shrinkToFit"] = this.shrinkToFit;
             }
-            
+
             if (this.pageSize.Height != DefaultPageHeight || this.pageSize.Width != DefaultPageWidth)
             {
                 Dictionary<string, object> pageSizeDictionary = new Dictionary<string, object>();
@@ -274,11 +264,6 @@ public double Height
                 get { return height; }
                 set
                 {
-                    if (value == null) 
-                    { 
-                        throw new ArgumentNullException("Height cannot be set to null"); 
-                    }
-
                     if (value < 0)
                     {
                         throw new ArgumentException("Height must be greater than or equal to zero.");
@@ -296,11 +281,6 @@ public double Width
                 get { return width; }
                 set
                 {
-                    if (value == null) 
-                    { 
-                        throw new ArgumentNullException("Width cannot be set to null"); 
-                    }
-
                     if (value < 0)
                     {
                         throw new ArgumentException("Width must be greater than or equal to zero.");
@@ -347,11 +327,6 @@ public double Top
                 get { return top; }
                 set
                 {
-                    if (value == null) 
-                    { 
-                        throw new ArgumentNullException("Top cannot be set to null"); 
-                    }
-
                     if (value < 0)
                     {
                         throw new ArgumentException("Top margin must be greater than or equal to zero.");
@@ -369,11 +344,6 @@ public double Bottom
                 get { return bottom; }
                 set
                 {
-                    if (value == null) 
-                    { 
-                        throw new ArgumentNullException("Bottom cannot be set to null"); 
-                    }
-
                     if (value < 0)
                     {
                         throw new ArgumentException("Bottom margin must be greater than or equal to zero.");
@@ -391,11 +361,6 @@ public double Left
                 get { return left; }
                 set
                 {
-                    if (value == null) 
-                    { 
-                        throw new ArgumentNullException("Left cannot be set to null"); 
-                    }
-
                     if (value < 0)
                     {
                         throw new ArgumentException("Left margin must be greater than or equal to zero.");
@@ -413,11 +378,6 @@ public double Right
                 get { return right; }
                 set
                 {
-                    if (value == null) 
-                    { 
-                        throw new ArgumentNullException("Right cannot be set to null"); 
-                    }
-
                     if (value < 0)
                     {
                         throw new ArgumentException("Right margin must be greater than or equal to zero.");

dotnet/test/common/PrintTest.cs

@@ -1,4 +1,5 @@
 using NUnit.Framework;
+using System;
 
 namespace OpenQA.Selenium
 {
@@ -61,13 +62,13 @@ public void CanPrintWithMostParams()
         [Test]
         public void PageSizeCannotBeNull()
         {
-            assert.That(() => printer.Print(new PrintOptions { PageDimensions = null }), Throws.InstanceOf<ArgumentNullException>());
+            Assert.That(() => new PrintOptions { PageDimensions = null }, Throws.InstanceOf<ArgumentNullException>());
         }
 
         [Test]
         public void MarginsCannotBeNull()
         {
-            assert.That(() => printer.Print(new PrintOptions { PageMargins = null }), Throws.InstanceOf<ArgumentNullException>());
+            Assert.That(() => new PrintOptions { PageMargins = null }, Throws.InstanceOf<ArgumentNullException>());
         }
     }
 }