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

[FancyZones] Unit-tests fix: keeping user settings unchanged (#3500)

Browse Source
This commit is contained in:
Seraphima Zykova
2020-05-27 21:09:18 +03:00
committed by GitHub
parent ac6b9712ad
commit 5db1f91b01
5 changed files with 81 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/fancyzones/tests/UnitTests/FancyZonesSettings.Spec.cpp
View File

@@ -54,7 +54,7 @@ namespace FancyZonesUnitTests
TEST_CLASS (FancyZonesSettingsCreationUnitTest)
{
HINSTANCE m_hInst;
PCWSTR m_moduleName = L"FancyZonesTest";
PCWSTR m_moduleName = L"FancyZonesUnitTests";
std::wstring m_tmpName;
const PowerToysSettings::HotkeyObject m_defaultHotkeyObject = PowerToysSettings::HotkeyObject::from_settings(true, false, false, false, VK_OEM_3);
@@ -67,8 +67,7 @@ namespace FancyZonesUnitTests
}
TEST_METHOD_CLEANUP(Cleanup)
{
std::filesystem::remove(m_tmpName);
std::filesystem::remove(PTSettingsHelper::get_module_save_folder_location(m_moduleName));
std::filesystem::remove_all(PTSettingsHelper::get_module_save_folder_location(m_moduleName));
}
TEST_METHOD (CreateWithHinstanceDefault)
@@ -367,7 +366,7 @@ namespace FancyZonesUnitTests
TEST_CLASS (FancyZonesSettingsCallbackUnitTests)
{
winrt::com_ptr<IFancyZonesSettings> m_settings = nullptr;
PCWSTR m_moduleName = L"FancyZonesTest";
PCWSTR m_moduleName = L"FancyZonesUnitTests";
struct FZCallback : public winrt::implements<FZCallback, IFancyZonesCallback>
{
@@ -466,8 +465,7 @@ namespace FancyZonesUnitTests
TEST_METHOD_CLEANUP(Cleanup)
{
const auto settingsFile = PTSettingsHelper::get_module_save_folder_location(m_moduleName) + L"\\settings.json";
std::filesystem::remove(settingsFile);
std::filesystem::remove_all(PTSettingsHelper::get_module_save_folder_location(m_moduleName));
}
TEST_METHOD (CallbackSetConfig)
@@ -541,7 +539,7 @@ namespace FancyZonesUnitTests
{
winrt::com_ptr<IFancyZonesSettings> m_settings = nullptr;
PowerToysSettings::Settings* m_ptSettings = nullptr;
PCWSTR m_moduleName = L"FancyZonesTest";
PCWSTR m_moduleName = L"FancyZonesUnitTests";
std::wstring serializedPowerToySettings(const Settings& settings)
{
@@ -640,8 +638,7 @@ namespace FancyZonesUnitTests
TEST_METHOD_CLEANUP(Cleanup)
{
const auto settingsFile = PTSettingsHelper::get_module_save_folder_location(m_moduleName) + L"\\settings.json";
std::filesystem::remove(settingsFile);
std::filesystem::remove_all(PTSettingsHelper::get_module_save_folder_location(m_moduleName));
}
TEST_METHOD (GetConfig)