Working on fixing tests

Author: tznind

Terminal.Gui/Views/SplitContainer.cs

@@ -188,7 +188,7 @@ private void Setup ()
 
 					splitterPanels[0].Height = Dim.Fill ();
 					splitterPanels[0].Width = new Dim.DimFunc (() =>
-					splitterDistance.Anchor (Bounds.Width)) - 1;
+					splitterDistance.Anchor (Bounds.Width));
 
 					splitterPanels[1].X = Pos.Right (splitterLine);
 					splitterPanels[1].Y = 0;
@@ -322,15 +322,20 @@ public SplitContainerLineView (SplitContainer parent)
 				LayoutStarted += (e) => {
 					moveRuneRenderLocation = null;
 					if (Orientation == Orientation.Horizontal) {
-						StartingAnchor = Driver.LeftTee;
-						EndingAnchor = Driver.RightTee;
+						StartingAnchor = ParentHasBorder () ? Driver.LeftTee : (Rune?)null;
+						EndingAnchor = ParentHasBorder () ? Driver.RightTee : (Rune?)null;
 					} else {
-						StartingAnchor = Driver.TopTee;
-						EndingAnchor = Driver.BottomTee;
+						StartingAnchor = ParentHasBorder () ? Driver.TopTee : (Rune?)null;
+						EndingAnchor = ParentHasBorder () ? Driver.BottomTee : (Rune?)null;
 					}
 				};
 			}
 
+			private bool ParentHasBorder ()
+			{
+				return parent.Border != null && parent.Border.BorderStyle != BorderStyle.None;
+			}
+
 			public override bool ProcessKey (KeyEvent kb)
 			{
 				if (!CanFocus || !HasFocus) {

UnitTests/SplitContainerTests.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using Terminal.Gui;
 using Xunit;
 using Xunit.Abstractions;
@@ -33,13 +34,33 @@ public void TestSplitContainer_Vertical ()
 			splitContainer.Redraw (splitContainer.Bounds);
 			TestHelpers.AssertDriverContentsAre (looksLike, output);
 
+		}
+		[Fact, AutoInitShutdown]
+		public void TestSplitContainer_Vertical_WithBorder ()
+		{
+			var splitContainer = Get11By3SplitContainer (true);
+			splitContainer.Redraw (splitContainer.Bounds);
+
+			string looksLike =
+@"
+┌────┬────┐
+│1111│2222│
+└────┴────┘";
+			TestHelpers.AssertDriverContentsAre (looksLike, output);
+
+			// Keyboard movement on splitter should have no effect if it is not focused
+			splitContainer.ProcessKey (new KeyEvent (Key.CursorRight, new KeyModifiers ()));
+			splitContainer.SetNeedsDisplay ();
+			splitContainer.Redraw (splitContainer.Bounds);
+			TestHelpers.AssertDriverContentsAre (looksLike, output);
+
 		}
 		[Fact, AutoInitShutdown]
 		public void TestSplitContainer_Vertical_Focused ()
 		{
 			var splitContainer = Get11By3SplitContainer ();
-			splitContainer.EnsureFocus ();
-			splitContainer.FocusFirst ();
+			SetInputFocusLine (splitContainer);
+
 			splitContainer.Redraw (splitContainer.Bounds);
 
 			string looksLike =
@@ -74,12 +95,52 @@ public void TestSplitContainer_Vertical_Focused ()
 			TestHelpers.AssertDriverContentsAre (looksLike, output);
 		}
 
+		[Fact, AutoInitShutdown]
+		public void TestSplitContainer_Vertical_Focused_WithBorder ()
+		{
+			var splitContainer = Get11By3SplitContainer (true);
+			SetInputFocusLine (splitContainer);
+
+			splitContainer.Redraw (splitContainer.Bounds);
+
+			string looksLike =
+@"
+┌────┬────┐
+│1111◊2222│
+└────┴────┘";
+			TestHelpers.AssertDriverContentsAre (looksLike, output);
+
+			// Now while focused move the splitter 1 unit right
+			splitContainer.ProcessKey (new KeyEvent (Key.CursorRight, new KeyModifiers ()));
+			splitContainer.Redraw (splitContainer.Bounds);
+
+			looksLike =
+@"
+┌─────┬───┐
+│11111◊222│
+└─────┴───┘";
+			TestHelpers.AssertDriverContentsAre (looksLike, output);
+
+
+			// and 2 to the left
+			splitContainer.ProcessKey (new KeyEvent (Key.CursorLeft, new KeyModifiers ()));
+			splitContainer.ProcessKey (new KeyEvent (Key.CursorLeft, new KeyModifiers ()));
+			splitContainer.Redraw (splitContainer.Bounds);
+
+			looksLike =
+@"
+┌───┬─────┐
+│111◊22222│
+└───┴─────┘";
+			TestHelpers.AssertDriverContentsAre (looksLike, output);
+		}
+
+
 		[Fact, AutoInitShutdown]
 		public void TestSplitContainer_Vertical_Focused_50PercentSplit ()
 		{
 			var splitContainer = Get11By3SplitContainer ();
-			splitContainer.EnsureFocus ();
-			splitContainer.FocusFirst ();
+			SetInputFocusLine (splitContainer);
 			splitContainer.SplitterDistance = Pos.Percent (50);
 			Assert.IsType<Pos.PosFactor> (splitContainer.SplitterDistance);
 			splitContainer.Redraw (splitContainer.Bounds);
@@ -147,9 +208,7 @@ public void TestSplitContainer_Horizontal ()
 		public void TestSplitContainer_Vertical_Panel1MinSize_Absolute ()
 		{
 			var splitContainer = Get11By3SplitContainer ();
-
-			splitContainer.EnsureFocus ();
-			splitContainer.FocusFirst ();
+			SetInputFocusLine (splitContainer);
 			splitContainer.Panels [0].MinSize = 6;
 
 			// distance is too small (below 6)
@@ -195,8 +254,7 @@ public void TestSplitContainer_Horizontal_Focused ()
 			var splitContainer = Get11By3SplitContainer ();
 
 			splitContainer.Orientation = Terminal.Gui.Graphs.Orientation.Horizontal;
-			splitContainer.EnsureFocus ();
-			splitContainer.FocusFirst ();
+			SetInputFocusLine (splitContainer);
 
 			splitContainer.Redraw (splitContainer.Bounds);
 
@@ -235,8 +293,7 @@ public void TestSplitContainer_Horizontal_Panel1MinSize_Absolute ()
 			var splitContainer = Get11By3SplitContainer ();
 
 			splitContainer.Orientation = Terminal.Gui.Graphs.Orientation.Horizontal;
-			splitContainer.EnsureFocus ();
-			splitContainer.FocusFirst ();
+			SetInputFocusLine (splitContainer);
 			splitContainer.Panels [0].MinSize = 1;
 
 			// 0 should not be allowed because it brings us below minimum size of Panel1
@@ -291,15 +348,24 @@ public void TestSplitContainer_CannotSetSplitterPosToFuncEtc ()
 			Assert.Equal ("Only Percent and Absolute values are supported for SplitterDistance property.  Passed value was PosCombine", ex.Message);
 		}
 
-		private SplitContainer Get11By3SplitContainer ()
+		private void SetInputFocusLine (SplitContainer splitContainer)
+		{
+			var line = splitContainer.Subviews [0].Subviews.OfType<LineView> ().Single ();
+			line.SetFocus ();
+			Assert.True (line.HasFocus);
+		}
+
+		private SplitContainer Get11By3SplitContainer (bool withBorder = false)
 		{
 			var container = new SplitContainer () {
 				Width = 11,
 				Height = 3,
 			};
 
-			container.Border.DrawMarginFrame = false;
-			container.Border.BorderStyle = BorderStyle.None;
+			if (!withBorder) {
+				container.Border.BorderStyle = BorderStyle.None;
+				container.Border.DrawMarginFrame = false;
+			}
 
 			container.Panels [0].Add (new Label (new string ('1', 100)));
 			container.Panels [1].Add (new Label (new string ('2', 100)));