Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2026-01-02 01:03:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Tig
2024-05-09 09:30:57 -06:00
parent 57dad5c2c5
commit ef16f814cf
10 changed files with 98 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
UnitTests/View/Adornment/ToScreenTests.cs
View File

@@ -251,9 +251,9 @@ public class AdornmentToScreenTests (ITestOutputHelper output)
view.Frame = frame;
// Act
var marginScreen = view.Margin.ViewportToScreen (new (testX, 0, 0, 0));
var borderScreen = view.Border.ViewportToScreen (new (testX, 0, 0, 0));
var paddingScreen = view.Padding.ViewportToScreen (new (testX, 0, 0, 0));
var marginScreen = view.Margin.ViewportToScreen (new Point (testX, 0));
var borderScreen = view.Border.ViewportToScreen (new Point (testX, 0));
var paddingScreen = view.Padding.ViewportToScreen (new Point (testX, 0));
// Assert
Assert.Equal (expectedX, marginScreen.X);
@@ -292,9 +292,9 @@ public class AdornmentToScreenTests (ITestOutputHelper output)
Assert.Equal(4, view.Viewport.Width);
// Act
var marginScreen = view.Margin.ViewportToScreen (new (testX, 0, 0, 0));
var borderScreen = view.Border.ViewportToScreen (new (testX, 0, 0, 0));
var paddingScreen = view.Padding.ViewportToScreen (new (testX, 0, 0, 0));
var marginScreen = view.Margin.ViewportToScreen (new Point (testX, 0));
var borderScreen = view.Border.ViewportToScreen (new Point (testX, 0));
var paddingScreen = view.Padding.ViewportToScreen (new Point (testX, 0));
// Assert
Assert.Equal (expectedX, marginScreen.X);
@@ -338,9 +338,9 @@ public class AdornmentToScreenTests (ITestOutputHelper output)
superView.LayoutSubviews ();
// Act
var marginScreen = view.Margin.ViewportToScreen (new (testX, 0, 0, 0));
var borderScreen = view.Border.ViewportToScreen (new (testX, 0, 0, 0));
var paddingScreen = view.Padding.ViewportToScreen (new (testX, 0, 0, 0));
var marginScreen = view.Margin.ViewportToScreen (new Point (testX, 0));
var borderScreen = view.Border.ViewportToScreen (new Point (testX, 0));
var paddingScreen = view.Padding.ViewportToScreen (new Point (testX, 0));
// Assert
Assert.Equal (expectedX, marginScreen.X);
@@ -385,9 +385,9 @@ public class AdornmentToScreenTests (ITestOutputHelper output)
superView.LayoutSubviews ();
// Act
var marginScreen = view.Margin.ViewportToScreen (new (testX, 0, 0, 0));
var borderScreen = view.Border.ViewportToScreen (new (testX, 0, 0, 0));
var paddingScreen = view.Padding.ViewportToScreen (new (testX, 0, 0, 0));
var marginScreen = view.Margin.ViewportToScreen (new Point (testX, 0));
var borderScreen = view.Border.ViewportToScreen (new Point (testX, 0));
var paddingScreen = view.Padding.ViewportToScreen (new Point (testX, 0));
// Assert
Assert.Equal (expectedX, marginScreen.X);
@@ -441,9 +441,9 @@ public class AdornmentToScreenTests (ITestOutputHelper output)
superView.LayoutSubviews ();
// Act
var marginScreen = view.Margin.ViewportToScreen (new (testX, 0, 0, 0));
var borderScreen = view.Border.ViewportToScreen (new (testX, 0, 0, 0));
var paddingScreen = view.Padding.ViewportToScreen (new (testX, 0, 0, 0));
var marginScreen = view.Margin.ViewportToScreen (new Point (testX, 0));
var borderScreen = view.Border.ViewportToScreen (new Point (testX, 0));
var paddingScreen = view.Padding.ViewportToScreen (new Point (testX, 0));
// Assert
Assert.Equal (expectedX, marginScreen.X);
@@ -502,9 +502,9 @@ public class AdornmentToScreenTests (ITestOutputHelper output)
superView.LayoutSubviews ();
// Act
var marginScreen = view.Margin.ViewportToScreen (new (testX, 0, 0, 0));
var borderScreen = view.Border.ViewportToScreen (new (testX, 0, 0, 0));
var paddingScreen = view.Padding.ViewportToScreen (new (testX, 0, 0, 0));
var marginScreen = view.Margin.ViewportToScreen (new Point (testX, 0));
var borderScreen = view.Border.ViewportToScreen (new Point (testX, 0));
var paddingScreen = view.Padding.ViewportToScreen (new Point (testX, 0));
// Assert
Assert.Equal (expectedX, marginScreen.X);

14
UnitTests/View/Layout/ToScreenTests.cs
View File

@@ -655,7 +655,7 @@ public class ToScreenTests (ITestOutputHelper output)
view.Frame = frame;
// Act
var screen = view.ViewportToScreen (new (viewportX, 0, 0, 0));
var screen = view.ViewportToScreen (new Point (viewportX, 0));
// Assert
Assert.Equal (expectedX, screen.X);
@@ -687,7 +687,7 @@ public class ToScreenTests (ITestOutputHelper output)
view.Frame = frame;
// Act
var screen = view.ViewportToScreen (new (viewportX, 0, 0, 0));
var screen = view.ViewportToScreen (new Point (viewportX, 0));
// Assert
Assert.Equal (expectedX, screen.X);
@@ -729,7 +729,7 @@ public class ToScreenTests (ITestOutputHelper output)
superView.LayoutSubviews ();
// Act
var screen = view.ViewportToScreen (new (viewportX, 0, 0, 0));
var screen = view.ViewportToScreen (new Point (viewportX, 0));
// Assert
Assert.Equal (expectedX, screen.X);
@@ -772,7 +772,7 @@ public class ToScreenTests (ITestOutputHelper output)
superView.LayoutSubviews ();
// Act
var screen = view.ViewportToScreen (new (viewportX, 0, 0, 0));
var screen = view.ViewportToScreen (new Point (viewportX, 0));
// Assert
Assert.Equal (expectedX, screen.X);
@@ -824,7 +824,7 @@ public class ToScreenTests (ITestOutputHelper output)
superView.LayoutSubviews ();
// Act
var screen = view.ViewportToScreen (new (viewportX, 0, 0, 0));
var screen = view.ViewportToScreen (new Point (viewportX, 0));
// Assert
Assert.Equal (expectedX, screen.X);
@@ -878,7 +878,7 @@ public class ToScreenTests (ITestOutputHelper output)
superView.LayoutSubviews ();
// Act
var screen = view.ViewportToScreen (new (viewportX, 0, 0, 0));
var screen = view.ViewportToScreen (new Point (viewportX, 0));
// Assert
Assert.Equal (expectedX, screen.X);
@@ -935,7 +935,7 @@ public class ToScreenTests (ITestOutputHelper output)
superView.LayoutSubviews ();
// Act
var screen = view.ViewportToScreen (new (testX, 0, 0, 0));
var screen = view.ViewportToScreen (new Point (testX, 0));
// Assert
Assert.Equal (expectedX, screen.X);

68
UnitTests/View/NavigationTests.cs
View File

@@ -852,19 +852,19 @@ public class NavigationTests
// top
Assert.Equal (Point.Empty, top.ScreenToFrame (new (0, 0)));
Rectangle screen = top.Margin.ViewportToScreen (new (0, 0, 0, 0));
var screen = top.Margin.ViewportToScreen (new Point (0, 0));
Assert.Equal (0, screen.X);
Assert.Equal (0, screen.Y);
screen = top.Border.ViewportToScreen (new (0, 0, 0, 0));
screen = top.Border.ViewportToScreen (new Point (0, 0));
Assert.Equal (0, screen.X);
Assert.Equal (0, screen.Y);
screen = top.Padding.ViewportToScreen (new (0, 0, 0, 0));
screen = top.Padding.ViewportToScreen (new Point (0, 0));
Assert.Equal (1, screen.X);
Assert.Equal (1, screen.Y);
screen = top.ViewportToScreen (new (0, 0, 0, 0));
screen = top.ViewportToScreen (new Point (0, 0));
Assert.Equal (1, screen.X);
Assert.Equal (1, screen.Y);
screen = top.ViewportToScreen (new (-1, -1, 0, 0));
screen = top.ViewportToScreen (new Point (-1, -1));
Assert.Equal (0, screen.X);
Assert.Equal (0, screen.Y);
var found = View.FindDeepestView (top, new (0, 0));
@@ -873,7 +873,7 @@ public class NavigationTests
Assert.Equal (0, found.Frame.X);
Assert.Equal (0, found.Frame.Y);
Assert.Equal (new Point (3, 2), top.ScreenToFrame (new (3, 2)));
screen = top.ViewportToScreen (new (3, 2, 0, 0));
screen = top.ViewportToScreen (new Point (3, 2));
Assert.Equal (4, screen.X);
Assert.Equal (3, screen.Y);
found = View.FindDeepestView (top, new (screen.X, screen.Y));
@@ -885,14 +885,14 @@ public class NavigationTests
//Assert.Equal (3, found.FrameToScreen ().X);
//Assert.Equal (2, found.FrameToScreen ().Y);
Assert.Equal (new Point (13, 2), top.ScreenToFrame (new (13, 2)));
screen = top.ViewportToScreen (new (12, 2, 0, 0));
screen = top.ViewportToScreen (new Point (12, 2));
Assert.Equal (13, screen.X);
Assert.Equal (3, screen.Y);
found = View.FindDeepestView (top, new (screen.X, screen.Y));
Assert.Equal (view, found);
//Assert.Equal (9, found.FrameToScreen ().X);
//Assert.Equal (0, found.FrameToScreen ().Y);
screen = top.ViewportToScreen (new (13, 2, 0, 0));
screen = top.ViewportToScreen (new Point (13, 2));
Assert.Equal (14, screen.X);
Assert.Equal (3, screen.Y);
found = View.FindDeepestView (top, new (13, 2));
@@ -900,7 +900,7 @@ public class NavigationTests
//Assert.Equal (13, found.FrameToScreen ().X);
//Assert.Equal (2, found.FrameToScreen ().Y);
Assert.Equal (new Point (14, 3), top.ScreenToFrame (new (14, 3)));
screen = top.ViewportToScreen (new (14, 3, 0, 0));
screen = top.ViewportToScreen (new Point (14, 3));
Assert.Equal (15, screen.X);
Assert.Equal (4, screen.Y);
found = View.FindDeepestView (top, new (14, 3));
@@ -910,40 +910,40 @@ public class NavigationTests
// view
Assert.Equal (new Point (-4, -3), view.ScreenToFrame (new (0, 0)));
screen = view.Margin.ViewportToScreen (new (-3, -2, 0, 0));
screen = view.Margin.ViewportToScreen (new Point (-3, -2));
Assert.Equal (1, screen.X);
Assert.Equal (1, screen.Y);
screen = view.Border.ViewportToScreen (new (-3, -2, 0, 0));
screen = view.Border.ViewportToScreen (new Point (-3, -2));
Assert.Equal (1, screen.X);
Assert.Equal (1, screen.Y);
screen = view.Padding.ViewportToScreen (new (-3, -2, 0, 0));
screen = view.Padding.ViewportToScreen (new Point (-3, -2));
Assert.Equal (1, screen.X);
Assert.Equal (1, screen.Y);
screen = view.ViewportToScreen (new (-3, -2, 0, 0));
screen = view.ViewportToScreen (new Point (-3, -2));
Assert.Equal (1, screen.X);
Assert.Equal (1, screen.Y);
screen = view.ViewportToScreen (new (-4, -3, 0, 0));
screen = view.ViewportToScreen (new Point (-4, -3));
Assert.Equal (0, screen.X);
Assert.Equal (0, screen.Y);
found = View.FindDeepestView (top, new (0, 0));
Assert.Equal (top.Border, found);
Assert.Equal (new Point (-1, -1), view.ScreenToFrame (new (3, 2)));
screen = view.ViewportToScreen (new (0, 0, 0, 0));
screen = view.ViewportToScreen (new Point (0, 0));
Assert.Equal (4, screen.X);
Assert.Equal (3, screen.Y);
found = View.FindDeepestView (top, new (4, 3));
Assert.Equal (view, found);
Assert.Equal (new Point (9, -1), view.ScreenToFrame (new (13, 2)));
screen = view.ViewportToScreen (new (10, 0, 0, 0));
screen = view.ViewportToScreen (new Point (10, 0));
Assert.Equal (14, screen.X);
Assert.Equal (3, screen.Y);
found = View.FindDeepestView (top, new (14, 3));
Assert.Equal (top, found);
Assert.Equal (new Point (10, 0), view.ScreenToFrame (new (14, 3)));
screen = view.ViewportToScreen (new (11, 1, 0, 0));
screen = view.ViewportToScreen (new Point (11, 1));
Assert.Equal (15, screen.X);
Assert.Equal (4, screen.Y);
found = View.FindDeepestView (top, new (15, 4));
@@ -1006,80 +1006,80 @@ public class NavigationTests
// top
Assert.Equal (new Point (-3, -2), top.ScreenToFrame (new (0, 0)));
Rectangle screen = top.Margin.ViewportToScreen (new (-3, -2, 0, 0));
var screen = top.Margin.ViewportToScreen (new Point (-3, -2));
Assert.Equal (0, screen.X);
Assert.Equal (0, screen.Y);
screen = top.Border.ViewportToScreen (new (-3, -2, 0, 0));
screen = top.Border.ViewportToScreen (new Point (-3, -2));
Assert.Equal (0, screen.X);
Assert.Equal (0, screen.Y);
screen = top.Padding.ViewportToScreen (new (-3, -2, 0, 0));
screen = top.Padding.ViewportToScreen (new Point (-3, -2));
Assert.Equal (1, screen.X);
Assert.Equal (1, screen.Y);
screen = top.ViewportToScreen (new (-3, -2, 0, 0));
screen = top.ViewportToScreen (new Point (-3, -2));
Assert.Equal (1, screen.X);
Assert.Equal (1, screen.Y);
screen = top.ViewportToScreen (new (-4, -3, 0, 0));
screen = top.ViewportToScreen (new Point (-4, -3));
Assert.Equal (0, screen.X);
Assert.Equal (0, screen.Y);
var found = View.FindDeepestView (top, new (-4, -3));
Assert.Null (found);
Assert.Equal (Point.Empty, top.ScreenToFrame (new (3, 2)));
screen = top.ViewportToScreen (new (0, 0, 0, 0));
screen = top.ViewportToScreen (new Point (0, 0));
Assert.Equal (4, screen.X);
Assert.Equal (3, screen.Y);
Assert.Equal (top.Border, View.FindDeepestView (top, new (3, 2)));
//Assert.Equal (0, found.FrameToScreen ().X);
//Assert.Equal (0, found.FrameToScreen ().Y);
Assert.Equal (new Point (10, 0), top.ScreenToFrame (new (13, 2)));
screen = top.ViewportToScreen (new (10, 0, 0, 0));
screen = top.ViewportToScreen (new Point (10, 0));
Assert.Equal (14, screen.X);
Assert.Equal (3, screen.Y);
Assert.Equal (top.Border, View.FindDeepestView (top, new (13, 2)));
//Assert.Equal (10, found.FrameToScreen ().X);
//Assert.Equal (0, found.FrameToScreen ().Y);
Assert.Equal (new Point (11, 1), top.ScreenToFrame (new (14, 3)));
screen = top.ViewportToScreen (new (11, 1, 0, 0));
screen = top.ViewportToScreen (new Point (11, 1));
Assert.Equal (15, screen.X);
Assert.Equal (4, screen.Y);
Assert.Equal (top, View.FindDeepestView (top, new (14, 3)));
// view
Assert.Equal (new Point (-7, -5), view.ScreenToFrame (new (0, 0)));
screen = view.Margin.ViewportToScreen (new (-6, -4, 0, 0));
screen = view.Margin.ViewportToScreen (new Point (-6, -4));
Assert.Equal (1, screen.X);
Assert.Equal (1, screen.Y);
screen = view.Border.ViewportToScreen (new (-6, -4, 0, 0));
screen = view.Border.ViewportToScreen (new Point (-6, -4));
Assert.Equal (1, screen.X);
Assert.Equal (1, screen.Y);
screen = view.Padding.ViewportToScreen (new (-6, -4, 0, 0));
screen = view.Padding.ViewportToScreen (new Point (-6, -4));
Assert.Equal (1, screen.X);
Assert.Equal (1, screen.Y);
screen = view.ViewportToScreen (new (-6, -4, 0, 0));
screen = view.ViewportToScreen (new Point (-6, -4));
Assert.Equal (1, screen.X);
Assert.Equal (1, screen.Y);
Assert.Null (View.FindDeepestView (top, new (1, 1)));
Assert.Equal (new Point (-4, -3), view.ScreenToFrame (new (3, 2)));
screen = view.ViewportToScreen (new (-3, -2, 0, 0));
screen = view.ViewportToScreen (new Point (-3, -2));
Assert.Equal (4, screen.X);
Assert.Equal (3, screen.Y);
Assert.Equal (top, View.FindDeepestView (top, new (4, 3)));
Assert.Equal (new Point (-1, -1), view.ScreenToFrame (new (6, 4)));
screen = view.ViewportToScreen (new (0, 0, 0, 0));
screen = view.ViewportToScreen (new Point (0, 0));
Assert.Equal (7, screen.X);
Assert.Equal (5, screen.Y);
Assert.Equal (view, View.FindDeepestView (top, new (7, 5)));
Assert.Equal (new Point (6, -1), view.ScreenToFrame (new (13, 4)));
screen = view.ViewportToScreen (new (7, 0, 0, 0));
screen = view.ViewportToScreen (new Point (7, 0));
Assert.Equal (14, screen.X);
Assert.Equal (5, screen.Y);
Assert.Equal (view, View.FindDeepestView (top, new (14, 5)));
Assert.Equal (new Point (7, -2), view.ScreenToFrame (new (14, 3)));
screen = view.ViewportToScreen (new (8, -1, 0, 0));
screen = view.ViewportToScreen (new Point (8, -1));
Assert.Equal (15, screen.X);
Assert.Equal (4, screen.Y);
Assert.Equal (top, View.FindDeepestView (top, new (15, 4)));
Assert.Equal (new Point (16, -2), view.ScreenToFrame (new (23, 3)));
screen = view.ViewportToScreen (new (17, -1, 0, 0));
screen = view.ViewportToScreen (new Point (17, -1));
Assert.Equal (24, screen.X);
Assert.Equal (4, screen.Y);
Assert.Null (View.FindDeepestView (top, new (24, 4)));