Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-26 15:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed AllviewsTester issue - not aware of Pos.Align

Browse Source
This commit is contained in:
Tig
2024-06-08 09:56:16 -06:00
parent 6af033acba
commit 236374b8c0
2 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
UICatalog/Scenarios/AllViewsTester.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using Terminal.Gui;
@@ -516,15 +517,25 @@ public class AllViewsTester : Scenario
var x = view.X.ToString ();
var y = view.Y.ToString ();
_xRadioGroup.SelectedItem = _posNames.IndexOf (_posNames.Where (s => x.Contains (s)).First ());
_yRadioGroup.SelectedItem = _posNames.IndexOf (_posNames.Where (s => y.Contains (s)).First ());
try
{
_xRadioGroup.SelectedItem = _posNames.IndexOf (_posNames.First (s => x.Contains (s)));
_yRadioGroup.SelectedItem = _posNames.IndexOf (_posNames.First (s => y.Contains (s)));
}
catch (InvalidOperationException e)
{
// This is a hack to work around the fact that the Pos enum doesn't have an "Align" value yet
Debug.WriteLine($"{e}");
}
_xText.Text = $"{view.Frame.X}";
_yText.Text = $"{view.Frame.Y}";
var w = view.Width.ToString ();
var h = view.Height.ToString ();
_wRadioGroup.SelectedItem = _dimNames.IndexOf (_dimNames.Where (s => w.Contains (s)).First ());
_hRadioGroup.SelectedItem = _dimNames.IndexOf (_dimNames.Where (s => h.Contains (s)).First ());
_wRadioGroup.SelectedItem = _dimNames.IndexOf (_dimNames.First (s => w.Contains (s)));
_hRadioGroup.SelectedItem = _dimNames.IndexOf (_dimNames.First (s => h.Contains (s)));
if (view.Width is DimAuto)
{

25
UnitTests/UICatalog/ScenarioTests.cs
View File

@@ -1,3 +1,4 @@
using System.Diagnostics;
using System.Reflection;
using Xunit.Abstractions;
@@ -39,9 +40,6 @@ public class ScenarioTests : TestsAllViews
// Press QuitKey
Assert.Empty (FakeConsole.MockKeyPresses);
// BUGBUG: (#2474) For some reason ReadKey is not returning the QuitKey for some Scenarios
// by adding this Space it seems to work.
//FakeConsole.PushMockKeyPress (Key.Space);
FakeConsole.PushMockKeyPress ((KeyCode)Application.QuitKey);
uint abortTime = 500;
@@ -69,6 +67,7 @@ public class ScenarioTests : TestsAllViews
// Press QuitKey
Assert.Empty (FakeConsole.MockKeyPresses);
FakeConsole.PushMockKeyPress ((KeyCode)Application.QuitKey);
//output.WriteLine ($" iteration {++iterations}");
if (Application.Top.Running && FakeConsole.MockKeyPresses.Count == 0)
{
@@ -417,15 +416,27 @@ public class ScenarioTests : TestsAllViews
{
var x = view.X.ToString ();
var y = view.Y.ToString ();
_xRadioGroup.SelectedItem = posNames.IndexOf (posNames.Where (s => x.Contains (s)).First ());
_yRadioGroup.SelectedItem = posNames.IndexOf (posNames.Where (s => y.Contains (s)).First ());
try
{
_xRadioGroup.SelectedItem = posNames.IndexOf (posNames.First (s => x.Contains (s)));
_yRadioGroup.SelectedItem = posNames.IndexOf (posNames.First (s => y.Contains (s)));
}
catch (InvalidOperationException e)
{
// This is a hack to work around the fact that the Pos enum doesn't have an "Align" value yet
Debug.WriteLine ($"{e}");
}
_xText.Text = $"{view.Frame.X}";
_yText.Text = $"{view.Frame.Y}";
var w = view.Width.ToString ();
var h = view.Height.ToString ();
_wRadioGroup.SelectedItem = dimNames.IndexOf (dimNames.Where (s => w.Contains (s)).First ());
_hRadioGroup.SelectedItem = dimNames.IndexOf (dimNames.Where (s => h.Contains (s)).First ());
_wRadioGroup.SelectedItem = dimNames.IndexOf (dimNames.First (s => w.Contains (s)));
_hRadioGroup.SelectedItem = dimNames.IndexOf (dimNames.First (s => h.Contains (s)));
_wText.Text = $"{view.Frame.Width}";
_hText.Text = $"{view.Frame.Height}";
}