Fixed Wizard tests

UnitTests/Core/ViewTests.cs

@@ -2961,5 +2961,63 @@ At 0,0
 
 			TestHelpers.AssertDriverContentsWithFrameAre (expected, output);
 		}
+
+		[Fact]
+		public void Set_Title_Fires_TitleChanging ()
+		{
+			var r = new View ();
+			Assert.Equal (ustring.Empty, r.Title);
+
+			string expectedOld = null;
+			string expectedDuring = null;
+			string expectedAfter = null;
+			bool cancel = false;
+			r.TitleChanging += (s, args) => {
+				Assert.Equal (expectedOld, args.OldTitle);
+				Assert.Equal (expectedDuring, args.NewTitle);
+				args.Cancel = cancel;
+			};
+
+			expectedOld = string.Empty;
+			r.Title = expectedDuring = expectedAfter = "title";
+			Assert.Equal (expectedAfter, r.Title.ToString ());
+
+			expectedOld = r.Title.ToString ();
+			r.Title = expectedDuring = expectedAfter = "a different title";
+			Assert.Equal (expectedAfter, r.Title.ToString ());
+
+			// Now setup cancelling the change and change it back to "title"
+			cancel = true;
+			expectedOld = r.Title.ToString ();
+			r.Title = expectedDuring = "title";
+			Assert.Equal (expectedAfter, r.Title.ToString ());
+			r.Dispose ();
+
+		}
+
+		[Fact]
+		public void Set_Title_Fires_TitleChanged ()
+		{
+			var r = new View ();
+			Assert.Equal (ustring.Empty, r.Title);
+
+			string expectedOld = null;
+			string expected = null;
+			r.TitleChanged += (s, args) => {
+				Assert.Equal (expectedOld, args.OldTitle);
+				Assert.Equal (r.Title, args.NewTitle);
+			};
+
+			expected = "title";
+			expectedOld = r.Title.ToString ();
+			r.Title = expected;
+			Assert.Equal (expected, r.Title.ToString ());
+
+			expected = "another title";
+			expectedOld = r.Title.ToString ();
+			r.Title = expected;
+			Assert.Equal (expected, r.Title.ToString ());
+			r.Dispose ();
+		}
 	}
 }

UnitTests/TopLevels/WindowTests.cs

@@ -94,63 +94,7 @@ namespace Terminal.Gui.TopLevelTests {
 			r.Dispose ();
 		}
 
-		[Fact]
-		public void Set_Title_Fires_TitleChanging ()
-		{
-			var r = new Window ();
-			Assert.Equal (ustring.Empty, r.Title);
-
-			string expectedOld = null;
-			string expectedDuring = null;
-			string expectedAfter = null;
-			bool cancel = false;
-			r.TitleChanging += (s, args) => {
-				Assert.Equal (expectedOld, args.OldTitle);
-				Assert.Equal (expectedDuring, args.NewTitle);
-				args.Cancel = cancel;
-			};
-
-			expectedOld = string.Empty;
-			r.Title = expectedDuring = expectedAfter = "title";
-			Assert.Equal (expectedAfter, r.Title.ToString ());
-
-			expectedOld = r.Title.ToString ();
-			r.Title = expectedDuring = expectedAfter = "a different title";
-			Assert.Equal (expectedAfter, r.Title.ToString ());
-
-			// Now setup cancelling the change and change it back to "title"
-			cancel = true;
-			expectedOld = r.Title.ToString ();
-			r.Title = expectedDuring = "title";
-			Assert.Equal (expectedAfter, r.Title.ToString ());
-			r.Dispose ();
-
-		}
-
-		[Fact]
-		public void Set_Title_Fires_TitleChanged ()
-		{
-			var r = new Window ();
-			Assert.Equal (ustring.Empty, r.Title);
 
-			string expectedOld = null;
-			string expected = null;
-			r.TitleChanged += (s,args) => {
-				Assert.Equal (expectedOld, args.OldTitle);
-				Assert.Equal (r.Title, args.NewTitle);
-			};
-
-			expected = "title";
-			expectedOld = r.Title.ToString ();
-			r.Title = expected;
-			Assert.Equal (expected, r.Title.ToString ());
-
-			expected = "another title";
-			expectedOld = r.Title.ToString ();
-			r.Title = expected;
-			Assert.Equal (expected, r.Title.ToString ());
-			r.Dispose ();
-		}
 
 		[Fact, AutoInitShutdown]
 		public void MenuBar_And_StatusBar_Inside_Window ()

UnitTests/TopLevels/WizardTests.cs

@@ -118,7 +118,7 @@ namespace Terminal.Gui.TopLevelTests {
 			var btnNextText = "Finish";
 			var btnNext = $"{d.LeftBracket}{d.LeftDefaultIndicator} {btnNextText} {d.RightDefaultIndicator}{d.RightBracket}";
 
-			var topRow = $"{d.ULDCorner} {title}{stepTitle} {new string (d.HDLine.ToString () [0], width - title.Length - stepTitle.Length - 4)}{d.URDCorner}";
+			var topRow = $"{d.ULDCorner}╡{title}{stepTitle}╞{new string (d.HDLine.ToString () [0], width - title.Length - stepTitle.Length - 4)}{d.URDCorner}";
 			var row2 = $"{d.VDLine}{new string (' ', width - 2)}{d.VDLine}";
 			var row3 = row2;
 			var separatorRow = $"{d.VDLine}{new string (' ', width - 2)}{d.VDLine}";
@@ -149,7 +149,7 @@ namespace Terminal.Gui.TopLevelTests {
 			var btnNextText = "Finish"; // "Next";
 			var btnNext = $"{d.LeftBracket}{d.LeftDefaultIndicator} {btnNextText} {d.RightDefaultIndicator}{d.RightBracket}";
 
-			var topRow = $"{d.ULDCorner} {title} - {stepTitle} {new string (d.HDLine.ToString () [0], width - title.Length - stepTitle.Length - 7)}{d.URDCorner}";
+			var topRow = $"{d.ULDCorner}╡{title} - {stepTitle}╞{new string (d.HDLine.ToString () [0], width - title.Length - stepTitle.Length - 7)}{d.URDCorner}";
 			var row2 = $"{d.VDLine}{new string (' ', width - 2)}{d.VDLine}";
 			var row3 = row2;
 			var row4 = row3;
@@ -219,7 +219,7 @@ namespace Terminal.Gui.TopLevelTests {
 			var btnNextText = "Finish";
 			var btnNext = $"{d.LeftBracket}{d.LeftDefaultIndicator} {btnNextText} {d.RightDefaultIndicator}{d.RightBracket}";
 
-			var topRow = $"{d.ULDCorner} {title}{stepTitle} {new string (d.HDLine.ToString () [0], width - title.Length - stepTitle.Length - 4)}{d.URDCorner}";
+			var topRow = $"{d.ULDCorner}╡{title}{stepTitle}╞{new string (d.HDLine.ToString () [0], width - title.Length - stepTitle.Length - 4)}{d.URDCorner}";
 			var separatorRow = $"{d.VDLine}{new string (d.HLine.ToString () [0], width - 2)}{d.VDLine}";
 
 			// Once this is fixed, revert to commented out line: https://github.com/gui-cs/Terminal.Gui/issues/1791