Fixed #3786 - Focus

This commit is contained in:
Tig
2024-10-09 18:06:41 -06:00
parent 675b8bba2b
commit 573d6ee0ff
11 changed files with 547 additions and 372 deletions

View File

@@ -1,13 +1,42 @@
using System.Text;
#nullable enable
using System.Text;
using JetBrains.Annotations;
namespace Terminal.Gui.ViewsTests;
public class HexViewTests
{
[Theory]
[InlineData (0, 4)]
[InlineData (9, 4)]
[InlineData (20, 4)]
[InlineData (24, 4)]
[InlineData (30, 4)]
[InlineData (50, 4)]
public void BytesPerLine_Calculates_Correctly (int width, int expectedBPL)
{
var hv = new HexView (LoadStream (null, out long _)) { Width = width, Height = 10 };
hv.LayoutSubviews ();
Assert.Equal (expectedBPL, hv.BytesPerLine);
}
[Theory]
[InlineData ("01234", 20, 4)]
[InlineData ("012345", 20, 4)]
public void xuz (string str, int width, int expectedBPL)
{
var hv = new HexView (LoadStream (str, out long _)) { Width = width, Height = 10 };
hv.LayoutSubviews ();
Assert.Equal (expectedBPL, hv.BytesPerLine);
}
[Fact]
public void AllowEdits_Edits_ApplyEdits ()
{
var hv = new HexView (LoadStream (true)) { Width = 20, Height = 20 };
var hv = new HexView (LoadStream (null, out _, true)) { Width = 20, Height = 20 };
// Needed because HexView relies on LayoutComplete to calc sizes
hv.LayoutSubviews ();
@@ -94,45 +123,50 @@ public class HexViewTests
}
[Fact]
[AutoInitShutdown]
public void CursorPosition_Encoding_Default ()
{
var hv = new HexView (LoadStream ()) { Width = Dim.Fill (), Height = Dim.Fill () };
var top = new Toplevel ();
top.Add (hv);
Application.Begin (top);
var hv = new HexView (LoadStream (null, out _)) { Width = 100, Height = 100 };
Application.Top = new Toplevel ();
Application.Top.Add (hv);
Assert.Equal (new (1, 1), hv.CursorPosition);
Application.Top.LayoutSubviews ();
Assert.Equal (new (0, 0), hv.CursorPosition);
Assert.Equal (20, hv.BytesPerLine);
Assert.True (hv.NewKeyDownEvent (Key.Tab));
Assert.Equal (new (0, 0), hv.CursorPosition);
Assert.True (hv.NewKeyDownEvent (Key.CursorRight.WithCtrl));
Assert.Equal (hv.CursorPosition.X, hv.BytesPerLine);
Assert.Equal (hv.CursorPosition.X, hv.BytesPerLine - 1);
Assert.True (hv.NewKeyDownEvent (Key.Home));
Assert.True (hv.NewKeyDownEvent (Key.CursorRight));
Assert.Equal (new (2, 1), hv.CursorPosition);
Assert.Equal (new (1, 0), hv.CursorPosition);
Assert.True (hv.NewKeyDownEvent (Key.CursorDown));
Assert.Equal (new (2, 2), hv.CursorPosition);
Assert.Equal (new (1, 1), hv.CursorPosition);
Assert.True (hv.NewKeyDownEvent (Key.End));
Assert.Equal (new (2, 2), hv.CursorPosition);
int col = hv.CursorPosition.X;
int line = hv.CursorPosition.Y;
int offset = (line - 1) * (hv.BytesPerLine - col);
Assert.Equal (hv.Position, col * line + offset);
top.Dispose ();
int offset = line * (hv.BytesPerLine - col);
Assert.Equal (hv.Address, col * line + offset);
Application.Top.Dispose ();
Application.ResetState (true);
}
[Fact]
[AutoInitShutdown]
public void CursorPosition_Encoding_Unicode ()
{
var hv = new HexView (LoadStream (true)) { Width = Dim.Fill (), Height = Dim.Fill () };
var top = new Toplevel ();
top.Add (hv);
Application.Begin (top);
var hv = new HexView (LoadStream (null, out _, true)) { Width = Dim.Fill (), Height = Dim.Fill () };
Application.Top = new Toplevel ();
Application.Top.Add (hv);
Assert.Equal (new (1, 1), hv.CursorPosition);
hv.LayoutSubviews ();
Assert.Equal (new (0, 0), hv.CursorPosition);
Assert.True (hv.NewKeyDownEvent (Key.Tab));
Assert.True (hv.NewKeyDownEvent (Key.CursorRight.WithCtrl));
@@ -149,14 +183,15 @@ public class HexViewTests
int col = hv.CursorPosition.X;
int line = hv.CursorPosition.Y;
int offset = (line - 1) * (hv.BytesPerLine - col);
Assert.Equal (hv.Position, col * line + offset);
top.Dispose ();
Assert.Equal (hv.Address, col * line + offset);
Application.Top.Dispose ();
Application.ResetState (true);
}
[Fact]
public void DiscardEdits_Method ()
{
var hv = new HexView (LoadStream (true)) { Width = 20, Height = 20 };
var hv = new HexView (LoadStream (null, out _, true)) { Width = 20, Height = 20 };
// Needed because HexView relies on LayoutComplete to calc sizes
hv.LayoutSubviews ();
@@ -175,7 +210,7 @@ public class HexViewTests
[Fact]
public void DisplayStart_Source ()
{
var hv = new HexView (LoadStream (true)) { Width = 20, Height = 20 };
var hv = new HexView (LoadStream (null, out _, true)) { Width = 20, Height = 20 };
// Needed because HexView relies on LayoutComplete to calc sizes
hv.LayoutSubviews ();
@@ -196,13 +231,13 @@ public class HexViewTests
[Fact]
public void Edited_Event ()
{
var hv = new HexView (LoadStream (true)) { Width = 20, Height = 20 };
var hv = new HexView (LoadStream (null, out _, true)) { Width = 20, Height = 20 };
// Needed because HexView relies on LayoutComplete to calc sizes
hv.LayoutSubviews ();
KeyValuePair<long, byte> keyValuePair = default;
hv.Edited += (s, e) => keyValuePair = new (e.Position, e.NewValue);
hv.Edited += (s, e) => keyValuePair = new (e.Address, e.NewValue);
Assert.True (hv.NewKeyDownEvent (Key.D4));
Assert.True (hv.NewKeyDownEvent (Key.D6));
@@ -220,143 +255,142 @@ public class HexViewTests
}
[Fact]
[AutoInitShutdown]
public void KeyBindings_Command ()
public void KeyBindings_Test_Movement_LeftSide ()
{
var hv = new HexView (LoadStream ()) { Width = 20, Height = 10 };
var top = new Toplevel ();
top.Add (hv);
Application.Begin (top);
var hv = new HexView (LoadStream (null, out _)) { Width = 20, Height = 10 };
Application.Top = new Toplevel ();
Application.Top.Add (hv);
Assert.Equal (63, hv.Source.Length);
Assert.Equal (1, hv.Position);
hv.LayoutSubviews ();
Assert.Equal (MEM_STRING_LENGTH, hv.Source.Length);
Assert.Equal (0, hv.Address);
Assert.Equal (4, hv.BytesPerLine);
// right side only needed to press one time
Assert.True (hv.NewKeyDownEvent (Key.Tab));
Assert.True (hv.NewKeyDownEvent (Key.CursorRight));
Assert.Equal (2, hv.Position);
Assert.Equal (1, hv.Address);
Assert.True (hv.NewKeyDownEvent (Key.CursorLeft));
Assert.Equal (1, hv.Position);
Assert.Equal (0, hv.Address);
Assert.True (hv.NewKeyDownEvent (Key.CursorDown));
Assert.Equal (5, hv.Position);
Assert.Equal (4, hv.Address);
Assert.True (hv.NewKeyDownEvent (Key.CursorUp));
Assert.Equal (1, hv.Position);
Assert.True (hv.NewKeyDownEvent (Key.V.WithCtrl));
Assert.Equal (41, hv.Position);
Assert.True (hv.NewKeyDownEvent (new (Key.V.WithAlt)));
Assert.Equal (1, hv.Position);
Assert.Equal (0, hv.Address);
Assert.True (hv.NewKeyDownEvent (Key.PageDown));
Assert.Equal (41, hv.Position);
Assert.Equal (40, hv.Address);
Assert.True (hv.NewKeyDownEvent (Key.PageUp));
Assert.Equal (1, hv.Position);
Assert.Equal (0, hv.Address);
Assert.True (hv.NewKeyDownEvent (Key.End));
Assert.Equal (64, hv.Position);
Assert.Equal (MEM_STRING_LENGTH, hv.Address);
Assert.True (hv.NewKeyDownEvent (Key.Home));
Assert.Equal (1, hv.Position);
Assert.Equal (0, hv.Address);
Assert.True (hv.NewKeyDownEvent (Key.CursorRight.WithCtrl));
Assert.Equal (4, hv.Position);
Assert.Equal (3, hv.Address);
Assert.True (hv.NewKeyDownEvent (Key.CursorLeft.WithCtrl));
Assert.Equal (1, hv.Position);
Assert.Equal (0, hv.Address);
Assert.True (hv.NewKeyDownEvent (Key.CursorDown.WithCtrl));
Assert.Equal (37, hv.Position);
Assert.Equal (36, hv.Address);
Assert.True (hv.NewKeyDownEvent (Key.CursorUp.WithCtrl));
Assert.Equal (1, hv.Position);
top.Dispose ();
Assert.Equal (0, hv.Address);
Application.Top.Dispose ();
Application.ResetState (true);
}
[Fact]
public void Position_Using_Encoding_Default ()
{
var hv = new HexView (LoadStream ()) { Width = 20, Height = 20 };
var hv = new HexView (LoadStream (null, out _)) { Width = 20, Height = 20 };
hv.LayoutSubviews ();
// Needed because HexView relies on LayoutComplete to calc sizes
hv.LayoutSubviews ();
Assert.Equal (63, hv.Source.Length);
Assert.Equal (63, hv.Source.Position);
Assert.Equal (1, hv.Position);
Assert.Equal (MEM_STRING_LENGTH, hv.Source.Length);
Assert.Equal (MEM_STRING_LENGTH, hv.Source.Position);
Assert.Equal (0, hv.Address);
// left side needed to press twice
Assert.True (hv.NewKeyDownEvent (Key.CursorRight));
Assert.Equal (63, hv.Source.Position);
Assert.Equal (1, hv.Position);
Assert.Equal (MEM_STRING_LENGTH, hv.Source.Position);
Assert.Equal (1, hv.Address);
Assert.True (hv.NewKeyDownEvent (Key.CursorRight));
Assert.Equal (63, hv.Source.Position);
Assert.Equal (2, hv.Position);
Assert.Equal (MEM_STRING_LENGTH, hv.Source.Position);
Assert.Equal (2, hv.Address);
// right side only needed to press one time
Assert.True (hv.NewKeyDownEvent (Key.Tab));
Assert.Equal (63, hv.Source.Position);
Assert.Equal (2, hv.Position);
Assert.Equal (MEM_STRING_LENGTH, hv.Source.Position);
Assert.Equal (2, hv.Address);
Assert.True (hv.NewKeyDownEvent (Key.CursorLeft));
Assert.Equal (63, hv.Source.Position);
Assert.Equal (1, hv.Position);
Assert.Equal (MEM_STRING_LENGTH, hv.Source.Position);
Assert.Equal (1, hv.Address);
// last position is equal to the source length
Assert.True (hv.NewKeyDownEvent (Key.End));
Assert.Equal (63, hv.Source.Position);
Assert.Equal (64, hv.Position);
Assert.Equal (hv.Position - 1, hv.Source.Length);
Assert.Equal (MEM_STRING_LENGTH, hv.Source.Position);
Assert.Equal (64, hv.Address);
Assert.Equal (hv.Address - 1, hv.Source.Length);
}
[Fact]
public void Position_Using_Encoding_Unicode ()
{
var hv = new HexView (LoadStream (true)) { Width = 20, Height = 20 };
var hv = new HexView (LoadStream (null, out _, true)) { Width = 20, Height = 20 };
// Needed because HexView relies on LayoutComplete to calc sizes
hv.LayoutSubviews ();
Assert.Equal (126, hv.Source.Length);
Assert.Equal (126, hv.Source.Position);
Assert.Equal (1, hv.Position);
Assert.Equal (1, hv.Address);
// left side needed to press twice
Assert.True (hv.NewKeyDownEvent (Key.CursorRight));
Assert.Equal (126, hv.Source.Position);
Assert.Equal (1, hv.Position);
Assert.Equal (1, hv.Address);
Assert.True (hv.NewKeyDownEvent (Key.CursorRight));
Assert.Equal (126, hv.Source.Position);
Assert.Equal (2, hv.Position);
Assert.Equal (2, hv.Address);
// right side only needed to press one time
Assert.True (hv.NewKeyDownEvent (Key.Tab));
Assert.Equal (126, hv.Source.Position);
Assert.Equal (2, hv.Position);
Assert.Equal (2, hv.Address);
Assert.True (hv.NewKeyDownEvent (Key.CursorLeft));
Assert.Equal (126, hv.Source.Position);
Assert.Equal (1, hv.Position);
Assert.Equal (1, hv.Address);
// last position is equal to the source length
Assert.True (hv.NewKeyDownEvent (Key.End));
Assert.Equal (126, hv.Source.Position);
Assert.Equal (127, hv.Position);
Assert.Equal (hv.Position - 1, hv.Source.Length);
Assert.Equal (127, hv.Address);
Assert.Equal (hv.Address - 1, hv.Source.Length);
}
[Fact]
[AutoInitShutdown]
public void PositionChanged_Event ()
{
var hv = new HexView (LoadStream ()) { Width = Dim.Fill (), Height = Dim.Fill () };
var hv = new HexView (LoadStream (null, out _)) { Width = 20, Height = 10 };
Application.Top = new Toplevel ();
Application.Top.Add (hv);
Application.Top.LayoutSubviews ();
HexViewEventArgs hexViewEventArgs = null;
hv.PositionChanged += (s, e) => hexViewEventArgs = e;
var top = new Toplevel ();
top.Add (hv);
Application.Begin (top);
Assert.Equal (12, hv.BytesPerLine);
Assert.True (hv.NewKeyDownEvent (Key.CursorRight)); // left side must press twice
Assert.True (hv.NewKeyDownEvent (Key.CursorRight));
@@ -364,87 +398,93 @@ public class HexViewTests
Assert.Equal (12, hexViewEventArgs.BytesPerLine);
Assert.Equal (new (2, 2), hexViewEventArgs.CursorPosition);
Assert.Equal (14, hexViewEventArgs.Position);
top.Dispose ();
Assert.Equal (14, hexViewEventArgs.Address);
Application.Top.Dispose ();
Application.ResetState (true);
}
[Fact]
[AutoInitShutdown]
public void Source_Sets_DisplayStart_And_Position_To_Zero_If_Greater_Than_Source_Length ()
{
var hv = new HexView (LoadStream ()) { Width = 10, Height = 5 };
var top = new Toplevel ();
top.Add (hv);
Application.Begin (top);
var hv = new HexView (LoadStream (null, out _)) { Width = 10, Height = 5 };
Application.Top = new Toplevel ();
Application.Top.Add (hv);
hv.LayoutSubviews ();
Assert.True (hv.NewKeyDownEvent (Key.End));
Assert.Equal (62, hv.DisplayStart);
Assert.Equal (64, hv.Position);
Assert.Equal (64, hv.Address);
hv.Source = new MemoryStream ();
Assert.Equal (0, hv.DisplayStart);
Assert.Equal (0, hv.Position - 1);
Assert.Equal (0, hv.Address - 1);
hv.Source = LoadStream ();
hv.Source = LoadStream (null, out _);
hv.Width = Dim.Fill ();
hv.Height = Dim.Fill ();
top.LayoutSubviews ();
Application.Top.LayoutSubviews ();
Assert.Equal (0, hv.DisplayStart);
Assert.Equal (0, hv.Position - 1);
Assert.Equal (0, hv.Address - 1);
Assert.True (hv.NewKeyDownEvent (Key.End));
Assert.Equal (0, hv.DisplayStart);
Assert.Equal (64, hv.Position);
Assert.Equal (64, hv.Address);
hv.Source = new MemoryStream ();
Assert.Equal (0, hv.DisplayStart);
Assert.Equal (0, hv.Position - 1);
top.Dispose ();
Assert.Equal (0, hv.Address - 1);
Application.Top.Dispose ();
Application.ResetState (true);
}
private Stream LoadStream (bool unicode = false)
private const string MEM_STRING = "Hello world.\nThis is a test of the Emergency Broadcast System.\n";
private const int MEM_STRING_LENGTH = 63;
private Stream LoadStream (string? memString, out long numBytesInMemString, bool unicode = false)
{
var stream = new MemoryStream ();
byte [] bArray;
var memString = "Hello world.\nThis is a test of the Emergency Broadcast System.\n";
Assert.Equal (63, memString.Length);
Assert.Equal (MEM_STRING_LENGTH, MEM_STRING.Length);
if (memString is null)
{
memString = MEM_STRING;
}
if (unicode)
{
bArray = Encoding.Unicode.GetBytes (memString);
Assert.Equal (126, bArray.Length);
}
else
{
bArray = Encoding.Default.GetBytes (memString);
Assert.Equal (63, bArray.Length);
}
numBytesInMemString = bArray.Length;
stream.Write (bArray);
return stream;
}
private class NonSeekableStream : Stream
private class NonSeekableStream (Stream baseStream) : Stream
{
private readonly Stream m_stream;
public NonSeekableStream (Stream baseStream) { m_stream = baseStream; }
public override bool CanRead => m_stream.CanRead;
public override bool CanRead => baseStream.CanRead;
public override bool CanSeek => false;
public override bool CanWrite => m_stream.CanWrite;
public override bool CanWrite => baseStream.CanWrite;
public override long Length => throw new NotSupportedException ();
public override long Position
{
get => m_stream.Position;
get => baseStream.Position;
set => throw new NotSupportedException ();
}
public override void Flush () { m_stream.Flush (); }
public override int Read (byte [] buffer, int offset, int count) { return m_stream.Read (buffer, offset, count); }
public override void Flush () { baseStream.Flush (); }
public override int Read (byte [] buffer, int offset, int count) { return baseStream.Read (buffer, offset, count); }
public override long Seek (long offset, SeekOrigin origin) { throw new NotImplementedException (); }
public override void SetLength (long value) { throw new NotSupportedException (); }
public override void Write (byte [] buffer, int offset, int count) { m_stream.Write (buffer, offset, count); }
public override void Write (byte [] buffer, int offset, int count) { baseStream.Write (buffer, offset, count); }
}
}