mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2025-12-27 00:07:58 +01:00
* Fixes #2616. Support combining sequences that don't normalize * Decouples Application from ConsoleDriver in TestHelpers * Updates driver tests to match new arch * Start on making all driver tests test all drivers * Improves handling if combining marks. * Fix unit tests fails. * Fix unit tests fails. * Handling combining mask. * Tying to fix this unit test that sometimes fail. * Add support for combining mask on NetDriver. * Enable CombiningMarks as List<Rune>. * Prevents combining marks on invalid runes default and space. * Formatting for CI tests. * Fix non-normalized combining mark to add 1 to Col. * Reformatting for retest the CI. * Forces non-normalized CMs to be ignored. --------- Co-authored-by: Tig <tig@users.noreply.github.com>
192 lines
5.1 KiB
C#
192 lines
5.1 KiB
C#
using System;
|
|
using System.Buffers;
|
|
using System.Text;
|
|
using Xunit;
|
|
using Xunit.Abstractions;
|
|
|
|
// Alias Console to MockConsole so we don't accidentally use Console
|
|
|
|
namespace Terminal.Gui.DriverTests;
|
|
public class AddRuneTests {
|
|
readonly ITestOutputHelper _output;
|
|
|
|
public AddRuneTests (ITestOutputHelper output)
|
|
{
|
|
ConsoleDriver.RunningUnitTests = true;
|
|
this._output = output;
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData (typeof (FakeDriver))]
|
|
[InlineData (typeof (NetDriver))]
|
|
[InlineData (typeof (CursesDriver))]
|
|
[InlineData (typeof (WindowsDriver))]
|
|
public void AddRune (Type driverType)
|
|
{
|
|
var driver = (ConsoleDriver)Activator.CreateInstance (driverType);
|
|
driver.Init ();
|
|
|
|
driver.Rows = 25;
|
|
driver.Cols = 80;
|
|
driver.Init ();
|
|
driver.AddRune (new Rune ('a'));
|
|
Assert.Equal ((Rune)'a', driver.Contents [0, 0].Rune);
|
|
|
|
driver.End ();
|
|
}
|
|
|
|
[Fact]
|
|
public void AddRune_InvalidLocation_DoesNothing ()
|
|
{
|
|
var driver = new FakeDriver ();
|
|
driver.Init ();
|
|
|
|
driver.Move (driver.Cols, driver.Rows);
|
|
driver.AddRune ('a');
|
|
|
|
for (var col = 0; col < driver.Cols; col++) {
|
|
for (var row = 0; row < driver.Rows; row++) {
|
|
Assert.Equal ((Rune)' ', driver.Contents [row, col].Rune);
|
|
}
|
|
}
|
|
|
|
driver.End ();
|
|
}
|
|
|
|
[Fact]
|
|
public void AddRune_MovesToNextColumn ()
|
|
{
|
|
var driver = new FakeDriver ();
|
|
driver.Init ();
|
|
|
|
driver.AddRune ('a');
|
|
Assert.Equal ((Rune)'a', driver.Contents [0, 0].Rune);
|
|
Assert.Equal (0, driver.Row);
|
|
Assert.Equal (1, driver.Col);
|
|
|
|
driver.AddRune ('b');
|
|
Assert.Equal ((Rune)'b', driver.Contents [0, 1].Rune);
|
|
Assert.Equal (0, driver.Row);
|
|
Assert.Equal (2, driver.Col);
|
|
|
|
// Move to the last column of the first row
|
|
var lastCol = driver.Cols - 1;
|
|
driver.Move (lastCol, 0);
|
|
Assert.Equal (0, driver.Row);
|
|
Assert.Equal (lastCol, driver.Col);
|
|
|
|
// Add a rune to the last column of the first row; should increment the row or col even though it's now invalid
|
|
driver.AddRune ('c');
|
|
Assert.Equal ((Rune)'c', driver.Contents [0, lastCol].Rune);
|
|
Assert.Equal (lastCol + 1, driver.Col);
|
|
|
|
// Add a rune; should succeed but do nothing as it's outside of Contents
|
|
driver.AddRune ('d');
|
|
Assert.Equal (lastCol + 2, driver.Col);
|
|
for (var col = 0; col < driver.Cols; col++) {
|
|
for (var row = 0; row < driver.Rows; row++) {
|
|
Assert.NotEqual ((Rune)'d', driver.Contents [row, col].Rune);
|
|
}
|
|
}
|
|
|
|
driver.End ();
|
|
}
|
|
|
|
[Fact]
|
|
public void AddRune_MovesToNextColumn_Wide ()
|
|
{
|
|
var driver = new FakeDriver ();
|
|
driver.Init ();
|
|
|
|
// 🍕 Slice of Pizza "\U0001F355"
|
|
var operationStatus = Rune.DecodeFromUtf16 ("\U0001F355", out Rune rune, out int charsConsumed);
|
|
Assert.Equal (OperationStatus.Done, operationStatus);
|
|
Assert.Equal (charsConsumed, rune.Utf16SequenceLength);
|
|
Assert.Equal (2, rune.GetColumns ());
|
|
|
|
driver.AddRune (rune);
|
|
Assert.Equal (rune, driver.Contents [0, 0].Rune);
|
|
Assert.Equal (0, driver.Row);
|
|
Assert.Equal (2, driver.Col);
|
|
|
|
//driver.AddRune ('b');
|
|
//Assert.Equal ((Rune)'b', driver.Contents [0, 1].Rune);
|
|
//Assert.Equal (0, driver.Row);
|
|
//Assert.Equal (2, driver.Col);
|
|
|
|
//// Move to the last column of the first row
|
|
//var lastCol = driver.Cols - 1;
|
|
//driver.Move (lastCol, 0);
|
|
//Assert.Equal (0, driver.Row);
|
|
//Assert.Equal (lastCol, driver.Col);
|
|
|
|
//// Add a rune to the last column of the first row; should increment the row or col even though it's now invalid
|
|
//driver.AddRune ('c');
|
|
//Assert.Equal ((Rune)'c', driver.Contents [0, lastCol].Rune);
|
|
//Assert.Equal (lastCol + 1, driver.Col);
|
|
|
|
//// Add a rune; should succeed but do nothing as it's outside of Contents
|
|
//driver.AddRune ('d');
|
|
//Assert.Equal (lastCol + 2, driver.Col);
|
|
//for (var col = 0; col < driver.Cols; col++) {
|
|
// for (var row = 0; row < driver.Rows; row++) {
|
|
// Assert.NotEqual ((Rune)'d', driver.Contents [row, col].Rune);
|
|
// }
|
|
//}
|
|
|
|
driver.End ();
|
|
}
|
|
|
|
[Fact]
|
|
public void AddRune_Accented_Letter_With_Three_Combining_Unicode_Chars ()
|
|
{
|
|
var driver = new FakeDriver ();
|
|
driver.Init ();
|
|
|
|
var expected = new Rune ('ắ');
|
|
|
|
var text = "\u1eaf";
|
|
driver.AddStr (text);
|
|
Assert.Equal (expected, driver.Contents [0, 0].Rune);
|
|
Assert.Equal ((Rune)' ', driver.Contents [0, 1].Rune);
|
|
|
|
driver.ClearContents ();
|
|
driver.Move (0, 0);
|
|
|
|
text = "\u0103\u0301";
|
|
driver.AddStr (text);
|
|
Assert.Equal (expected, driver.Contents [0, 0].Rune);
|
|
Assert.Equal ((Rune)' ', driver.Contents [0, 1].Rune);
|
|
|
|
driver.ClearContents ();
|
|
driver.Move (0, 0);
|
|
|
|
text = "\u0061\u0306\u0301";
|
|
driver.AddStr (text);
|
|
Assert.Equal (expected, driver.Contents [0, 0].Rune);
|
|
Assert.Equal ((Rune)' ', driver.Contents [0, 1].Rune);
|
|
|
|
// var s = "a\u0301\u0300\u0306";
|
|
|
|
|
|
// TestHelpers.AssertDriverContentsWithFrameAre (@"
|
|
//ắ", output);
|
|
|
|
// tf.Text = "\u1eaf";
|
|
// Application.Refresh ();
|
|
// TestHelpers.AssertDriverContentsWithFrameAre (@"
|
|
//ắ", output);
|
|
|
|
// tf.Text = "\u0103\u0301";
|
|
// Application.Refresh ();
|
|
// TestHelpers.AssertDriverContentsWithFrameAre (@"
|
|
//ắ", output);
|
|
|
|
// tf.Text = "\u0061\u0306\u0301";
|
|
// Application.Refresh ();
|
|
// TestHelpers.AssertDriverContentsWithFrameAre (@"
|
|
//ắ", output);
|
|
driver.End ();
|
|
}
|
|
}
|