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

[FancyZones] Split zones-settings: layout hotkeys (#15514)

Browse Source
This commit is contained in:
Seraphima Zykova
2022-01-17 11:50:24 +03:00
committed by GitHub
parent a96187bd04
commit ba431c5bfd
28 changed files with 524 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/modules/fancyzones/FancyZonesTests/UnitTests/JsonHelpers.Tests.cpp
View File

@@ -1556,73 +1556,6 @@ namespace FancyZonesUnitTests
auto actual = SerializeCustomZoneSets(customZoneSetsMap);
compareJsonArrays(expected, actual);
}
TEST_METHOD(QuickLayoutKeysParse)
{
const std::wstring zoneUuid = L"{33A2B101-06E0-437B-A61E-CDBECF502906}";
LayoutQuickKeyJSON expected{ zoneUuid, 2 };
json::JsonArray array;
array.Append(LayoutQuickKeyJSON::ToJson(expected));
json::JsonObject json;
json.SetNamedValue(L"quick-layout-keys", json::JsonValue::Parse(array.Stringify()));
const auto& quickKeysMap = ParseQuickKeys(json);
Assert::AreEqual((size_t)array.Size(), quickKeysMap.size());
Assert::IsTrue(quickKeysMap.find(zoneUuid) != quickKeysMap.end());
int actualKey = quickKeysMap.find(zoneUuid)->second;
Assert::AreEqual((int)expected.key, actualKey);
}
TEST_METHOD (QuickLayoutKeysParseEmpty)
{
json::JsonArray array;
json::JsonObject json;
json.SetNamedValue(L"quick-layout-keys", json::JsonValue::Parse(array.Stringify()));
const auto& quickKeysMap = ParseQuickKeys(json);
Assert::IsTrue(quickKeysMap.empty());
}
TEST_METHOD (QuickLayoutKeysParseInvalid)
{
const std::wstring invalidZoneUuid = L"{33A2B101-06E0-437B-}";
LayoutQuickKeyJSON expected{ invalidZoneUuid, 2 };
json::JsonArray array;
array.Append(LayoutQuickKeyJSON::ToJson(expected));
json::JsonObject json;
json.SetNamedValue(L"quick-layout-keys", json::JsonValue::Parse(array.Stringify()));
const auto& quickKeysMap = ParseQuickKeys(json);
Assert::IsTrue(quickKeysMap.empty());
}
TEST_METHOD (QuickLayoutKeysParseMissed)
{
json::JsonObject json;
const auto& quickKeysMap = ParseQuickKeys(json);
Assert::IsTrue(quickKeysMap.empty());
}
TEST_METHOD (QuickLayoutKeysSerialize)
{
json::JsonArray expected;
expected.Append(LayoutQuickKeyJSON::ToJson(LayoutQuickKeyJSON{ L"{33A2B101-06E0-437B-A61E-CDBECF502906}", 3}));
json::JsonObject json;
json.SetNamedValue(L"quick-layout-keys", json::JsonValue::Parse(expected.Stringify()));
const auto& quickKeysMap = ParseQuickKeys(json);
auto actual = SerializeQuickKeys(quickKeysMap);
compareJsonArrays(expected, actual);
}
TEST_METHOD (SetActiveZoneSet)
{
@@ -1754,7 +1687,6 @@ namespace FancyZonesUnitTests
Assert::IsFalse(fancyZonesData.GetCustomZoneSetsMap().empty());
Assert::IsFalse(fancyZonesData.GetCustomZoneSetsMap().empty());
Assert::IsFalse(fancyZonesData.GetCustomZoneSetsMap().empty());
Assert::IsFalse(fancyZonesData.GetLayoutQuickKeys().empty());
}
TEST_METHOD (LoadFancyZonesDataFromCroppedJson)

126
src/modules/fancyzones/FancyZonesTests/UnitTests/LayoutHotkeysTests.Spec.cpp Normal file
View File

@@ -0,0 +1,126 @@
#include "pch.h"
#include <filesystem>
#include <FancyZonesLib/FancyZonesData.h>
#include <FancyZonesLib/FancyZonesData/LayoutHotkeys.h>
#include <FancyZonesLib/util.h>
using namespace Microsoft::VisualStudio::CppUnitTestFramework;
namespace FancyZonesUnitTests
{
TEST_CLASS (LayoutHotkeysUnitTests)
{
FancyZonesData& m_fzData = FancyZonesDataInstance();
std::wstring m_testFolder = L"FancyZonesUnitTests";
TEST_METHOD_INITIALIZE(Init)
{
m_fzData.clear_data();
m_fzData.SetSettingsModulePath(L"FancyZonesUnitTests");
}
TEST_METHOD_CLEANUP(CleanUp)
{
std::filesystem::remove_all(LayoutHotkeys::LayoutHotkeysFileName());
std::filesystem::remove_all(PTSettingsHelper::get_module_save_folder_location(m_testFolder));
}
TEST_METHOD (LayoutHotkeysParse)
{
// prepare
json::JsonObject root{};
json::JsonArray keysArray{};
{
json::JsonObject keyJson{};
keyJson.SetNamedValue(NonLocalizable::LayoutHotkeysIds::LayoutUuidID, json::value(L"{33A2B101-06E0-437B-A61E-CDBECF502906}"));
keyJson.SetNamedValue(NonLocalizable::LayoutHotkeysIds::KeyID, json::value(1));
keysArray.Append(keyJson);
}
{
json::JsonObject keyJson{};
keyJson.SetNamedValue(NonLocalizable::LayoutHotkeysIds::LayoutUuidID, json::value(L"{33A2B101-06E0-437B-A61E-CDBECF502907}"));
keyJson.SetNamedValue(NonLocalizable::LayoutHotkeysIds::KeyID, json::value(2));
keysArray.Append(keyJson);
}
root.SetNamedValue(NonLocalizable::LayoutHotkeysIds::LayoutHotkeysArrayID, keysArray);
json::to_file(LayoutHotkeys::LayoutHotkeysFileName(), root);
// test
LayoutHotkeys::instance().LoadData();
Assert::AreEqual((size_t)2, LayoutHotkeys::instance().GetHotkeysCount());
Assert::AreEqual(L"{33A2B101-06E0-437B-A61E-CDBECF502906}", FancyZonesUtils::GuidToString(LayoutHotkeys::instance().GetLayoutId(1).value()).value().c_str());
Assert::AreEqual(L"{33A2B101-06E0-437B-A61E-CDBECF502907}", FancyZonesUtils::GuidToString(LayoutHotkeys::instance().GetLayoutId(2).value()).value().c_str());
}
TEST_METHOD (LayoutHotkeysParseEmpty)
{
// prepare
json::JsonObject root{};
json::JsonArray keysArray{};
root.SetNamedValue(NonLocalizable::LayoutHotkeysIds::LayoutHotkeysArrayID, keysArray);
json::to_file(LayoutHotkeys::LayoutHotkeysFileName(), root);
// test
LayoutHotkeys::instance().LoadData();
Assert::AreEqual((size_t)0, LayoutHotkeys::instance().GetHotkeysCount());
}
TEST_METHOD (LayoutHotkeysNoFile)
{
// test
LayoutHotkeys::instance().LoadData();
Assert::AreEqual((size_t)0, LayoutHotkeys::instance().GetHotkeysCount());
}
TEST_METHOD (MoveLayoutHotkeysFromZonesSettings)
{
// prepare
json::JsonObject root{};
json::JsonArray devicesArray{}, customLayoutsArray{}, templateLayoutsArray{}, quickLayoutKeysArray{};
root.SetNamedValue(L"devices", devicesArray);
root.SetNamedValue(L"custom-zone-sets", customLayoutsArray);
root.SetNamedValue(L"templates", templateLayoutsArray);
json::JsonObject layoutKeyObj{};
layoutKeyObj.SetNamedValue(L"uuid", json::value(L"{BF7DD882-AB90-4AB8-88A0-96CCFCEC538C}"));
layoutKeyObj.SetNamedValue(L"key", json::value(1));
quickLayoutKeysArray.Append(layoutKeyObj);
root.SetNamedValue(L"quick-layout-keys", quickLayoutKeysArray);
json::to_file(m_fzData.GetZoneSettingsPath(m_testFolder), root);
// test
m_fzData.ReplaceZoneSettingsFileFromOlderVersions();
LayoutHotkeys::instance().LoadData();
Assert::AreEqual((size_t)1, LayoutHotkeys::instance().GetHotkeysCount());
Assert::AreEqual(L"{BF7DD882-AB90-4AB8-88A0-96CCFCEC538C}", FancyZonesUtils::GuidToString(LayoutHotkeys::instance().GetLayoutId(1).value()).value().c_str());
}
TEST_METHOD (MoveLayoutHotkeysFromZonesSettingsNoQuickLayoutKeys)
{
// prepare
json::JsonObject root{};
json::JsonArray devicesArray{}, customLayoutsArray{}, templateLayoutsArray{};
root.SetNamedValue(L"devices", devicesArray);
root.SetNamedValue(L"custom-zone-sets", customLayoutsArray);
root.SetNamedValue(L"templates", templateLayoutsArray);
json::to_file(m_fzData.GetZoneSettingsPath(m_testFolder), root);
// test
m_fzData.ReplaceZoneSettingsFileFromOlderVersions();
LayoutHotkeys::instance().LoadData();
Assert::AreEqual((size_t)0, LayoutHotkeys::instance().GetHotkeysCount());
}
TEST_METHOD (MoveLayoutHotkeysFromZonesSettingsNoFile)
{
// test
m_fzData.ReplaceZoneSettingsFileFromOlderVersions();
LayoutHotkeys::instance().LoadData();
Assert::AreEqual((size_t)0, LayoutHotkeys::instance().GetHotkeysCount());
}
};
}

1
src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj
View File

@@ -44,6 +44,7 @@
<ClCompile Include="FancyZones.Spec.cpp" />
<ClCompile Include="FancyZonesSettings.Spec.cpp" />
<ClCompile Include="JsonHelpers.Tests.cpp" />
<ClCompile Include="LayoutHotkeysTests.Spec.cpp" />
<ClCompile Include="pch.cpp">
<PrecompiledHeader Condition="'$(CIBuild)'!='true'">Create</PrecompiledHeader>
</ClCompile>

3
src/modules/fancyzones/FancyZonesTests/UnitTests/UnitTests.vcxproj.filters
View File

@@ -42,6 +42,9 @@
<ClCompile Include="WorkArea.Spec.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="LayoutHotkeysTests.Spec.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="pch.h">