prep for Dialog to use Dim.Auto - Simplify unit tests

Terminal.Gui/Views/Dialog.cs

@@ -57,9 +57,9 @@ public class Dialog : Window {
 
 	void SetInitialProperties (Button [] buttons)
 	{
-		//X = Pos.Center ();
-		//Y = Pos.Center ();
-		ValidatePosDim = true;
+		X = Pos.Center ();
+		Y = Pos.Center ();
+		//ValidatePosDim = true;
 
 		Width = Dim.Percent (85);
 		Height = Dim.Percent (85);

Terminal.Gui/Views/MessageBox.cs

@@ -265,17 +265,17 @@ namespace Terminal.Gui {
 			d = new Dialog (buttonList.ToArray ()) {
 				Title = title,
 				BorderStyle = DefaultBorderStyle,
-				//Width = Dim.AutoSize (),//Percent (60),
-				//Height = Dim.AutoSize () //5 // Border + one line of text + vspace + buttons
+				Width = Dim.Percent (60),
+				Height = 5 // Border + one line of text + vspace + buttons
 			};
 
-			//if (width != 0) {
-			//	d.Width = width;
-			//}
+			if (width != 0) {
+				d.Width = width;
+			}
 
-			//if (height != 0) {
-			//	d.Height = height;
-			//}
+			if (height != 0) {
+				d.Height = height;
+			}
 
 			if (useErrorColors) {
 				d.ColorScheme = Colors.Error;

UnitTests/Dialogs/DialogTests.cs

@@ -780,6 +780,8 @@ namespace Terminal.Gui.DialogTests {
 		[Fact, AutoInitShutdown]
 		public void Dialog_Opened_From_Another_Dialog ()
 		{
+			((FakeDriver)Application.Driver).SetBufferSize (30, 10);
+
 			var btn1 = new Button ("press me 1");
 			Button btn2 = null;
 			Button btn3 = null;
@@ -802,53 +804,27 @@ namespace Terminal.Gui.DialogTests {
 					Assert.True (btn1.NewKeyDownEvent (new (KeyCode.Space)));
 				} else if (iterations == 1) {
 					expected = @$"
-      ┌──────────────────────────────────────────────────────────────────┐
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                      {CM.Glyphs.LeftBracket} Show Sub {CM.Glyphs.RightBracket} {CM.Glyphs.LeftBracket} Close {CM.Glyphs.RightBracket}                      │
-      └──────────────────────────────────────────────────────────────────┘";
+  ┌───────────────────────┐
+  │                       │
+  │                       │
+  │                       │
+  │                       │
+  │                       │
+  │{CM.Glyphs.LeftBracket} Show Sub {CM.Glyphs.RightBracket} {CM.Glyphs.LeftBracket} Close {CM.Glyphs.RightBracket} │
+  └───────────────────────┘";
 					TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
 
 					Assert.True (btn2.NewKeyDownEvent (new (KeyCode.Space)));
 				} else if (iterations == 2) {
 					TestHelpers.AssertDriverContentsWithFrameAre (@$"
-      ┌──────────────────────────────────────────────────────────────────┐
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │         ┌──────────────────────────────────────────────┐         │
-      │         │                      ya                      │         │
-      │         │                                              │         │
-      │         │                   {btn}                   │         │
-      │         └──────────────────────────────────────────────┘         │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                                                                  │
-      │                      {CM.Glyphs.LeftBracket} Show Sub {CM.Glyphs.RightBracket} {CM.Glyphs.LeftBracket} Close {CM.Glyphs.RightBracket}                      │
-      └──────────────────────────────────────────────────────────────────┘", output);
+  ┌───────────────────────┐
+  │   ┌────────────────┐  │
+  │   │       ya       │  │
+  │   │                │  │
+  │   │    {btn}    │  │
+  │   └────────────────┘  │
+  │{CM.Glyphs.LeftBracket} Show Sub {CM.Glyphs.RightBracket} {CM.Glyphs.LeftBracket} Close {CM.Glyphs.RightBracket} │
+  └───────────────────────┘", output);
 
 					Assert.True (Application.Current.NewKeyDownEvent (new (KeyCode.Enter)));
 				} else if (iterations == 3) {

UnitTests/Text/UnicodeTests.cs

@@ -1,57 +0,0 @@
-using Microsoft.VisualStudio.TestPlatform.Utilities;
-using Xunit;
-using Xunit.Abstractions;
-
-// Alias Console to MockConsole so we don't accidentally use Console
-
-namespace Terminal.Gui.TextTests;
-public class UnicodeTests {
-	readonly ITestOutputHelper _output;
-
-	public UnicodeTests (ITestOutputHelper output)
-	{
-		this._output = output;
-	}
-
-	[Fact, AutoInitShutdown]
-	public void AddRune_On_Clip_Left_Or_Right_Replace_Previous_Or_Next_Wide_Rune_With_Space ()
-	{
-		var tv = new TextView () {
-			Width = Dim.Fill (),
-			Height = Dim.Fill (),
-			Text = @"これは広いルーンラインです。
-これは広いルーンラインです。
-これは広いルーンラインです。
-これは広いルーンラインです。
-これは広いルーンラインです。
-これは広いルーンラインです。
-これは広いルーンラインです。
-これは広いルーンラインです。"
-		};
-		var win = new Window () { Width = Dim.Fill (), Height = Dim.Fill () };
-		win.Add (tv);
-		Application.Top.Add (win);
-		var lbl = new Label ("ワイドルーン。");
-		var dg = new Dialog (new Button ("選ぶ")) { Width = 14, Height = 4 };
-		dg.Add (lbl);
-		Application.Begin (Application.Top);
-		Application.Begin (dg);
-		((FakeDriver)Application.Driver).SetBufferSize (30, 10);
-
-		var expected = @$"
-┌────────────────────────────┐
-│これは広いルーンラインです。│
-│これは広いルーンラインです。│
-│これは�┌────────────┐�です。│
-│これは�│ワイドルーン│�です。│
-│これは�│  {CM.Glyphs.LeftBracket} 選ぶ {CM.Glyphs.RightBracket}  │�です。│
-│これは�└────────────┘�です。│
-│これは広いルーンラインです。│
-│これは広いルーンラインです。│
-└────────────────────────────┘
-";
-
-		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
-		Assert.Equal (new Rect (0, 0, 30, 10), pos);
-	}
-}

UnitTests/View/DrawTests.cs

@@ -2,338 +2,374 @@
 using System;
 using Xunit;
 using Xunit.Abstractions;
+using Microsoft.VisualStudio.TestPlatform.Utilities;
+
+namespace Terminal.Gui.ViewsTests; 
+
+public class DrawTests {
+	readonly ITestOutputHelper _output;
+
+	public DrawTests (ITestOutputHelper output) => _output = output;
+
+	[Fact] [AutoInitShutdown]
+	public void Clipping_AddRune_Left_Or_Right_Replace_Previous_Or_Next_Wide_Rune_With_Space ()
+	{
+		var tv = new TextView () {
+			Width = Dim.Fill (),
+			Height = Dim.Fill (),
+			Text = @"これは広いルーンラインです。
+これは広いルーンラインです。
+これは広いルーンラインです。
+これは広いルーンラインです。
+これは広いルーンラインです。
+これは広いルーンラインです。
+これは広いルーンラインです。
+これは広いルーンラインです。"
+		};
+		var win = new Window () { Width = Dim.Fill (), Height = Dim.Fill () };
+		win.Add (tv);
+		Application.Top.Add (win);
+		var lbl = new Label ("ワイドルーン。");
+		// Don't have unit tests use things that aren't absolutely critical for the test, like Dialog
+		var dg = new Window () { X = 2, Y = 2, Width = 14, Height = 3 };
+		dg.Add (lbl);
+		Application.Begin (Application.Top);
+		Application.Begin (dg);
+		((FakeDriver)Application.Driver).SetBufferSize (30, 10);
+
+		string expected = @$"
+┌────────────────────────────┐
+│これは広いルーンラインです。│
+│�┌────────────┐�ラインです。│
+│�│ワイドルーン│�ラインです。│
+│�└────────────┘�ラインです。│
+│これは広いルーンラインです。│
+│これは広いルーンラインです。│
+│これは広いルーンラインです。│
+│これは広いルーンラインです。│
+└────────────────────────────┘";
+
+		var pos = TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
+		Assert.Equal (new Rect (0, 0, 30, 10), pos);
+	}
 
-namespace Terminal.Gui.ViewsTests {
-	public class DrawTests {
-		readonly ITestOutputHelper output;
-
-		public DrawTests (ITestOutputHelper output)
-		{
-			this.output = output;
-		}
-
-		// TODO: The tests below that use Label should use View instead.
-		[Fact, AutoInitShutdown]
-		public void Non_Bmp_ConsoleWidth_ColumnWidth_Equal_Two ()
-		{
-			string us = "\U0001d539";
-			Rune r = (Rune)0x1d539;
+	// TODO: The tests below that use Label should use View instead.
+	[Fact] [AutoInitShutdown]
+	public void Non_Bmp_ConsoleWidth_ColumnWidth_Equal_Two ()
+	{
+		string us = "\U0001d539";
+		var r = (Rune)0x1d539;
 
-			Assert.Equal ("𝔹", us);
-			Assert.Equal ("𝔹", r.ToString ());
-			Assert.Equal (us, r.ToString ());
+		Assert.Equal ("𝔹", us);
+		Assert.Equal ("𝔹", r.ToString ());
+		Assert.Equal (us, r.ToString ());
 
-			Assert.Equal (1, us.GetColumns ());
-			Assert.Equal (1, r.GetColumns ());
+		Assert.Equal (1, us.GetColumns ());
+		Assert.Equal (1, r.GetColumns ());
 
-			var win = new Window () { Title = us };
-			var label = new Label (r.ToString ());
-			var tf = new TextField (us) { Y = 1, Width = 3 };
-			win.Add (label, tf);
-			var top = Application.Top;
-			top.Add (win);
+		var win = new Window () { Title = us };
+		var label = new Label (r.ToString ());
+		var tf = new TextField (us) { Y = 1, Width = 3 };
+		win.Add (label, tf);
+		var top = Application.Top;
+		top.Add (win);
 
-			Application.Begin (top);
-			((FakeDriver)Application.Driver).SetBufferSize (10, 4);
+		Application.Begin (top);
+		((FakeDriver)Application.Driver).SetBufferSize (10, 4);
 
-			var expected = @"
+		string expected = @"
 ┌┤𝔹├─────┐
 │𝔹       │
 │𝔹       │
 └────────┘";
-			TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
+		TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
 
-			TestHelpers.AssertDriverContentsAre (expected, output);
+		TestHelpers.AssertDriverContentsAre (expected, _output);
 
-			var expectedColors = new Attribute [] {
-				// 0
-				Colors.Base.Normal,
-				// 1
-				Colors.Base.Focus,
-				// 2
-				Colors.Base.HotNormal
-			};
+		var expectedColors = new Attribute [] {
+			// 0
+			Colors.Base.Normal,
+			// 1
+			Colors.Base.Focus,
+			// 2
+			Colors.Base.HotNormal
+		};
 
-			TestHelpers.AssertDriverColorsAre (@"
+		TestHelpers.AssertDriverColorsAre (@"
 0020000000
 0000000000
 0111000000
-0000000000", driver: Application.Driver, expectedColors);
-		}
+0000000000", Application.Driver, expectedColors);
+	}
 
-		[Fact, AutoInitShutdown]
-		public void CJK_Compatibility_Ideographs_ConsoleWidth_ColumnWidth_Equal_Two ()
-		{
-			string us = "\U0000f900";
-			Rune r = (Rune)0xf900;
+	[Fact] [AutoInitShutdown]
+	public void CJK_Compatibility_Ideographs_ConsoleWidth_ColumnWidth_Equal_Two ()
+	{
+		string us = "\U0000f900";
+		var r = (Rune)0xf900;
 
-			Assert.Equal ("豈", us);
-			Assert.Equal ("豈", r.ToString ());
-			Assert.Equal (us, r.ToString ());
+		Assert.Equal ("豈", us);
+		Assert.Equal ("豈", r.ToString ());
+		Assert.Equal (us, r.ToString ());
 
-			Assert.Equal (2, us.GetColumns ());
-			Assert.Equal (2, r.GetColumns ());
+		Assert.Equal (2, us.GetColumns ());
+		Assert.Equal (2, r.GetColumns ());
 
-			var win = new Window () { Title = us };
-			var label = new Label (r.ToString ());
-			var tf = new TextField (us) { Y = 1, Width = 3 };
-			win.Add (label, tf);
-			var top = Application.Top;
-			top.Add (win);
+		var win = new Window () { Title = us };
+		var label = new Label (r.ToString ());
+		var tf = new TextField (us) { Y = 1, Width = 3 };
+		win.Add (label, tf);
+		var top = Application.Top;
+		top.Add (win);
 
-			Application.Begin (top);
-			((FakeDriver)Application.Driver).SetBufferSize (10, 4);
+		Application.Begin (top);
+		((FakeDriver)Application.Driver).SetBufferSize (10, 4);
 
-			var expected = @"
+		string expected = @"
 ┌┤豈├────┐
 │豈      │
 │豈      │
 └────────┘";
-			TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
+		TestHelpers.AssertDriverContentsWithFrameAre (expected, _output);
 
-			TestHelpers.AssertDriverContentsAre (expected, output);
+		TestHelpers.AssertDriverContentsAre (expected, _output);
 
-			var expectedColors = new Attribute [] {
-				// 0
-				Colors.Base.Normal,
-				// 1
-				Colors.Base.Focus,
-				// 2
-				Colors.Base.HotNormal
-			};
+		var expectedColors = new Attribute [] {
+			// 0
+			Colors.Base.Normal,
+			// 1
+			Colors.Base.Focus,
+			// 2
+			Colors.Base.HotNormal
+		};
 
-			TestHelpers.AssertDriverColorsAre (@"
+		TestHelpers.AssertDriverColorsAre (@"
 0022000000
 0000000000
 0111000000
-0000000000", driver: Application.Driver, expectedColors);
-		}
-
-		[Fact, AutoInitShutdown]
-		public void Colors_On_TextAlignment_Right_And_Bottom ()
-		{
-			var labelRight = new Label ("Test") {
-				Width = 6,
-				Height = 1,
-				TextAlignment = TextAlignment.Right,
-				ColorScheme = Colors.Base
-			};
-			var labelBottom = new Label ("Test", TextDirection.TopBottom_LeftRight) {
-				Y = 1,
-				Width = 1,
-				Height = 6,
-				VerticalTextAlignment = VerticalTextAlignment.Bottom,
-				ColorScheme = Colors.Base
-			};
-			var top = Application.Top;
-			top.Add (labelRight, labelBottom);
-
-			Application.Begin (top);
-			((FakeDriver)Application.Driver).SetBufferSize (7, 7);
-
-			TestHelpers.AssertDriverContentsWithFrameAre (@"
+0000000000", Application.Driver, expectedColors);
+	}
+
+	[Fact] [AutoInitShutdown]
+	public void Colors_On_TextAlignment_Right_And_Bottom ()
+	{
+		var labelRight = new Label ("Test") {
+			Width = 6,
+			Height = 1,
+			TextAlignment = TextAlignment.Right,
+			ColorScheme = Colors.Base
+		};
+		var labelBottom = new Label ("Test", TextDirection.TopBottom_LeftRight) {
+			Y = 1,
+			Width = 1,
+			Height = 6,
+			VerticalTextAlignment = VerticalTextAlignment.Bottom,
+			ColorScheme = Colors.Base
+		};
+		var top = Application.Top;
+		top.Add (labelRight, labelBottom);
+
+		Application.Begin (top);
+		((FakeDriver)Application.Driver).SetBufferSize (7, 7);
+
+		TestHelpers.AssertDriverContentsWithFrameAre (@"
   Test
       
       
 T     
 e     
 s     
-t     ", output);
+t     ", _output);
 
-			TestHelpers.AssertDriverColorsAre (@"
+		TestHelpers.AssertDriverColorsAre (@"
 000000
 0
 0
 0
 0
 0
-0", driver: Application.Driver, new Attribute [] { Colors.Base.Normal });
-		}
-
-		[Fact, AutoInitShutdown]
-		public void Draw_Negative_Bounds_Horizontal_Without_New_Lines ()
-		{
-			// BUGBUG: This previously assumed the default height of a View was 1. 
-			var subView = new View () { Id = "subView", Y = 1, Width = 7, Height = 1, Text = "subView" };
-			var view = new View () { Id = "view", Width = 20, Height = 2, Text = "01234567890123456789" };
-			view.Add (subView);
-			var content = new View () { Id = "content", Width = 20, Height = 20 };
-			content.Add (view);
-			var container = new View () { Id = "container", X = 1, Y = 1, Width = 5, Height = 5 };
-			container.Add (content);
-			var top = Application.Top;
-			top.Add (container);
-			// BUGBUG: v2 - it's bogus to reference .Frame before BeginInit. And why is the clip being set anyway???
-
-			void Top_LayoutComplete (object sender, LayoutEventArgs e)
-			{
-				Application.Driver.Clip = container.Frame;
-			}
-			top.LayoutComplete += Top_LayoutComplete;
-			Application.Begin (top);
-
-			TestHelpers.AssertDriverContentsWithFrameAre (@"
+0", Application.Driver, new Attribute [] { Colors.Base.Normal });
+	}
+
+	[Fact] [AutoInitShutdown]
+	public void Draw_Negative_Bounds_Horizontal_Without_New_Lines ()
+	{
+		// BUGBUG: This previously assumed the default height of a View was 1. 
+		var subView = new View () { Id = "subView", Y = 1, Width = 7, Height = 1, Text = "subView" };
+		var view = new View () { Id = "view", Width = 20, Height = 2, Text = "01234567890123456789" };
+		view.Add (subView);
+		var content = new View () { Id = "content", Width = 20, Height = 20 };
+		content.Add (view);
+		var container = new View () { Id = "container", X = 1, Y = 1, Width = 5, Height = 5 };
+		container.Add (content);
+		var top = Application.Top;
+		top.Add (container);
+		// BUGBUG: v2 - it's bogus to reference .Frame before BeginInit. And why is the clip being set anyway???
+
+		void Top_LayoutComplete (object sender, LayoutEventArgs e) => Application.Driver.Clip = container.Frame;
+		top.LayoutComplete += Top_LayoutComplete;
+		Application.Begin (top);
+
+		TestHelpers.AssertDriverContentsWithFrameAre (@"
  01234
- subVi", output);
+ subVi", _output);
 
-			content.X = -1;
-			Application.Refresh ();
-			TestHelpers.AssertDriverContentsWithFrameAre (@"
+		content.X = -1;
+		Application.Refresh ();
+		TestHelpers.AssertDriverContentsWithFrameAre (@"
  12345
- ubVie", output);
-
-			content.Y = -1;
-			Application.Refresh ();
-			TestHelpers.AssertDriverContentsWithFrameAre (@"
- ubVie", output);
-
-			content.Y = -2;
-			Application.Refresh ();
-			TestHelpers.AssertDriverContentsWithFrameAre ("", output);
-
-			content.X = -20;
-			content.Y = 0;
-			Application.Refresh ();
-			TestHelpers.AssertDriverContentsWithFrameAre ("", output);
-		}
-
-		[Fact, AutoInitShutdown]
-		public void Draw_Negative_Bounds_Horizontal_With_New_Lines ()
-		{
-			var subView = new View () { Id = "subView", X = 1, Width = 1, Height = 7, Text = "s\nu\nb\nV\ni\ne\nw" };
-			var view = new View () { Id = "view", Width = 2, Height = 20, Text = "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n0\n1\n2\n3\n4\n5\n6\n7\n8\n9" };
-			view.Add (subView);
-			var content = new View () { Id = "content", Width = 20, Height = 20 };
-			content.Add (view);
-			var container = new View () { Id = "container", X = 1, Y = 1, Width = 5, Height = 5 };
-			container.Add (content);
-			var top = Application.Top;
-			top.Add (container);
-			Application.Driver.Clip = container.Frame;
-			Application.Begin (top);
-
-			TestHelpers.AssertDriverContentsWithFrameAre (@"
+ ubVie", _output);
+
+		content.Y = -1;
+		Application.Refresh ();
+		TestHelpers.AssertDriverContentsWithFrameAre (@"
+ ubVie", _output);
+
+		content.Y = -2;
+		Application.Refresh ();
+		TestHelpers.AssertDriverContentsWithFrameAre ("", _output);
+
+		content.X = -20;
+		content.Y = 0;
+		Application.Refresh ();
+		TestHelpers.AssertDriverContentsWithFrameAre ("", _output);
+	}
+
+	[Fact] [AutoInitShutdown]
+	public void Draw_Negative_Bounds_Horizontal_With_New_Lines ()
+	{
+		var subView = new View () { Id = "subView", X = 1, Width = 1, Height = 7, Text = "s\nu\nb\nV\ni\ne\nw" };
+		var view = new View () { Id = "view", Width = 2, Height = 20, Text = "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n0\n1\n2\n3\n4\n5\n6\n7\n8\n9" };
+		view.Add (subView);
+		var content = new View () { Id = "content", Width = 20, Height = 20 };
+		content.Add (view);
+		var container = new View () { Id = "container", X = 1, Y = 1, Width = 5, Height = 5 };
+		container.Add (content);
+		var top = Application.Top;
+		top.Add (container);
+		Application.Driver.Clip = container.Frame;
+		Application.Begin (top);
+
+		TestHelpers.AssertDriverContentsWithFrameAre (@"
  0s
  1u
  2b
  3V
- 4i", output);
+ 4i", _output);
 
-			content.X = -1;
-			Application.Refresh ();
-			TestHelpers.AssertDriverContentsWithFrameAre (@"
+		content.X = -1;
+		Application.Refresh ();
+		TestHelpers.AssertDriverContentsWithFrameAre (@"
  s
  u
  b
  V
- i", output);
+ i", _output);
 
-			content.X = -2;
-			Application.Refresh ();
-			TestHelpers.AssertDriverContentsWithFrameAre (@"", output);
+		content.X = -2;
+		Application.Refresh ();
+		TestHelpers.AssertDriverContentsWithFrameAre (@"", _output);
 
-			content.X = 0;
-			content.Y = -1;
-			Application.Refresh ();
-			TestHelpers.AssertDriverContentsWithFrameAre (@"
+		content.X = 0;
+		content.Y = -1;
+		Application.Refresh ();
+		TestHelpers.AssertDriverContentsWithFrameAre (@"
  1u
  2b
  3V
  4i
- 5e", output);
+ 5e", _output);
 
-			content.Y = -6;
-			Application.Refresh ();
-			TestHelpers.AssertDriverContentsWithFrameAre (@"
+		content.Y = -6;
+		Application.Refresh ();
+		TestHelpers.AssertDriverContentsWithFrameAre (@"
  6w
  7 
  8 
  9 
- 0 ", output);
-
-			content.Y = -19;
-			Application.Refresh ();
-			TestHelpers.AssertDriverContentsWithFrameAre (@"
- 9", output);
-
-			content.Y = -20;
-			Application.Refresh ();
-			TestHelpers.AssertDriverContentsWithFrameAre ("", output);
-
-			content.X = -2;
-			content.Y = 0;
-			Application.Refresh ();
-			TestHelpers.AssertDriverContentsWithFrameAre ("", output);
-		}
-
-		[Fact, AutoInitShutdown]
-		public void Draw_Negative_Bounds_Vertical ()
-		{
-			var subView = new View () { Id = "subView", X = 1, Width = 1, Height = 7, Text = "subView", TextDirection = TextDirection.TopBottom_LeftRight };
-			var view = new View () { Id = "view", Width = 2, Height = 20, Text = "01234567890123456789", TextDirection = TextDirection.TopBottom_LeftRight };
-			view.Add (subView);
-			var content = new View () { Id = "content", Width = 20, Height = 20 };
-			content.Add (view);
-			var container = new View () { Id = "container", X = 1, Y = 1, Width = 5, Height = 5 };
-			container.Add (content);
-			var top = Application.Top;
-			top.Add (container);
-			Application.Driver.Clip = container.Frame;
-			Application.Begin (top);
-
-			TestHelpers.AssertDriverContentsWithFrameAre (@"
+ 0 ", _output);
+
+		content.Y = -19;
+		Application.Refresh ();
+		TestHelpers.AssertDriverContentsWithFrameAre (@"
+ 9", _output);
+
+		content.Y = -20;
+		Application.Refresh ();
+		TestHelpers.AssertDriverContentsWithFrameAre ("", _output);
+
+		content.X = -2;
+		content.Y = 0;
+		Application.Refresh ();
+		TestHelpers.AssertDriverContentsWithFrameAre ("", _output);
+	}
+
+	[Fact] [AutoInitShutdown]
+	public void Draw_Negative_Bounds_Vertical ()
+	{
+		var subView = new View () { Id = "subView", X = 1, Width = 1, Height = 7, Text = "subView", TextDirection = TextDirection.TopBottom_LeftRight };
+		var view = new View () { Id = "view", Width = 2, Height = 20, Text = "01234567890123456789", TextDirection = TextDirection.TopBottom_LeftRight };
+		view.Add (subView);
+		var content = new View () { Id = "content", Width = 20, Height = 20 };
+		content.Add (view);
+		var container = new View () { Id = "container", X = 1, Y = 1, Width = 5, Height = 5 };
+		container.Add (content);
+		var top = Application.Top;
+		top.Add (container);
+		Application.Driver.Clip = container.Frame;
+		Application.Begin (top);
+
+		TestHelpers.AssertDriverContentsWithFrameAre (@"
  0s
  1u
  2b
  3V
- 4i", output);
+ 4i", _output);
 
-			content.X = -1;
-			Application.Refresh ();
-			TestHelpers.AssertDriverContentsWithFrameAre (@"
+		content.X = -1;
+		Application.Refresh ();
+		TestHelpers.AssertDriverContentsWithFrameAre (@"
  s
  u
  b
  V
- i", output);
+ i", _output);
 
-			content.X = -2;
-			Application.Refresh ();
-			TestHelpers.AssertDriverContentsWithFrameAre (@"", output);
+		content.X = -2;
+		Application.Refresh ();
+		TestHelpers.AssertDriverContentsWithFrameAre (@"", _output);
 
-			content.X = 0;
-			content.Y = -1;
-			Application.Refresh ();
-			TestHelpers.AssertDriverContentsWithFrameAre (@"
+		content.X = 0;
+		content.Y = -1;
+		Application.Refresh ();
+		TestHelpers.AssertDriverContentsWithFrameAre (@"
  1u
  2b
  3V
  4i
- 5e", output);
+ 5e", _output);
 
-			content.Y = -6;
-			Application.Refresh ();
-			TestHelpers.AssertDriverContentsWithFrameAre (@"
+		content.Y = -6;
+		Application.Refresh ();
+		TestHelpers.AssertDriverContentsWithFrameAre (@"
  6w
  7 
  8 
  9 
- 0 ", output);
-
-			content.Y = -19;
-			Application.Refresh ();
-			TestHelpers.AssertDriverContentsWithFrameAre (@"
- 9", output);
-
-			content.Y = -20;
-			Application.Refresh ();
-			TestHelpers.AssertDriverContentsWithFrameAre ("", output);
-
-			content.X = -2;
-			content.Y = 0;
-			Application.Refresh ();
-			TestHelpers.AssertDriverContentsWithFrameAre ("", output);
-		}
-	}
-}
+ 0 ", _output);
+
+		content.Y = -19;
+		Application.Refresh ();
+		TestHelpers.AssertDriverContentsWithFrameAre (@"
+ 9", _output);
 
+		content.Y = -20;
+		Application.Refresh ();
+		TestHelpers.AssertDriverContentsWithFrameAre ("", _output);
+
+		content.X = -2;
+		content.Y = 0;
+		Application.Refresh ();
+		TestHelpers.AssertDriverContentsWithFrameAre ("", _output);
+	}
+}