From 3888c86ee45eb533da6bfc9d8670b4e9b821bec3 Mon Sep 17 00:00:00 2001 From: Tig Date: Wed, 6 Mar 2024 21:37:22 -0700 Subject: [PATCH] Fixed unit tests that broke due to rebase --- Terminal.Gui/View/Adornment/Adornment.cs | 2 +- UnitTests/View/NavigationTests.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Terminal.Gui/View/Adornment/Adornment.cs b/Terminal.Gui/View/Adornment/Adornment.cs index fd9eb1f25..cd6e85681 100644 --- a/Terminal.Gui/View/Adornment/Adornment.cs +++ b/Terminal.Gui/View/Adornment/Adornment.cs @@ -156,7 +156,7 @@ public class Adornment : View Driver.SetAttribute (normalAttr); // This just draws/clears the thickness, not the insides. - Thickness.Draw (screenBounds, (string)(Data ?? string.Empty)); + Thickness.Draw (screenBounds, ToString ()); if (!string.IsNullOrEmpty (TextFormatter.Text)) { diff --git a/UnitTests/View/NavigationTests.cs b/UnitTests/View/NavigationTests.cs index fe236b1cd..7df35b0e3 100644 --- a/UnitTests/View/NavigationTests.cs +++ b/UnitTests/View/NavigationTests.cs @@ -1016,14 +1016,14 @@ public class NavigationTests screen = top.BoundsToScreen (new (0, 0, 0, 0)); Assert.Equal (4, screen.X); Assert.Equal (3, screen.Y); - Assert.Equal (top, View.FindDeepestView (top, 3, 2)); + Assert.Equal (top.Border, View.FindDeepestView (top, 3, 2)); //Assert.Equal (0, found.FrameToScreen ().X); //Assert.Equal (0, found.FrameToScreen ().Y); Assert.Equal (new Point (10, 0), top.ScreenToFrame (13, 2)); screen = top.BoundsToScreen (new (10, 0, 0, 0)); Assert.Equal (14, screen.X); Assert.Equal (3, screen.Y); - Assert.Equal (top, View.FindDeepestView (top, 13, 2)); + Assert.Equal (top.Border, View.FindDeepestView (top, 13, 2)); //Assert.Equal (10, found.FrameToScreen ().X); //Assert.Equal (0, found.FrameToScreen ().Y); Assert.Equal (new Point (11, 1), top.ScreenToFrame (14, 3));