Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-28 08:47:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Debugging Dialog test failure

Browse Source
This commit is contained in:
Tig Kindel
2024-01-07 20:16:30 -07:00
parent 0be24ff440
commit da0281c7ae
3 changed files with 63 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
UnitTests/Dialogs/DialogTests.cs
View File

@@ -943,6 +943,12 @@ namespace Terminal.Gui.DialogTests {
btn = new Button ("Ok") {
X = Pos.AnchorEnd () - Pos.Function (Btn_Width)
};
btn.SetRelativeLayout (dlg.Bounds);
Assert.Equal (6, btn.Bounds.Width);
Assert.Equal (10, btn.Frame.X); // 14 - 6 = 10
Assert.Equal (0, btn.Frame.Y);
Assert.Equal (6, btn.Frame.Width);
Assert.Equal (1, btn.Frame.Height);
int Btn_Width ()
{
return (btn?.Bounds.Width) ?? 0;
@@ -950,6 +956,11 @@ namespace Terminal.Gui.DialogTests {
var tf = new TextField ("01234567890123456789") {
Width = Dim.Fill (1) - Dim.Function (Btn_Width)
};
Assert.Equal (11, tf.Bounds.Width); // 20 - 2 (for Dim.Fill (1)) - 6 (for Dim.Function (Btn_Width)) = 8
Assert.Equal (0, tf.Frame.X);
Assert.Equal (0, tf.Frame.Y);
Assert.Equal (11, tf.Frame.Width);
Assert.Equal (1, tf.Frame.Height);
dlg.Loaded += (s, a) => {
Application.Refresh ();

37
UnitTests/View/Layout/PosTests.cs
View File

@@ -70,9 +70,9 @@ public class PosTests {
top.Add (win);
var rs = Application.Begin (top);
Assert.Equal (new Rect (0, 0, 80, 25), top.Frame);
Assert.Equal (new Rect (0, 0, 80, 25), win.Frame);
Assert.Equal (new Rect (68, 22, 10, 1), tv.Frame);
Assert.Equal (new Rect (0, 0, 80, 25), top.Frame);
Assert.Equal (new Rect (0, 0, 80, 25), win.Frame);
Assert.Equal (new Rect (68, 22, 10, 1), tv.Frame);
Application.End (rs);
}
@@ -101,11 +101,11 @@ public class PosTests {
top.Add (win, menu, status);
var rs = Application.Begin (top);
Assert.Equal (new Rect (0, 0, 80, 25), top.Frame);
Assert.Equal (new Rect (0, 0, 80, 1), menu.Frame);
Assert.Equal (new Rect (0, 24, 80, 1), status.Frame);
Assert.Equal (new Rect (0, 1, 80, 23), win.Frame);
Assert.Equal (new Rect (68, 20, 10, 1), tv.Frame);
Assert.Equal (new Rect (0, 0, 80, 25), top.Frame);
Assert.Equal (new Rect (0, 0, 80, 1), menu.Frame);
Assert.Equal (new Rect (0, 24, 80, 1), status.Frame);
Assert.Equal (new Rect (0, 1, 80, 23), win.Frame);
Assert.Equal (new Rect (68, 20, 10, 1), tv.Frame);
Application.End (rs);
}
@@ -556,7 +556,7 @@ public class PosTests {
field.Text = $"Label {count}";
var label = new Label (field.Text) { X = 0, Y = field.Y, Width = 20 };
view.Add (label);
Assert.Equal ($"Label {count}", label.Text);
Assert.Equal ($"Label {count}", label.Text);
Assert.Equal ($"Absolute({count})", label.Y.ToString ());
Assert.Equal ($"Absolute({count})", field.Y.ToString ());
@@ -607,7 +607,7 @@ public class PosTests {
field.Text = $"Label {i}";
var label = new Label (field.Text) { X = 0, Y = field.Y, Width = 20 };
view.Add (label);
Assert.Equal ($"Label {i}", label.Text);
Assert.Equal ($"Label {i}", label.Text);
Assert.Equal ($"Absolute({i})", field.Y.ToString ());
listLabels.Add (label);
@@ -669,14 +669,14 @@ public class PosTests {
Assert.Equal (10, posAbsolute.Anchor (0));
var posCombine = new Pos.PosCombine (true, posFactor, posAbsolute);
Assert.Equal (posCombine._left, posFactor);
Assert.Equal (posCombine._left, posFactor);
Assert.Equal (posCombine._right, posAbsolute);
Assert.Equal (20, posCombine.Anchor (100));
Assert.Equal (20, posCombine.Anchor (100));
posCombine = new Pos.PosCombine (true, posAbsolute, posFactor);
Assert.Equal (posCombine._left, posAbsolute);
Assert.Equal (posCombine._left, posAbsolute);
Assert.Equal (posCombine._right, posFactor);
Assert.Equal (20, posCombine.Anchor (100));
Assert.Equal (20, posCombine.Anchor (100));
var view = new View (new Rect (20, 10, 20, 1));
var posViewX = new Pos.PosView (view, 0);
@@ -749,9 +749,9 @@ public class PosTests {
if (testHorizontal) {
Assert.Equal (61, label.Frame.X);
Assert.Equal (1, label.Frame.Y);
Assert.Equal (1, label.Frame.Y);
} else {
Assert.Equal (1, label.Frame.X);
Assert.Equal (1, label.Frame.X);
Assert.Equal (61, label.Frame.Y);
}
}
@@ -782,8 +782,8 @@ public class PosTests {
var exception = Record.Exception (super.LayoutSubviews);
Assert.Null (exception);
Assert.Equal (new Rect (0, 0, 10, 10), super.Frame);
Assert.Equal (new Rect (0, 0, 2, 2), view1.Frame);
Assert.Equal (new Rect (8, 0, 2, 2), view2.Frame);
Assert.Equal (new Rect (0, 0, 2, 2), view1.Frame);
Assert.Equal (new Rect (8, 0, 2, 2), view2.Frame);
super.Dispose ();
}
@@ -823,4 +823,5 @@ public class PosTests {
"View(side=bottom,target=View(V)(0,0,0,0))",
pos.ToString ());
}
}

33
UnitTests/View/Layout/SetRelativeLayoutTests.cs
View File

@@ -366,4 +366,37 @@ public class SetRelativeLayoutTests {
superView.Dispose ();
}
[Fact]
public void PosDimFunction ()
{
var screen = new Rect (0, 0, 30, 1);
var view = new View ("abc");
view.X = Pos.AnchorEnd () - Pos.Function (GetViewWidth);
int GetViewWidth ()
{
return view.Frame.Width;
}
// view will be 3 chars wide. It's X will be 27 (30 - 3).
view.SetRelativeLayout (screen);
Assert.Equal (27, view.Frame.X);
Assert.Equal (0, view.Frame.Y);
Assert.Equal (3, view.Frame.Width);
Assert.Equal (1, view.Frame.Height);
var tf = new TextField ("01234567890123456789");
tf.Width = Dim.Fill (1) - Dim.Function (GetViewWidth);
// tf will fill the screen minus 1 minus the width of view (3).
// so it's width will be 26 (30 - 1 - 3).
tf.SetRelativeLayout (screen);
Assert.Equal (0, tf.Frame.X);
Assert.Equal (0, tf.Frame.Y);
Assert.Equal (26, tf.Frame.Width);
Assert.Equal (1, tf.Frame.Height);
}
}