Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-06 19:26:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adjusting settings to leverage base class (#5127)

Browse Source 
* renaming / deleting file

* adding in base class

Co-authored-by: Clint Rutkas <crutkas@microsoft.com>
This commit is contained in:
Clint Rutkas
2020-07-21 14:06:39 -07:00
committed by GitHub
parent d01b93ae5f
commit 398991f3c1
30 changed files with 202 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/Microsoft.PowerToys.Settings.UnitTest/ViewModelTests/ColorPicker.cs
View File

@@ -19,7 +19,7 @@ namespace ViewModelTests
var colorPickerSettings = new ColorPickerSettings();
SettingsUtils.SaveSettings(generalSettings.ToJsonString());
SettingsUtils.SaveSettings(colorPickerSettings.ToJsonString(), colorPickerSettings.name, ModuleName + ".json");
SettingsUtils.SaveSettings(colorPickerSettings.ToJsonString(), colorPickerSettings.Name, ModuleName + ".json");
}
[TestCleanup]

18
src/core/Microsoft.PowerToys.Settings.UnitTest/ViewModelTests/PowerLauncherViewModelTest.cs
View File

@@ -45,8 +45,8 @@ namespace ViewModelTests
viewModel.SearchTypePreference = "SearchOptionsAreNotValidated";
Assert.AreEqual(sendCallbackMock.TimesSent, 2);
Assert.IsTrue(mockSettings.properties.search_result_preference == "SearchOptionsAreNotValidated");
Assert.IsTrue(mockSettings.properties.search_type_preference == "SearchOptionsAreNotValidated");
Assert.IsTrue(mockSettings.Properties.search_result_preference == "SearchOptionsAreNotValidated");
Assert.IsTrue(mockSettings.Properties.search_type_preference == "SearchOptionsAreNotValidated");
}
public void AssertHotkeySettings(HotkeySettings setting, bool win, bool ctrl, bool alt, bool shift, int code)
@@ -85,7 +85,7 @@ namespace ViewModelTests
Assert.AreEqual(4, sendCallbackMock.TimesSent);
AssertHotkeySettings(
mockSettings.properties.open_powerlauncher,
mockSettings.Properties.open_powerlauncher,
true,
false,
false,
@@ -93,7 +93,7 @@ namespace ViewModelTests
(int)Windows.System.VirtualKey.S
);
AssertHotkeySettings(
mockSettings.properties.open_file_location,
mockSettings.Properties.open_file_location,
false,
true,
false,
@@ -101,7 +101,7 @@ namespace ViewModelTests
(int)Windows.System.VirtualKey.A
);
AssertHotkeySettings(
mockSettings.properties.open_console,
mockSettings.Properties.open_console,
false,
false,
true,
@@ -109,7 +109,7 @@ namespace ViewModelTests
(int)Windows.System.VirtualKey.D
);
AssertHotkeySettings(
mockSettings.properties.copy_path_location,
mockSettings.Properties.copy_path_location,
false,
false,
false,
@@ -127,8 +127,8 @@ namespace ViewModelTests
Assert.AreEqual(1, sendCallbackMock.TimesSent);
Assert.IsTrue(mockSettings.properties.override_win_r_key);
Assert.IsFalse(mockSettings.properties.override_win_s_key);
Assert.IsTrue(mockSettings.Properties.override_win_r_key);
Assert.IsFalse(mockSettings.Properties.override_win_s_key);
}
[TestMethod]
@@ -139,7 +139,7 @@ namespace ViewModelTests
// Assert
Assert.AreEqual(1, sendCallbackMock.TimesSent);
Assert.IsTrue(mockSettings.properties.disable_drive_detection_warning);
Assert.IsTrue(mockSettings.Properties.disable_drive_detection_warning);
}
}
}

2
src/core/Microsoft.PowerToys.Settings.UnitTest/ViewModelTests/PowerPreview.cs
View File

@@ -25,7 +25,7 @@ namespace ViewModelTests
PowerPreviewSettings powerpreview = new PowerPreviewSettings();
SettingsUtils.SaveSettings(generalSettings.ToJsonString());
SettingsUtils.SaveSettings(powerpreview.ToJsonString(), powerpreview.name);
SettingsUtils.SaveSettings(powerpreview.ToJsonString(), powerpreview.Name);
}
[TestCleanup]

12
src/core/Microsoft.PowerToys.Settings.UnitTest/ViewModelTests/PowerRename.cs
View File

@@ -26,7 +26,7 @@ namespace ViewModelTests
PowerRenameSettings powerRename = new PowerRenameSettings();
SettingsUtils.SaveSettings(generalSettings.ToJsonString());
SettingsUtils.SaveSettings(powerRename.ToJsonString(), powerRename.name, "power-rename-settings.json");
SettingsUtils.SaveSettings(powerRename.ToJsonString(), powerRename.Name, "power-rename-settings.json");
}
[TestCleanup]
@@ -73,7 +73,7 @@ namespace ViewModelTests
ShellPage.DefaultSndMSGCallback = msg =>
{
PowerRenameSettingsIPCMessage snd = JsonSerializer.Deserialize<PowerRenameSettingsIPCMessage>(msg);
Assert.IsTrue(snd.Powertoys.PowerRename.properties.MRUEnabled.Value);
Assert.IsTrue(snd.Powertoys.PowerRename.Properties.MRUEnabled.Value);
};
// act
@@ -139,7 +139,7 @@ namespace ViewModelTests
ShellPage.DefaultSndMSGCallback = msg =>
{
PowerRenameSettingsIPCMessage snd = JsonSerializer.Deserialize<PowerRenameSettingsIPCMessage>(msg);
Assert.IsTrue(snd.Powertoys.PowerRename.properties.ShowIcon.Value);
Assert.IsTrue(snd.Powertoys.PowerRename.Properties.ShowIcon.Value);
};
// act
@@ -156,7 +156,7 @@ namespace ViewModelTests
ShellPage.DefaultSndMSGCallback = msg =>
{
PowerRenameSettingsIPCMessage snd = JsonSerializer.Deserialize<PowerRenameSettingsIPCMessage>(msg);
Assert.IsTrue(snd.Powertoys.PowerRename.properties.ShowIcon.Value);
Assert.IsTrue(snd.Powertoys.PowerRename.Properties.ShowIcon.Value);
};
// act
@@ -173,7 +173,7 @@ namespace ViewModelTests
ShellPage.DefaultSndMSGCallback = msg =>
{
PowerRenameSettingsIPCMessage snd = JsonSerializer.Deserialize<PowerRenameSettingsIPCMessage>(msg);
Assert.IsTrue(snd.Powertoys.PowerRename.properties.PersistState.Value);
Assert.IsTrue(snd.Powertoys.PowerRename.Properties.PersistState.Value);
};
// act
@@ -190,7 +190,7 @@ namespace ViewModelTests
ShellPage.DefaultSndMSGCallback = msg =>
{
PowerRenameSettingsIPCMessage snd = JsonSerializer.Deserialize<PowerRenameSettingsIPCMessage>(msg);
Assert.AreEqual(20, snd.Powertoys.PowerRename.properties.MaxMRUSize.Value);
Assert.AreEqual(20, snd.Powertoys.PowerRename.Properties.MaxMRUSize.Value);
};
// act