Updated Rect tests

Terminal.Gui/Types/Rect.cs

@@ -1,5 +1,5 @@
 //
-// System.Drawing.Rectangle.cs
+// Derived from System.Drawing.Rectangle.cs
 //
 // Author:
 //   Mike Kestner ([email protected])
@@ -9,7 +9,6 @@
 //
 
 using System;
-
 namespace Terminal.Gui
 {
 	/// <summary>
@@ -80,12 +79,12 @@ namespace Terminal.Gui
 		}
 
 		/// <summary>
-		///	Inflate Shared Method
+		///	Produces a new Rect by inflating an existing Rect by the specified coordinate values.
 		/// </summary>
 		///
 		/// <remarks>
-		///	Produces a new Rectangle by inflating an existing 
-		///	Rectangle by the specified coordinate values.
+		///	Produces a new Rect by inflating an existing Rect by the specified coordinate values.
+		///     The rectangle is enlarged in both directions along an axis. 
 		/// </remarks>
 
 		public static Rect Inflate (Rect rect, int x, int y)
@@ -96,32 +95,33 @@ namespace Terminal.Gui
 		}
 
 		/// <summary>
-		///	Inflate Method
+		///	Inflates an existing Rect by the specified coordinate values.
 		/// </summary>
 		///
 		/// <remarks>
-		///	Inflates the Rectangle by a specified width and height.
+		///	This method enlarges this rectangle, not a copy of it. The rectangle is enlarged in both directions along an axis. 
 		/// </remarks>
 
 		public void Inflate (int width, int height)
 		{
-			Inflate (new Size (width, height));
+			// Set dims first so we don't lose the original values on exception
+			Width += width * 2;
+			Height += height * 2;
+
+			X -= width;
+			Y -= height;
 		}
 
 		/// <summary>
-		///	Inflate Method
+		///	Inflates an existing Rect by the specified Sizwe.
 		/// </summary>
 		///
 		/// <remarks>
-		///	Inflates the Rectangle by a specified Size.
+		///	This method enlarges this rectangle, not a copy of it. The rectangle is enlarged in both directions along an axis. 
 		/// </remarks>
-
 		public void Inflate (Size size)
 		{
-			X -= size.Width;
-			Y -= size.Height;
-			Width += size.Width * 2;
-			Height += size.Height * 2;
+			Inflate (size.Width, size.Height);
 		}
 
 		/// <summary>
@@ -492,6 +492,5 @@ namespace Terminal.Gui
 			return String.Format ("{{X={0},Y={1},Width={2},Height={3}}}",
 						 X, Y, Width, Height);
 		}
-
 	}
 }

UnitTests/Types/RectTests.cs

@@ -148,5 +148,89 @@ namespace Terminal.Gui.TypeTests {
 			Assert.Equal (xCount, rect.Width);
 			Assert.Equal (yxCount, rect.Height * rect.Width);
 		}
+
+
+		[Theory]
+		// Empty
+		[InlineData (
+			0, 0, 0, 0,
+			0, 0,
+			0, 0, 0, 0)]
+		[InlineData (
+			0, 0, 0, 0,
+			1, 0,
+			-1, 0, 2, 0)]
+		[InlineData (
+			0, 0, 0, 0,
+			0, 1,
+			0, -1, 0, 2)]
+		[InlineData (
+			0, 0, 0, 0,
+			1, 1,
+			-1, -1, 2, 2)]
+		[InlineData (
+			0, 0, 0, 0,
+			-1, -1,        // Throws
+			0, 0, 0, 0)]
+		// Zero location, Size of 1
+		[InlineData (
+			0, 0, 1, 1,
+			0, 0,
+			0, 0, 1, 1)]
+		[InlineData (
+			0, 0, 1, 1,
+			1, 0,
+			-1, 0, 3, 1)]
+		[InlineData (
+			0, 0, 1, 1,
+			0, 1,
+			0, -1, 1, 3)]
+		[InlineData (
+			0, 0, 1, 1,
+			1, 1,
+			-1, -1, 3, 3)]
+		// Positive location, Size of 1
+		[InlineData (
+			1, 1, 1, 1,
+			0, 0,
+			1, 1, 1, 1)]
+		[InlineData (
+			1, 1, 1, 1,
+			1, 0,
+			0, 1, 3, 1)]
+		[InlineData (
+			1, 1, 1, 1,
+			0, 1,
+			1, 0, 1, 3)]
+		[InlineData (
+			1, 1, 1, 1,
+			1, 1,
+			0, 0, 3, 3)]
+		public void Inflate (int x, int y, int width, int height, int inflateWidth, int inflateHeight, int expectedX, int exptectedY, int expectedWidth, int expectedHeight)
+		{
+			var rect = new Rect (x, y, width, height);
+
+			if (rect.Width + inflateWidth < 0 || rect.Height + inflateHeight < 0) {
+				Assert.Throws<ArgumentException> (() => rect.Inflate (inflateWidth, inflateHeight));
+			} else {
+				rect.Inflate (inflateWidth, inflateHeight);
+			}
+			Assert.Equal (expectedWidth, rect.Width);
+			Assert.Equal (expectedHeight, rect.Height);
+			Assert.Equal (expectedX, rect.X);
+			Assert.Equal (exptectedY, rect.Y);
+
+			// Use the other overload (Size)
+			rect = new Rect (x, y, width, height);
+			if (rect.Width + inflateWidth < 0 || rect.Height + inflateHeight < 0) {
+				Assert.Throws<ArgumentException> (() => rect.Inflate (new Size (inflateWidth, inflateHeight)));
+			} else {
+				rect.Inflate (new Size (inflateWidth, inflateHeight));
+			}
+			Assert.Equal (expectedWidth, rect.Width);
+			Assert.Equal (expectedHeight, rect.Height);
+			Assert.Equal (expectedX, rect.X);
+			Assert.Equal (exptectedY, rect.Y);
+		}
 	}
 }