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

Fixes merge conflicts errors.

Browse Source
This commit is contained in:
BDisp
2023-03-01 23:10:05 +00:00
parent eac93a7973
commit a7c13b5d48
11 changed files with 23 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
UnitTests/Configuration/ConfigurationMangerTests.cs
View File

@@ -226,7 +226,7 @@ namespace Terminal.Gui.ConfigurationTests {
ConfigurationManager.Settings ["Application.AlternateBackwardKey"].PropertyValue = Key.B;
ConfigurationManager.Settings ["Application.UseSystemConsole"].PropertyValue = true;
ConfigurationManager.Settings ["Application.IsMouseDisabled"].PropertyValue = true;
ConfigurationManager.Settings ["Application.HeightAsBuffer"].PropertyValue = true;
ConfigurationManager.Settings ["Application.EnableConsoleScrolling"].PropertyValue = true;
ConfigurationManager.Settings.Apply ();
// assert apply worked
@@ -235,7 +235,7 @@ namespace Terminal.Gui.ConfigurationTests {
Assert.Equal (Key.B, Application.AlternateBackwardKey);
Assert.True (Application.UseSystemConsole);
Assert.True (Application.IsMouseDisabled);
Assert.True (Application.HeightAsBuffer);
Assert.True (Application.EnableConsoleScrolling);
//act
ConfigurationManager.Reset ();
@@ -248,7 +248,7 @@ namespace Terminal.Gui.ConfigurationTests {
Assert.Equal (Key.PageUp | Key.CtrlMask, Application.AlternateBackwardKey);
Assert.False (Application.UseSystemConsole);
Assert.False (Application.IsMouseDisabled);
Assert.False (Application.HeightAsBuffer);
Assert.False (Application.EnableConsoleScrolling);
// arrange
ConfigurationManager.Settings ["Application.QuitKey"].PropertyValue = Key.Q;
@@ -256,7 +256,7 @@ namespace Terminal.Gui.ConfigurationTests {
ConfigurationManager.Settings ["Application.AlternateBackwardKey"].PropertyValue = Key.B;
ConfigurationManager.Settings ["Application.UseSystemConsole"].PropertyValue = true;
ConfigurationManager.Settings ["Application.IsMouseDisabled"].PropertyValue = true;
ConfigurationManager.Settings ["Application.HeightAsBuffer"].PropertyValue = true;
ConfigurationManager.Settings ["Application.EnableConsoleScrolling"].PropertyValue = true;
ConfigurationManager.Settings.Apply ();
@@ -274,7 +274,7 @@ namespace Terminal.Gui.ConfigurationTests {
Assert.Equal (Key.PageUp | Key.CtrlMask, Application.AlternateBackwardKey);
Assert.False (Application.UseSystemConsole);
Assert.False (Application.IsMouseDisabled);
Assert.False (Application.HeightAsBuffer);
Assert.False (Application.EnableConsoleScrolling);
}
@@ -771,7 +771,7 @@ namespace Terminal.Gui.ConfigurationTests {
ConfigurationManager.Settings ["Application.AlternateBackwardKey"].PropertyValue = Key.B;
ConfigurationManager.Settings ["Application.UseSystemConsole"].PropertyValue = true;
ConfigurationManager.Settings ["Application.IsMouseDisabled"].PropertyValue = true;
ConfigurationManager.Settings ["Application.HeightAsBuffer"].PropertyValue = true;
ConfigurationManager.Settings ["Application.EnableConsoleScrolling"].PropertyValue = true;
ConfigurationManager.Updated += ConfigurationManager_Updated;
bool fired = false;
@@ -784,7 +784,7 @@ namespace Terminal.Gui.ConfigurationTests {
Assert.Equal (Key.PageUp | Key.CtrlMask, ConfigurationManager.Settings ["Application.AlternateBackwardKey"].PropertyValue);
Assert.False ((bool)ConfigurationManager.Settings ["Application.UseSystemConsole"].PropertyValue);
Assert.False ((bool)ConfigurationManager.Settings ["Application.IsMouseDisabled"].PropertyValue);
Assert.False ((bool)ConfigurationManager.Settings ["Application.HeightAsBuffer"].PropertyValue);
Assert.False ((bool)ConfigurationManager.Settings ["Application.EnableConsoleScrolling"].PropertyValue);
}
ConfigurationManager.Load (true);
@@ -810,7 +810,7 @@ namespace Terminal.Gui.ConfigurationTests {
Assert.Equal (Key.B, Application.AlternateBackwardKey);
Assert.True (Application.UseSystemConsole);
Assert.True (Application.IsMouseDisabled);
Assert.True (Application.HeightAsBuffer);
Assert.True (Application.EnableConsoleScrolling);
}
// act
@@ -819,7 +819,7 @@ namespace Terminal.Gui.ConfigurationTests {
ConfigurationManager.Settings ["Application.AlternateBackwardKey"].PropertyValue = Key.B;
ConfigurationManager.Settings ["Application.UseSystemConsole"].PropertyValue = true;
ConfigurationManager.Settings ["Application.IsMouseDisabled"].PropertyValue = true;
ConfigurationManager.Settings ["Application.HeightAsBuffer"].PropertyValue = true;
ConfigurationManager.Settings ["Application.EnableConsoleScrolling"].PropertyValue = true;
ConfigurationManager.Apply ();