mirror of
https://github.com/gui-cs/Terminal.Gui.git
synced 2026-01-01 16:59:35 +01:00
Fixed CM unit test failures causd by hotkey PR
This commit is contained in:
@@ -35,14 +35,12 @@ public class ConfigurationManagerTests
|
||||
Assert.Equal (KeyCode.Q, Application.QuitKey.KeyCode);
|
||||
Assert.Equal (KeyCode.F, Application.AlternateForwardKey.KeyCode);
|
||||
Assert.Equal (KeyCode.B, Application.AlternateBackwardKey.KeyCode);
|
||||
Assert.True (Application.IsMouseDisabled);
|
||||
}
|
||||
|
||||
// act
|
||||
Settings ["Application.QuitKey"].PropertyValue = Key.Q;
|
||||
Settings ["Application.AlternateForwardKey"].PropertyValue = Key.F;
|
||||
Settings ["Application.AlternateBackwardKey"].PropertyValue = Key.B;
|
||||
Settings ["Application.IsMouseDisabled"].PropertyValue = true;
|
||||
|
||||
Apply ();
|
||||
|
||||
@@ -156,7 +154,6 @@ public class ConfigurationManagerTests
|
||||
Settings ["Application.QuitKey"].PropertyValue = Key.Q;
|
||||
Settings ["Application.AlternateForwardKey"].PropertyValue = Key.F;
|
||||
Settings ["Application.AlternateBackwardKey"].PropertyValue = Key.B;
|
||||
Settings ["Application.IsMouseDisabled"].PropertyValue = true;
|
||||
|
||||
Updated += ConfigurationManager_Updated;
|
||||
var fired = false;
|
||||
@@ -177,7 +174,6 @@ public class ConfigurationManagerTests
|
||||
KeyCode.PageUp | KeyCode.CtrlMask,
|
||||
((Key)Settings ["Application.AlternateBackwardKey"].PropertyValue).KeyCode
|
||||
);
|
||||
Assert.False ((bool)Settings ["Application.IsMouseDisabled"].PropertyValue);
|
||||
}
|
||||
|
||||
Load (true);
|
||||
@@ -235,14 +231,12 @@ public class ConfigurationManagerTests
|
||||
Settings ["Application.QuitKey"].PropertyValue = Key.Q;
|
||||
Settings ["Application.AlternateForwardKey"].PropertyValue = Key.F;
|
||||
Settings ["Application.AlternateBackwardKey"].PropertyValue = Key.B;
|
||||
Settings ["Application.IsMouseDisabled"].PropertyValue = true;
|
||||
Settings.Apply ();
|
||||
|
||||
// assert apply worked
|
||||
Assert.Equal (KeyCode.Q, Application.QuitKey.KeyCode);
|
||||
Assert.Equal (KeyCode.F, Application.AlternateForwardKey.KeyCode);
|
||||
Assert.Equal (KeyCode.B, Application.AlternateBackwardKey.KeyCode);
|
||||
Assert.True (Application.IsMouseDisabled);
|
||||
|
||||
//act
|
||||
Reset ();
|
||||
@@ -253,13 +247,11 @@ public class ConfigurationManagerTests
|
||||
Assert.Equal (Key.Esc, Application.QuitKey);
|
||||
Assert.Equal (KeyCode.PageDown | KeyCode.CtrlMask, Application.AlternateForwardKey.KeyCode);
|
||||
Assert.Equal (KeyCode.PageUp | KeyCode.CtrlMask, Application.AlternateBackwardKey.KeyCode);
|
||||
Assert.False (Application.IsMouseDisabled);
|
||||
|
||||
// arrange
|
||||
Settings ["Application.QuitKey"].PropertyValue = Key.Q;
|
||||
Settings ["Application.AlternateForwardKey"].PropertyValue = Key.F;
|
||||
Settings ["Application.AlternateBackwardKey"].PropertyValue = Key.B;
|
||||
Settings ["Application.IsMouseDisabled"].PropertyValue = true;
|
||||
Settings.Apply ();
|
||||
|
||||
Locations = ConfigLocations.DefaultOnly;
|
||||
@@ -274,7 +266,6 @@ public class ConfigurationManagerTests
|
||||
Assert.Equal (KeyCode.Esc, Application.QuitKey.KeyCode);
|
||||
Assert.Equal (KeyCode.PageDown | KeyCode.CtrlMask, Application.AlternateForwardKey.KeyCode);
|
||||
Assert.Equal (KeyCode.PageUp | KeyCode.CtrlMask, Application.AlternateBackwardKey.KeyCode);
|
||||
Assert.False (Application.IsMouseDisabled);
|
||||
Reset ();
|
||||
}
|
||||
|
||||
|
||||
@@ -20,13 +20,11 @@ public class SettingsScopeTests
|
||||
KeyCode.PageUp | KeyCode.CtrlMask,
|
||||
((Key)Settings ["Application.AlternateBackwardKey"].PropertyValue).KeyCode
|
||||
);
|
||||
Assert.False ((bool)Settings ["Application.IsMouseDisabled"].PropertyValue);
|
||||
|
||||
// act
|
||||
Settings ["Application.QuitKey"].PropertyValue = Key.Q;
|
||||
Settings ["Application.AlternateForwardKey"].PropertyValue = Key.F;
|
||||
Settings ["Application.AlternateBackwardKey"].PropertyValue = Key.B;
|
||||
Settings ["Application.IsMouseDisabled"].PropertyValue = true;
|
||||
|
||||
Settings.Apply ();
|
||||
|
||||
@@ -34,7 +32,6 @@ public class SettingsScopeTests
|
||||
Assert.Equal (KeyCode.Q, Application.QuitKey.KeyCode);
|
||||
Assert.Equal (KeyCode.F, Application.AlternateForwardKey.KeyCode);
|
||||
Assert.Equal (KeyCode.B, Application.AlternateBackwardKey.KeyCode);
|
||||
Assert.True (Application.IsMouseDisabled);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
@@ -49,13 +46,11 @@ public class SettingsScopeTests
|
||||
///Don't set Quitkey
|
||||
updatedSettings ["Application.AlternateForwardKey"].PropertyValue = Key.F;
|
||||
updatedSettings ["Application.AlternateBackwardKey"].PropertyValue = Key.B;
|
||||
updatedSettings ["Application.IsMouseDisabled"].PropertyValue = true;
|
||||
|
||||
Settings.Update (updatedSettings);
|
||||
Assert.Equal (KeyCode.End, ((Key)Settings ["Application.QuitKey"].PropertyValue).KeyCode);
|
||||
Assert.Equal (KeyCode.F, ((Key)updatedSettings ["Application.AlternateForwardKey"].PropertyValue).KeyCode);
|
||||
Assert.Equal (KeyCode.B, ((Key)updatedSettings ["Application.AlternateBackwardKey"].PropertyValue).KeyCode);
|
||||
Assert.True ((bool)updatedSettings ["Application.IsMouseDisabled"].PropertyValue);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
@@ -72,7 +67,6 @@ public class SettingsScopeTests
|
||||
Assert.True (Settings ["Application.QuitKey"].PropertyValue is Key);
|
||||
Assert.True (Settings ["Application.AlternateForwardKey"].PropertyValue is Key);
|
||||
Assert.True (Settings ["Application.AlternateBackwardKey"].PropertyValue is Key);
|
||||
Assert.True (Settings ["Application.IsMouseDisabled"].PropertyValue is bool);
|
||||
|
||||
Assert.True (Settings ["Theme"].PropertyValue is string);
|
||||
Assert.Equal ("Default", Settings ["Theme"].PropertyValue as string);
|
||||
|
||||
Reference in New Issue
Block a user