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

Merge branch 'develop' into splitcontainer

Browse Source
This commit is contained in:
Tig
2023-02-21 01:10:24 +13:00
committed by GitHub
parent 0d022da293 c85ff954aa
commit 6f2ac6926c
12 changed files with 1019 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
UnitTests/Core/BorderTests.cs
View File

@@ -1,15 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Reflection.Emit;
using Xunit;
using Xunit.Abstractions;
using Rune = System.Rune;
namespace Terminal.Gui.CoreTests {
public class BorderTests {
[Fact]
[AutoInitShutdown]
readonly ITestOutputHelper output;
public BorderTests (ITestOutputHelper output)
{
this.output = output;
}
[Fact, AutoInitShutdown]
public void Constructor_Defaults ()
{
var b = new Border ();
@@ -45,8 +49,7 @@ namespace Terminal.Gui.CoreTests {
Assert.False (b.DrawMarginFrame);
}
[Fact]
[AutoInitShutdown]
[Fact, AutoInitShutdown]
public void ActualWidth_ActualHeight ()
{
var v = new View (new Rect (5, 10, 60, 20), "", new Border ());
@@ -81,8 +84,7 @@ namespace Terminal.Gui.CoreTests {
Assert.Equal (new Thickness (5, 5, 5, 5), b.GetSumThickness ());
}
[Fact]
[AutoInitShutdown]
[Fact, AutoInitShutdown]
public void DrawContent_With_Child_Border ()
{
var top = Application.Top;
@@ -303,8 +305,7 @@ namespace Terminal.Gui.CoreTests {
}
}
[Fact]
[AutoInitShutdown]
[Fact, AutoInitShutdown]
public void DrawContent_With_Parent_Border ()
{
var top = Application.Top;
@@ -540,8 +541,7 @@ namespace Terminal.Gui.CoreTests {
}
}
[Fact]
[AutoInitShutdown]
[Fact, AutoInitShutdown]
public void BorderOnControlWithNoChildren ()
{
var label = new TextField ("Loading...") {
@@ -557,5 +557,57 @@ namespace Terminal.Gui.CoreTests {
Assert.Null (Record.Exception (() => label.Redraw (label.Bounds)));
}
[Fact, AutoInitShutdown]
public void BorderStyle_And_DrawMarginFrame_Gets_Sets ()
{
var lblTop = new Label ("At 0,0");
var lblFrame = new Label ("Centered") { X = Pos.Center (), Y = Pos.Center () };
var frame = new FrameView () { Y = 1, Width = 20, Height = 3 };
var lblFill = new Label () { Width = Dim.Fill(),Height = Dim.Fill(), Visible = false };
var fillText = new System.Text.StringBuilder ();
for (int i = 0; i < frame.Bounds.Height; i++) {
if (i > 0) {
fillText.AppendLine ("");
}
for (int j = 0; j < frame.Bounds.Width; j++) {
fillText.Append ("█");
}
}
lblFill.Text = fillText.ToString ();
frame.Add (lblFill, lblFrame);
var lblBottom = new Label ("At 0,4") { Y = 4 };
Application.Top.Add (lblTop, frame, lblBottom);
Application.Begin (Application.Top);
Assert.Equal (BorderStyle.Single, frame.Border.BorderStyle);
Assert.True (frame.Border.DrawMarginFrame);
TestHelpers.AssertDriverContentsWithFrameAre (@"
At 0,0
┌──────────────────┐
│ Centered │
└──────────────────┘
At 0,4 ", output);
frame.Border.BorderStyle = BorderStyle.None;
Application.Refresh ();
Assert.True (frame.Border.DrawMarginFrame);
TestHelpers.AssertDriverContentsWithFrameAre (@"
At 0,0
Centered
At 0,4 ", output);
frame.Border.DrawMarginFrame = false;
lblFill.Visible = true;
Application.Refresh ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
At 0,0
████████████████████
██████Centered██████
████████████████████
At 0,4 ", output);
}
}
}

85
UnitTests/Core/LineCanvasTests.cs
View File

@@ -1,4 +1,7 @@
using Terminal.Gui.Graphs;
using System;
using System.Collections.Generic;
using System.Text;
using Terminal.Gui.Graphs;
using Xunit;
using Xunit.Abstractions;
@@ -57,7 +60,7 @@ namespace Terminal.Gui.CoreTests {
}
[InlineData (BorderStyle.Single)]
[InlineData(BorderStyle.Rounded)]
[InlineData (BorderStyle.Rounded)]
[Theory, AutoInitShutdown]
public void TestLineCanvas_Vertical (BorderStyle style)
{
@@ -93,7 +96,7 @@ namespace Terminal.Gui.CoreTests {
/// Not when they terminate adjacent to one another.
/// </summary>
[Fact, AutoInitShutdown]
public void TestLineCanvas_Corner_NoOverlap()
public void TestLineCanvas_Corner_NoOverlap ()
{
var v = GetCanvas (out var canvas);
canvas.AddLine (new Point (0, 0), 1, Orientation.Horizontal, BorderStyle.Single);
@@ -127,13 +130,14 @@ namespace Terminal.Gui.CoreTests {
│
│";
TestHelpers.AssertDriverContentsAre (looksLike, output);
}
[Fact,AutoInitShutdown]
[Fact, AutoInitShutdown]
public void TestLineCanvas_Window ()
{
var v = GetCanvas (out var canvas);
// outer box
canvas.AddLine (new Point (0, 0), 9, Orientation.Horizontal, BorderStyle.Single);
canvas.AddLine (new Point (9, 0), 4, Orientation.Vertical, BorderStyle.Single);
@@ -168,10 +172,10 @@ namespace Terminal.Gui.CoreTests {
// outer box
canvas.AddLine (new Point (0, 0), 9, Orientation.Horizontal, BorderStyle.Rounded);
// BorderStyle.Single is ignored because corner overlaps with the above line which is Rounded
// this results in a rounded corner being used.
canvas.AddLine (new Point (9, 0), 4, Orientation.Vertical, BorderStyle.Single);
canvas.AddLine (new Point (9, 0), 4, Orientation.Vertical, BorderStyle.Single);
canvas.AddLine (new Point (9, 4), -9, Orientation.Horizontal, BorderStyle.Rounded);
canvas.AddLine (new Point (0, 4), -4, Orientation.Vertical, BorderStyle.Single);
@@ -220,8 +224,8 @@ namespace Terminal.Gui.CoreTests {
[Theory, AutoInitShutdown]
[InlineData(BorderStyle.Single)]
[InlineData(BorderStyle.Rounded)]
[InlineData (BorderStyle.Single)]
[InlineData (BorderStyle.Rounded)]
public void TestLineCanvas_Window_DoubleTop_SingleSides (BorderStyle thinStyle)
{
var v = GetCanvas (out var canvas);
@@ -233,7 +237,7 @@ namespace Terminal.Gui.CoreTests {
canvas.AddLine (new Point (0, 4), -4, Orientation.Vertical, thinStyle);
canvas.AddLine (new Point (5, 0), 4, Orientation.Vertical,thinStyle);
canvas.AddLine (new Point (5, 0), 4, Orientation.Vertical, thinStyle);
canvas.AddLine (new Point (0, 2), 9, Orientation.Horizontal, BorderStyle.Double);
v.Redraw (v.Bounds);
@@ -250,8 +254,8 @@ namespace Terminal.Gui.CoreTests {
}
[Theory, AutoInitShutdown]
[InlineData(BorderStyle.Single)]
[InlineData(BorderStyle.Rounded)]
[InlineData (BorderStyle.Single)]
[InlineData (BorderStyle.Rounded)]
public void TestLineCanvas_Window_SingleTop_DoubleSides (BorderStyle thinStyle)
{
var v = GetCanvas (out var canvas);
@@ -259,8 +263,8 @@ namespace Terminal.Gui.CoreTests {
// outer box
canvas.AddLine (new Point (0, 0), 9, Orientation.Horizontal, thinStyle);
canvas.AddLine (new Point (9, 0), 4, Orientation.Vertical, BorderStyle.Double);
canvas.AddLine (new Point (9, 4), -9, Orientation.Horizontal,thinStyle);
canvas.AddLine (new Point (0, 4), -4, Orientation.Vertical, BorderStyle.Double);
canvas.AddLine (new Point (9, 4), -9, Orientation.Horizontal, thinStyle);
canvas.AddLine (new Point (0, 4), -4, Orientation.Vertical, BorderStyle.Double);
canvas.AddLine (new Point (5, 0), 4, Orientation.Vertical, BorderStyle.Double);
@@ -280,7 +284,44 @@ namespace Terminal.Gui.CoreTests {
TestHelpers.AssertDriverContentsAre (looksLike, output);
}
private View GetCanvas (out LineCanvas canvas)
[Fact, AutoInitShutdown]
public void TestLineCanvas_LeaveMargin_Top1_Left1 ()
{
// Draw at 1,1 within client area of View (i.e. leave a top and left margin of 1)
var v = GetCanvas (out var canvas, 1, 1);
// outer box
canvas.AddLine (new Point (0, 0), 8, Orientation.Horizontal, BorderStyle.Single);
canvas.AddLine (new Point (8, 0), 3, Orientation.Vertical, BorderStyle.Single);
canvas.AddLine (new Point (8, 3), -8, Orientation.Horizontal, BorderStyle.Single);
canvas.AddLine (new Point (0, 3), -3, Orientation.Vertical, BorderStyle.Single);
canvas.AddLine (new Point (5, 0), 3, Orientation.Vertical, BorderStyle.Single);
canvas.AddLine (new Point (0, 2), 8, Orientation.Horizontal, BorderStyle.Single);
v.Redraw (v.Bounds);
string looksLike =
@"
┌────┬──┐
│ │ │
├────┼──┤
└────┴──┘
";
TestHelpers.AssertDriverContentsAre (looksLike, output);
}
/// <summary>
/// Creates a new <see cref="View"/> into which a <see cref="LineCanvas"/> is rendered
/// at <see cref="View.DrawContentComplete"/> time.
/// </summary>
/// <param name="canvas">The <see cref="LineCanvas"/> you can draw into.</param>
/// <param name="offsetX">How far to offset drawing in X</param>
/// <param name="offsetY">How far to offset drawing in Y</param>
/// <returns></returns>
private View GetCanvas (out LineCanvas canvas, int offsetX = 0, int offsetY = 0)
{
var v = new View {
Width = 10,
@@ -288,8 +329,16 @@ namespace Terminal.Gui.CoreTests {
Bounds = new Rect (0, 0, 10, 5)
};
var canvasCopy = canvas = new LineCanvas ();
v.DrawContentComplete += (r)=> canvasCopy.Draw (v, v.Bounds);
var canvasCopy = canvas = new LineCanvas ();
v.DrawContentComplete += (r) => {
foreach(var p in canvasCopy.GenerateImage(v.Bounds))
{
v.AddRune(
offsetX + p.Key.X,
offsetY + p.Key.Y,
p.Value);
}
};
return v;
}

228
UnitTests/Views/ScrollViewTests.cs
View File

@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using NStack;
using Xunit;
using Xunit.Abstractions;
@@ -280,5 +276,227 @@ namespace Terminal.Gui.ViewTests {
◄░░░├─┤░►
", output);
}
[Fact, AutoInitShutdown]
public void Frame_And_Labels_Does_Not_Overspill_ScrollView ()
{
var sv = new ScrollView {
X = 3,
Y = 3,
Width = 10,
Height = 10,
ContentSize = new Size (50, 50)
};
for (int i = 0; i < 8; i++) {
sv.Add (new CustomButton ("█", $"Button {i}", 20, 3) { Y = i * 3 });
}
Application.Top.Add (sv);
Application.Begin (Application.Top);
TestHelpers.AssertDriverContentsWithFrameAre (@"
█████████▲
██████But┬
█████████┴
┌────────░
│ But░
└────────░
┌────────░
│ But░
└────────▼
◄├┤░░░░░► ", output);
sv.ContentOffset = new Point (5, 5);
Application.Refresh ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
─────────▲
─────────┬
Button 2│
─────────┴
─────────░
Button 3░
─────────░
─────────░
Button 4▼
◄├─┤░░░░► ", output);
}
private class CustomButton : FrameView {
private Label labelFill;
private Label labelText;
public CustomButton (string fill, ustring text, int width, int height)
{
Width = width;
Height = height;
labelFill = new Label () { AutoSize = false, Width = Dim.Fill (), Height = Dim.Fill (), Visible = false };
var fillText = new System.Text.StringBuilder ();
for (int i = 0; i < Bounds.Height; i++) {
if (i > 0) {
fillText.AppendLine ("");
}
for (int j = 0; j < Bounds.Width; j++) {
fillText.Append (fill);
}
}
labelFill.Text = fillText.ToString ();
labelText = new Label (text) { X = Pos.Center (), Y = Pos.Center () };
Add (labelFill, labelText);
CanFocus = true;
}
public override bool OnEnter (View view)
{
Border.BorderStyle = BorderStyle.None;
Border.DrawMarginFrame = false;
labelFill.Visible = true;
view = this;
return base.OnEnter (view);
}
public override bool OnLeave (View view)
{
Border.BorderStyle = BorderStyle.Single;
Border.DrawMarginFrame = true;
labelFill.Visible = false;
if (view == null)
view = this;
return base.OnLeave (view);
}
}
[Fact, AutoInitShutdown]
public void Clear_Window_Inside_ScrollView ()
{
var topLabel = new Label ("At 15,0") { X = 15 };
var sv = new ScrollView {
X = 3,
Y = 3,
Width = 10,
Height = 10,
ContentSize = new Size (23, 23),
KeepContentAlwaysInViewport = false
};
var bottomLabel = new Label ("At 15,15") { X = 15, Y = 15 };
Application.Top.Add (topLabel, sv, bottomLabel);
Application.Begin (Application.Top);
TestHelpers.AssertDriverContentsWithFrameAre (@"
At 15,0
▲
┬
┴
░
░
░
░
░
▼
◄├┤░░░░░►
At 15,15", output);
var attributes = new Attribute [] {
Colors.TopLevel.Normal,
Colors.TopLevel.Focus,
Colors.Base.Normal
};
TestHelpers.AssertDriverColorsAre (@"
00000000000000000000000
00000000000000000000000
00000000000000000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00011111111110000000000
00000000000000000000000
00000000000000000000000
00000000000000000000000", attributes);
sv.Add (new Window ("1") { X = 3, Y = 3, Width = 20, Height = 20 });
Application.Refresh ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
At 15,0
▲
┬
┴
┌ 1 ──░
│ ░
│ ░
│ ░
│ ░
│ ▼
◄├┤░░░░░►
At 15,15", output);
TestHelpers.AssertDriverColorsAre (@"
00000000000000000000000
00000000000000000000000
00000000000000000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000022222210000000000
00000022222210000000000
00000022222210000000000
00000022222210000000000
00000022222210000000000
00000022222210000000000
00011111111110000000000
00000000000000000000000
00000000000000000000000
00000000000000000000000", attributes);
sv.ContentOffset = new Point (20, 20);
Application.Refresh ();
TestHelpers.AssertDriverContentsWithFrameAre (@"
At 15,0
│ ▲
│ ░
──┘ ░
░
░
┬
│
┴
▼
◄░░░░├─┤►
At 15,15", output);
TestHelpers.AssertDriverColorsAre (@"
00000000000000000000000
00000000000000000000000
00000000000000000000000
00022200000010000000000
00022200000010000000000
00022200000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00000000000010000000000
00011111111110000000000
00000000000000000000000
00000000000000000000000
00000000000000000000000", attributes);
}
}
}