Removed ability to set PAgeSize or PageMargins as null... added tests to check for ArgumentNullExceptions being thrown...

Author: shbenzer

dotnet/src/webdriver/PrintOptions.cs

@@ -106,7 +106,15 @@ public bool ShrinkToFit
         public PageSize PageDimensions
         {
             get { return pageSize; }
-            set { pageSize = value; }
+            set 
+            { 
+                if (value == null) 
+                { 
+                    throw new ArgumentNullException("PageDimensions cannot be set to null"); 
+                }
+
+                pageSize = value; 
+            }
         }
 
         /// <summary>
@@ -115,7 +123,15 @@ public PageSize PageDimensions
         public Margins PageMargins
         {
             get { return margins; }
-            set { margins = value; }
+            set 
+            { 
+                if (value == null) 
+                { 
+                    throw new ArgumentNullException("PageMargins cannot be set to null"); 
+                }
+
+                margins = value; 
+            }
         }
 
         /// <summary>
@@ -201,15 +217,15 @@ internal Dictionary<string, object> ToDictionary()
                 toReturn["shrinkToFit"] = this.shrinkToFit;
             }
 
-            if (this.pageSize != null && (this.pageSize.Height != DefaultPageHeight || this.pageSize.Width != DefaultPageWidth))
+            if (this.pageSize.Height != DefaultPageHeight || this.pageSize.Width != DefaultPageWidth)
             {
                 Dictionary<string, object> pageSizeDictionary = new Dictionary<string, object>();
                 pageSizeDictionary["width"] = this.pageSize.Width;
                 pageSizeDictionary["height"] = this.pageSize.Height;
                 toReturn["page"] = pageSizeDictionary;
             }
 
-            if (this.margins != null && (this.margins.Top != DefaultMarginSize || this.margins.Bottom != DefaultMarginSize || this.margins.Left != DefaultMarginSize || this.margins.Right != DefaultMarginSize))
+            if (this.margins.Top != DefaultMarginSize || this.margins.Bottom != DefaultMarginSize || this.margins.Left != DefaultMarginSize || this.margins.Right != DefaultMarginSize)
             {
                 Dictionary<string, object> marginsDictionary = new Dictionary<string, object>();
                 marginsDictionary["top"] = this.margins.Top;
@@ -258,6 +274,11 @@ 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.");
@@ -275,6 +296,11 @@ 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.");
@@ -321,6 +347,11 @@ 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.");
@@ -338,6 +369,11 @@ 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.");
@@ -355,6 +391,11 @@ 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.");
@@ -372,6 +413,11 @@ 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

@@ -57,5 +57,17 @@ public void CanPrintWithMostParams()
 
             Assert.That(pdf.AsBase64EncodedString, Does.Contain(MagicString));
         }
+
+        [Test]
+        public void PageSizeCannotBeNull()
+        {
+            assert.That(() => printer.Print(new PrintOptions { PageDimensions = null }), Throws.InstanceOf<ArgumentNullException>());
+        }
+
+        [Test]
+        public void MarginsCannotBeNull()
+        {
+            assert.That(() => printer.Print(new PrintOptions { PageMargins = null }), Throws.InstanceOf<ArgumentNullException>());
+        }
     }
 }