Workspaceslib ut (#40007)

This pull request introduces a new unit testing framework for the `WorkspacesLib` module, adds test coverage for various utilities, and integrates the new test project into the build system. Key changes include adding the `WorkspacesLibUnitTests` project, implementing tests for `AppUtils`, `JsonUtils`, and `PwaHelper`, and updating the build configuration to include the new test project. ### Unit Tests Added: * **`AppUtilsTests`**: - Added comprehensive tests for methods such as `GetCurrentFolder`, `IsEdge`, `IsChrome`, and `IsSteamGame` to validate their behavior under various conditions. * **`JsonUtilsTests`**: - Implemented tests for reading and writing workspace data, including scenarios for invalid JSON, non-existent files, and valid workspace lists. * **`PwaHelperTests`**: - Added tests to ensure the stability of `PwaHelper` methods, such as `GetEdgeAppId`, `GetChromeAppId`, and `SearchPwaName`, even with invalid or empty inputs. ### Build System Updates: * **New Test Project Integration**: - Added the `WorkspacesLibUnitTests` project to the solution file `PowerToys.sln` with appropriate dependencies. - Updated build configurations to include the new test project for both Debug and Release builds across architectures. [[1]](diffhunk://#diff-ca837ce490070b91656ffffe31cbad8865ba9174e0f020231f77baf35ff3f811R2208-R2215) [[2]](diffhunk://#diff-ca837ce490070b91656ffffe31cbad8865ba9174e0f020231f77baf35ff3f811R2841) ### Pipeline Adjustments: * **Test Discovery**: - Updated the pipeline configuration in `.pipelines/v2/templates/job-build-project.yml` to discover the new `WorkspacesLibUnitTests.dll` during test runs. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
2025-12-16 03:37:59 +01:00 · 2025-06-13 10:51:22 +08:00
parent 2b40c4d2f3
commit 8506b47544
15 changed files with 1033 additions and 12 deletions
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.pipelines/v2/templates/job-build-project.yml
@@ -397,6 +397,7 @@ jobs:
          **\UnitTests-CommonLib.dll
          **\PowerRenameUnitTests.dll
          **\UnitTests-FancyZones.dll
+          **\\WorkspacesLibUnitTests.dll
          !**\obj\**

  - pwsh: |-
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -604,6 +604,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowProperties", "WindowP
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesLib", "src\modules\Workspaces\WorkspacesLib\WorkspacesLib.vcxproj", "{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesLibUnitTests", "src\modules\Workspaces\WorkspacesLib.UnitTests\WorkspacesLibUnitTests.vcxproj", "{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332} = {B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}
+	EndProjectSection
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkspacesLauncherUI", "src\modules\Workspaces\WorkspacesLauncherUI\WorkspacesLauncherUI.csproj", "{9C53CC25-0623-4569-95BC-B05410675EE3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesModuleInterface", "src\modules\Workspaces\WorkspacesModuleInterface\WorkspacesModuleInterface.vcxproj", "{45285DF2-9742-4ECA-9AC9-58951FC26489}"
@@ -2200,6 +2205,14 @@ Global
 		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Release|ARM64.Build.0 = Release|ARM64
 		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Release|x64.ActiveCfg = Release|x64
 		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Release|x64.Build.0 = Release|x64
+		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}.Debug|ARM64.Build.0 = Debug|ARM64
+		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}.Debug|x64.ActiveCfg = Debug|x64
+		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}.Debug|x64.Build.0 = Debug|x64
+		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}.Release|ARM64.ActiveCfg = Release|ARM64
+		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}.Release|ARM64.Build.0 = Release|ARM64
+		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}.Release|x64.ActiveCfg = Release|x64
+		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}.Release|x64.Build.0 = Release|x64
 		{9C53CC25-0623-4569-95BC-B05410675EE3}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{9C53CC25-0623-4569-95BC-B05410675EE3}.Debug|ARM64.Build.0 = Debug|ARM64
 		{9C53CC25-0623-4569-95BC-B05410675EE3}.Debug|x64.ActiveCfg = Debug|x64
@@ -2584,6 +2597,14 @@ Global
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|ARM64.Build.0 = Release|ARM64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.ActiveCfg = Release|x64
 		{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.Build.0 = Release|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.Build.0 = Debug|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.ActiveCfg = Debug|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.Build.0 = Debug|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.ActiveCfg = Release|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.Build.0 = Release|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.ActiveCfg = Release|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.Build.0 = Release|x64
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.Build.0 = Debug|ARM64
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|x64.ActiveCfg = Debug|x64
@@ -2598,14 +2619,6 @@ Global
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|ARM64.ActiveCfg = Release|ARM64
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.ActiveCfg = Release|x64
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.Build.0 = Release|x64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.Build.0 = Debug|ARM64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.ActiveCfg = Debug|x64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.Build.0 = Debug|x64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.ActiveCfg = Release|ARM64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.Build.0 = Release|ARM64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.ActiveCfg = Release|x64
-		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2825,6 +2838,7 @@ Global
 		{BE126CBB-AE12-406A-9837-A05ACFCA57A7} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{14CB58B7-D280-4A7A-95DE-4B2DF14EA000} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
+		{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{9C53CC25-0623-4569-95BC-B05410675EE3} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{45285DF2-9742-4ECA-9AC9-58951FC26489} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 		{3D63307B-9D27-44FD-B033-B26F39245B85} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
--- a/src/modules/Workspaces/WorkspacesLib.UnitTests/AppUtilsTests.cpp
+++ b/src/modules/Workspaces/WorkspacesLib.UnitTests/AppUtilsTests.cpp
@@ -0,0 +1,239 @@
+#include "pch.h"
+#include <filesystem> // Add this line
+
+using namespace Microsoft::VisualStudio::CppUnitTestFramework;
+
+namespace WorkspacesLibUnitTests
+{
+    TEST_CLASS(AppUtilsTests)
+    {
+    public:
+        TEST_METHOD(GetCurrentFolder_ReturnsNonEmptyPath)
+        {
+            // Act
+            const std::wstring& result = Utils::Apps::GetCurrentFolder();
+
+            // Assert
+            Assert::IsFalse(result.empty());
+            Assert::IsTrue(std::filesystem::exists(result));
+        }
+
+        TEST_METHOD(GetCurrentFolderUpper_ReturnsUppercasePath)
+        {
+            // Act
+            const std::wstring& currentFolder = Utils::Apps::GetCurrentFolder();
+            const std::wstring& currentFolderUpper = Utils::Apps::GetCurrentFolderUpper();
+
+            // Assert
+            Assert::IsFalse(currentFolderUpper.empty());
+            Assert::AreEqual(currentFolder.length(), currentFolderUpper.length());
+            
+            // Verify it's actually uppercase
+            std::wstring expectedUpper = currentFolder;
+            std::transform(expectedUpper.begin(), expectedUpper.end(), expectedUpper.begin(), towupper);
+            Assert::AreEqual(expectedUpper, currentFolderUpper);
+        }
+
+        TEST_METHOD(GetCurrentFolder_ConsistentResults)
+        {
+            // Act
+            const std::wstring& result1 = Utils::Apps::GetCurrentFolder();
+            const std::wstring& result2 = Utils::Apps::GetCurrentFolder();
+
+            // Assert
+            Assert::AreEqual(result1, result2);
+        }
+
+        TEST_METHOD(GetCurrentFolderUpper_ConsistentResults)
+        {
+            // Act
+            const std::wstring& result1 = Utils::Apps::GetCurrentFolderUpper();
+            const std::wstring& result2 = Utils::Apps::GetCurrentFolderUpper();
+
+            // Assert
+            Assert::AreEqual(result1, result2);
+        }
+
+        TEST_METHOD(AppData_IsEdge_EdgePath_ReturnsTrue)
+        {
+            // Arrange
+            Utils::Apps::AppData appData;
+            appData.installPath = L"C:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge.exe";
+
+            // Act
+            bool result = appData.IsEdge();
+
+            // Assert
+            Assert::IsTrue(result);
+        }
+
+        TEST_METHOD(AppData_IsEdge_NonEdgePath_ReturnsFalse)
+        {
+            // Arrange
+            Utils::Apps::AppData appData;
+            appData.installPath = L"C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe";
+
+            // Act
+            bool result = appData.IsEdge();
+
+            // Assert
+            Assert::IsFalse(result);
+        }
+
+        TEST_METHOD(AppData_IsEdge_EmptyPath_ReturnsFalse)
+        {
+            // Arrange
+            Utils::Apps::AppData appData;
+            appData.installPath = L"";
+
+            // Act
+            bool result = appData.IsEdge();
+
+            // Assert
+            Assert::IsFalse(result);
+        }
+
+        TEST_METHOD(AppData_IsChrome_ChromePath_ReturnsTrue)
+        {
+            // Arrange
+            Utils::Apps::AppData appData;
+            appData.installPath = L"C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe";
+
+            // Act
+            bool result = appData.IsChrome();
+
+            // Assert
+            Assert::IsTrue(result);
+        }
+
+        TEST_METHOD(AppData_IsChrome_NonChromePath_ReturnsFalse)
+        {
+            // Arrange
+            Utils::Apps::AppData appData;
+            appData.installPath = L"C:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge.exe";
+
+            // Act
+            bool result = appData.IsChrome();
+
+            // Assert
+            Assert::IsFalse(result);
+        }
+
+        TEST_METHOD(AppData_IsChrome_EmptyPath_ReturnsFalse)
+        {
+            // Arrange
+            Utils::Apps::AppData appData;
+            appData.installPath = L"";
+
+            // Act
+            bool result = appData.IsChrome();
+
+            // Assert
+            Assert::IsFalse(result);
+        }
+
+        TEST_METHOD(AppData_IsSteamGame_SteamProtocol_ReturnsTrue)
+        {
+            // Arrange
+            Utils::Apps::AppData appData;
+            appData.protocolPath = L"steam://run/123456";
+
+            // Act
+            bool result = appData.IsSteamGame();
+
+            // Assert
+            Assert::IsTrue(result);
+        }
+
+        TEST_METHOD(AppData_IsSteamGame_NonSteamProtocol_ReturnsFalse)
+        {
+            // Arrange
+            Utils::Apps::AppData appData;
+            appData.protocolPath = L"https://example.com";
+
+            // Act
+            bool result = appData.IsSteamGame();
+
+            // Assert
+            Assert::IsFalse(result);
+        }
+
+        TEST_METHOD(AppData_IsSteamGame_EmptyProtocol_ReturnsFalse)
+        {
+            // Arrange
+            Utils::Apps::AppData appData;
+            appData.protocolPath = L"";
+
+            // Act
+            bool result = appData.IsSteamGame();
+
+            // Assert
+            Assert::IsFalse(result);
+        }
+
+        TEST_METHOD(AppData_IsSteamGame_PartialSteamString_ReturnsFalse)
+        {
+            // Arrange
+            Utils::Apps::AppData appData;
+            appData.protocolPath = L"http://run/123456";
+
+            // Act
+            bool result = appData.IsSteamGame();
+
+            // Assert
+            Assert::IsFalse(result);
+        }
+
+        TEST_METHOD(AppData_DefaultValues)
+        {
+            // Arrange & Act
+            Utils::Apps::AppData appData;
+
+            // Assert
+            Assert::IsTrue(appData.name.empty());
+            Assert::IsTrue(appData.installPath.empty());
+            Assert::IsTrue(appData.packageFullName.empty());
+            Assert::IsTrue(appData.appUserModelId.empty());
+            Assert::IsTrue(appData.pwaAppId.empty());
+            Assert::IsTrue(appData.protocolPath.empty());
+            Assert::IsFalse(appData.canLaunchElevated);
+        }
+
+        TEST_METHOD(AppData_MultipleBrowserDetection)
+        {
+            // Arrange
+            Utils::Apps::AppData edgeApp;
+            edgeApp.installPath = L"C:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge.exe";
+
+            Utils::Apps::AppData chromeApp;
+            chromeApp.installPath = L"C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe";
+
+            Utils::Apps::AppData otherApp;
+            otherApp.installPath = L"C:\\Program Files\\Firefox\\firefox.exe";
+
+            // Act & Assert
+            Assert::IsTrue(edgeApp.IsEdge());
+            Assert::IsFalse(edgeApp.IsChrome());
+            Assert::IsFalse(edgeApp.IsSteamGame());
+
+            Assert::IsFalse(chromeApp.IsEdge());
+            Assert::IsTrue(chromeApp.IsChrome());
+            Assert::IsFalse(chromeApp.IsSteamGame());
+
+            Assert::IsFalse(otherApp.IsEdge());
+            Assert::IsFalse(otherApp.IsChrome());
+            Assert::IsFalse(otherApp.IsSteamGame());
+        }
+
+        TEST_METHOD(GetAppsList_ReturnsAppList)
+        {
+            // Act
+            Utils::Apps::AppList apps = Utils::Apps::GetAppsList();
+
+            // Assert
+            // The list can be empty or non-empty depending on the system
+            // But it should not crash and should return a valid list
+            Assert::IsTrue(apps.size() >= 0);
+        }
+    };
+}
--- a/src/modules/Workspaces/WorkspacesLib.UnitTests/JsonUtilsTests.cpp
+++ b/src/modules/Workspaces/WorkspacesLib.UnitTests/JsonUtilsTests.cpp
@@ -0,0 +1,186 @@
+#include "pch.h"
+#include <filesystem>
+#include <fstream>
+
+using namespace Microsoft::VisualStudio::CppUnitTestFramework;
+
+namespace WorkspacesLibUnitTests
+{
+    TEST_CLASS (JsonUtilsTests)
+    {
+    private:
+        std::wstring CreateTempJsonFile(const std::wstring& content)
+        {
+            std::wstring tempPath = std::filesystem::temp_directory_path();
+            tempPath += L"\\test_workspace_" + std::to_wstring(GetTickCount64()) + L".json";
+
+            std::wofstream file(tempPath);
+            file << content;
+            file.close();
+
+            return tempPath;
+        }
+
+        void DeleteTempFile(const std::wstring& filePath)
+        {
+            if (std::filesystem::exists(filePath))
+            {
+                std::filesystem::remove(filePath);
+            }
+        }
+
+    public:
+        TEST_METHOD (ReadSingleWorkspace_NonExistentFile_ReturnsEmptyWorkspace)
+        {
+            // Arrange
+            std::wstring nonExistentFile = L"C:\\NonExistent\\File.json";
+
+            // Act
+            auto result = JsonUtils::ReadSingleWorkspace(nonExistentFile);
+
+            // Assert
+            Assert::IsTrue(result.isOk());
+            auto workspace = result.value();
+            Assert::IsTrue(workspace.name.empty());
+        }
+
+        TEST_METHOD (ReadSingleWorkspace_InvalidJsonFile_ReturnsError)
+        {
+            // Arrange
+            std::wstring tempFile = CreateTempJsonFile(L"invalid json content {");
+
+            // Act
+            auto result = JsonUtils::ReadSingleWorkspace(tempFile);
+
+            // Assert
+            Assert::IsTrue(result.isError());
+            Assert::AreEqual(static_cast<int>(JsonUtils::WorkspacesFileError::IncorrectFileError),
+                             static_cast<int>(result.error()));
+
+            // Cleanup
+            DeleteTempFile(tempFile);
+        }
+
+        TEST_METHOD (ReadWorkspaces_NonExistentFile_ReturnsEmptyVector)
+        {
+            // Arrange
+            std::wstring nonExistentFile = L"C:\\NonExistent\\File.json";
+
+            // Act
+            auto result = JsonUtils::ReadWorkspaces(nonExistentFile);
+
+            // Assert
+            Assert::IsTrue(result.isError());
+            Assert::AreEqual(static_cast<int>(JsonUtils::WorkspacesFileError::IncorrectFileError),
+                             static_cast<int>(result.error()));
+        }
+
+        TEST_METHOD (ReadWorkspaces_InvalidJsonFile_ReturnsError)
+        {
+            // Arrange
+            std::wstring tempFile = CreateTempJsonFile(L"invalid json content {");
+
+            // Act
+            auto result = JsonUtils::ReadWorkspaces(tempFile);
+
+            // Assert
+            Assert::IsTrue(result.isError());
+            Assert::AreEqual(static_cast<int>(JsonUtils::WorkspacesFileError::IncorrectFileError),
+                             static_cast<int>(result.error()));
+
+            // Cleanup
+            DeleteTempFile(tempFile);
+        }
+
+        TEST_METHOD (Write_ValidWorkspace_ReturnsTrue)
+        {
+            // Arrange
+            std::wstring tempPath = std::filesystem::temp_directory_path();
+            tempPath += L"\\test_write_workspace_" + std::to_wstring(GetTickCount64()) + L".json";
+
+            WorkspacesData::WorkspacesProject workspace;
+            workspace.name = L"Test Workspace";
+
+            // Convert string to time_t
+            std::tm tm = {};
+            workspace.creationTime = std::mktime(&tm);
+
+            // Act
+            bool result = JsonUtils::Write(tempPath, workspace);
+
+            // Assert
+            Assert::IsTrue(result);
+            Assert::IsTrue(std::filesystem::exists(tempPath));
+
+            // Cleanup
+            DeleteTempFile(tempPath);
+        }
+
+        TEST_METHOD (Write_ValidWorkspacesList_ReturnsTrue)
+        {
+            // Arrange
+            std::wstring tempPath = std::filesystem::temp_directory_path();
+            tempPath += L"\\test_write_workspaces_" + std::to_wstring(GetTickCount64()) + L".json";
+
+            std::vector<WorkspacesData::WorkspacesProject> workspaces;
+
+            WorkspacesData::WorkspacesProject workspace1;
+            workspace1.name = L"Test Workspace 1";
+            workspace1.creationTime = std::time(nullptr);
+
+            WorkspacesData::WorkspacesProject workspace2;
+            workspace2.name = L"Test Workspace 2";
+            workspace2.creationTime = std::time(nullptr);
+
+            workspaces.push_back(workspace1);
+            workspaces.push_back(workspace2);
+
+            // Act
+            bool result = JsonUtils::Write(tempPath, workspaces);
+
+            // Assert
+            Assert::IsTrue(result);
+            Assert::IsTrue(std::filesystem::exists(tempPath));
+
+            // Cleanup
+            DeleteTempFile(tempPath);
+        }
+
+        TEST_METHOD (Write_EmptyWorkspacesList_ReturnsTrue)
+        {
+            // Arrange
+            std::wstring tempPath = std::filesystem::temp_directory_path();
+            tempPath += L"\\test_write_empty_" + std::to_wstring(GetTickCount64()) + L".json";
+
+            std::vector<WorkspacesData::WorkspacesProject> emptyWorkspaces;
+
+            // Act
+            bool result = JsonUtils::Write(tempPath, emptyWorkspaces);
+
+            // Assert
+            Assert::IsTrue(result);
+            Assert::IsTrue(std::filesystem::exists(tempPath));
+
+            // Cleanup
+            DeleteTempFile(tempPath);
+        }
+
+        /*
+        TEST_METHOD(Write_InvalidPath_ReturnsFalse)
+        {
+            // Arrange
+            std::wstring invalidPath = L"C:\\NonExistent\\Path\\workspace.json";
+            
+            WorkspacesData::WorkspacesProject workspace;
+            workspace.name = L"Test Workspace";
+            workspace.creationTime = std::time(nullptr);
+
+            // Act
+            bool result = JsonUtils::Write(invalidPath, workspace);
+
+            // Assert
+            Assert::IsFalse(result);
+        }
+        */
+    };
+}
--- a/src/modules/Workspaces/WorkspacesLib.UnitTests/PwaHelperTests.cpp
+++ b/src/modules/Workspaces/WorkspacesLib.UnitTests/PwaHelperTests.cpp
@@ -0,0 +1,114 @@
+#include "pch.h"
+
+using namespace Microsoft::VisualStudio::CppUnitTestFramework;
+
+namespace WorkspacesLibUnitTests
+{
+    TEST_CLASS (PwaHelperTests)
+    {
+    public:
+        TEST_METHOD (PwaHelper_Constructor_DoesNotThrow)
+        {
+            // Act & Assert - Constructor should not crash when called
+            try
+            {
+                Utils::PwaHelper helper;
+                // If we get here, the constructor didn't throw
+                Assert::IsTrue(true);
+            }
+            catch (...)
+            {
+                Assert::Fail(L"PwaHelper constructor should not throw exceptions");
+            }
+        }
+
+        TEST_METHOD (PwaHelper_GetEdgeAppId_EmptyAumid_ReturnsEmpty)
+        {
+            // Arrange
+            Utils::PwaHelper helper;
+            std::wstring emptyAumid = L"";
+
+            // Act
+            auto result = helper.GetEdgeAppId(emptyAumid);
+
+            // Assert
+            Assert::IsFalse(result.has_value());
+        }
+
+        TEST_METHOD (PwaHelper_GetChromeAppId_EmptyAumid_ReturnsEmpty)
+        {
+            // Arrange
+            Utils::PwaHelper helper;
+            std::wstring emptyAumid = L"";
+
+            // Act
+            auto result = helper.GetChromeAppId(emptyAumid);
+
+            // Assert
+            Assert::IsFalse(result.has_value());
+        }
+
+        TEST_METHOD (PwaHelper_SearchPwaName_EmptyParameters_ReturnsEmpty)
+        {
+            // Arrange
+            Utils::PwaHelper helper;
+            std::wstring emptyPwaAppId = L"";
+            std::wstring emptyWindowAumid = L"";
+
+            // Act
+            std::wstring result = helper.SearchPwaName(emptyPwaAppId, emptyWindowAumid);
+
+            // Assert
+            Assert::IsTrue(result.empty());
+        }
+
+        TEST_METHOD (PwaHelper_SearchPwaName_NonExistentIds_ReturnsEmpty)
+        {
+            // Arrange
+            Utils::PwaHelper helper;
+            std::wstring nonExistentPwaAppId = L"nonexistent_app_id";
+            std::wstring nonExistentWindowAumid = L"nonexistent_aumid";
+
+            // Act
+            std::wstring result = helper.SearchPwaName(nonExistentPwaAppId, nonExistentWindowAumid);
+
+            // TODO: is it really expected?
+            Assert::IsTrue(result == nonExistentWindowAumid);
+        }
+
+        TEST_METHOD (PwaHelper_GetAUMIDFromWindow_InvalidWindow_ReturnsEmpty)
+        {
+            // Arrange
+            Utils::PwaHelper helper;
+            HWND invalidWindow = nullptr;
+
+            // Act
+            std::wstring result = helper.GetAUMIDFromWindow(invalidWindow);
+
+            // Assert
+            Assert::IsTrue(result.empty());
+        }
+
+        TEST_METHOD (PwaHelper_GetEdgeAppId_ValidConstruction_DoesNotCrash)
+        {
+            // Arrange
+            Utils::PwaHelper helper;
+            std::wstring testAumid = L"Microsoft.MicrosoftEdge_8wekyb3d8bbwe!App";
+
+            // Act & Assert - Should not crash
+            auto result = helper.GetEdgeAppId(testAumid);
+            // Result can be empty or have value, but should not crash
+        }
+
+        TEST_METHOD (PwaHelper_GetChromeAppId_ValidConstruction_DoesNotCrash)
+        {
+            // Arrange
+            Utils::PwaHelper helper;
+            std::wstring testAumid = L"Chrome.App.TestId";
+
+            // Act & Assert - Should not crash
+            auto result = helper.GetChromeAppId(testAumid);
+            // Result can be empty or have value, but should not crash
+        }
+    };
+}
--- a/src/modules/Workspaces/WorkspacesLib.UnitTests/StringUtilsTests.cpp
+++ b/src/modules/Workspaces/WorkspacesLib.UnitTests/StringUtilsTests.cpp
@@ -0,0 +1,115 @@
+#include "pch.h"
+#include <StringUtils.h>
+
+using namespace Microsoft::VisualStudio::CppUnitTestFramework;
+
+namespace WorkspacesLibUnitTests
+{
+    TEST_CLASS(StringUtilsTests)
+    {
+    public:
+        TEST_METHOD(CaseInsensitiveEquals_SameStrings_ReturnsTrue)
+        {
+            // Arrange
+            std::wstring str1 = L"test";
+            std::wstring str2 = L"test";
+
+            // Act
+            bool result = StringUtils::CaseInsensitiveEquals(str1, str2);
+
+            // Assert
+            Assert::IsTrue(result);
+        }
+
+        TEST_METHOD(CaseInsensitiveEquals_DifferentCase_ReturnsTrue)
+        {
+            // Arrange
+            std::wstring str1 = L"Test";
+            std::wstring str2 = L"TEST";
+
+            // Act
+            bool result = StringUtils::CaseInsensitiveEquals(str1, str2);
+
+            // Assert
+            Assert::IsTrue(result);
+        }
+
+        TEST_METHOD(CaseInsensitiveEquals_MixedCase_ReturnsTrue)
+        {
+            // Arrange
+            std::wstring str1 = L"TeSt StRiNg";
+            std::wstring str2 = L"test STRING";
+
+            // Act
+            bool result = StringUtils::CaseInsensitiveEquals(str1, str2);
+
+            // Assert
+            Assert::IsTrue(result);
+        }
+
+        TEST_METHOD(CaseInsensitiveEquals_DifferentStrings_ReturnsFalse)
+        {
+            // Arrange
+            std::wstring str1 = L"test";
+            std::wstring str2 = L"different";
+
+            // Act
+            bool result = StringUtils::CaseInsensitiveEquals(str1, str2);
+
+            // Assert
+            Assert::IsFalse(result);
+        }
+
+        TEST_METHOD(CaseInsensitiveEquals_DifferentLengths_ReturnsFalse)
+        {
+            // Arrange
+            std::wstring str1 = L"test";
+            std::wstring str2 = L"testing";
+
+            // Act
+            bool result = StringUtils::CaseInsensitiveEquals(str1, str2);
+
+            // Assert
+            Assert::IsFalse(result);
+        }
+
+        TEST_METHOD(CaseInsensitiveEquals_EmptyStrings_ReturnsTrue)
+        {
+            // Arrange
+            std::wstring str1 = L"";
+            std::wstring str2 = L"";
+
+            // Act
+            bool result = StringUtils::CaseInsensitiveEquals(str1, str2);
+
+            // Assert
+            Assert::IsTrue(result);
+        }
+
+        TEST_METHOD(CaseInsensitiveEquals_OneEmpty_ReturnsFalse)
+        {
+            // Arrange
+            std::wstring str1 = L"test";
+            std::wstring str2 = L"";
+
+            // Act
+            bool result = StringUtils::CaseInsensitiveEquals(str1, str2);
+
+            // Assert
+            Assert::IsFalse(result);
+        }
+
+        TEST_METHOD(CaseInsensitiveEquals_SpecialCharacters_ReturnsTrue)
+        {
+            // Arrange
+            std::wstring str1 = L"Test-123_Special!";
+            std::wstring str2 = L"test-123_special!";
+
+            // Act
+            bool result = StringUtils::CaseInsensitiveEquals(str1, str2);
+
+            // Assert
+            Assert::IsTrue(result);
+        }
+    };
+}
--- a/src/modules/Workspaces/WorkspacesLib.UnitTests/WorkspacesDataTests.cpp
+++ b/src/modules/Workspaces/WorkspacesLib.UnitTests/WorkspacesDataTests.cpp
@@ -0,0 +1,194 @@
+#include "pch.h"
+
+using namespace Microsoft::VisualStudio::CppUnitTestFramework;
+
+namespace WorkspacesLibUnitTests
+{
+    TEST_CLASS(WorkspacesDataTests)
+    {
+    public:
+        TEST_METHOD(WorkspacesFile_ReturnsValidPath)
+        {
+            // Act
+            std::wstring result = WorkspacesData::WorkspacesFile();
+
+            // Assert
+            Assert::IsFalse(result.empty());
+            Assert::IsTrue(result.find(L"workspaces.json") != std::wstring::npos);
+        }
+
+        TEST_METHOD(TempWorkspacesFile_ReturnsValidPath)
+        {
+            // Act
+            std::wstring result = WorkspacesData::TempWorkspacesFile();
+
+            // Assert
+            Assert::IsFalse(result.empty());
+            Assert::IsTrue(result.find(L"temp-workspaces.json") != std::wstring::npos);
+        }
+
+        TEST_METHOD(WorkspacesFile_TempWorkspacesFile_DifferentPaths)
+        {
+            // Act
+            std::wstring workspacesFile = WorkspacesData::WorkspacesFile();
+            std::wstring tempWorkspacesFile = WorkspacesData::TempWorkspacesFile();
+
+            // Assert
+            Assert::AreNotEqual(workspacesFile, tempWorkspacesFile);
+        }
+
+        TEST_METHOD(Position_ToRect_ConvertsCorrectly)
+        {
+            // Arrange
+            WorkspacesData::WorkspacesProject::Application::Position position;
+            position.x = 100;
+            position.y = 200;
+            position.width = 800;
+            position.height = 600;
+
+            // Act
+            RECT rect = position.toRect();
+
+            // Assert
+            Assert::AreEqual(100, static_cast<int>(rect.left));
+            Assert::AreEqual(200, static_cast<int>(rect.top));
+            Assert::AreEqual(900, static_cast<int>(rect.right)); // x + width
+            Assert::AreEqual(800, static_cast<int>(rect.bottom)); // y + height
+        }
+
+        TEST_METHOD(Position_ToRect_ZeroPosition)
+        {
+            // Arrange
+            WorkspacesData::WorkspacesProject::Application::Position position;
+            position.x = 0;
+            position.y = 0;
+            position.width = 0;
+            position.height = 0;
+
+            // Act
+            RECT rect = position.toRect();
+
+            // Assert
+            Assert::AreEqual(0, static_cast<int>(rect.left));
+            Assert::AreEqual(0, static_cast<int>(rect.top));
+            Assert::AreEqual(0, static_cast<int>(rect.right));
+            Assert::AreEqual(0, static_cast<int>(rect.bottom));
+        }
+
+        TEST_METHOD(Position_ToRect_NegativeCoordinates)
+        {
+            // Arrange
+            WorkspacesData::WorkspacesProject::Application::Position position;
+            position.x = -100;
+            position.y = -50;
+            position.width = 200;
+            position.height = 150;
+
+            // Act
+            RECT rect = position.toRect();
+
+            // Assert
+            Assert::AreEqual(-100, static_cast<int>(rect.left));
+            Assert::AreEqual(-50, static_cast<int>(rect.top));
+            Assert::AreEqual(100, static_cast<int>(rect.right)); // -100 + 200
+            Assert::AreEqual(100, static_cast<int>(rect.bottom)); // -50 + 150
+        }
+
+        TEST_METHOD(Application_DefaultValues)
+        {
+            // Arrange & Act
+            WorkspacesData::WorkspacesProject::Application app;
+
+            // Assert
+            Assert::IsTrue(app.id.empty());
+            Assert::IsTrue(app.name.empty());
+            Assert::IsTrue(app.title.empty());
+            Assert::IsTrue(app.path.empty());
+            Assert::IsTrue(app.packageFullName.empty());
+            Assert::IsTrue(app.appUserModelId.empty());
+            Assert::IsTrue(app.pwaAppId.empty());
+            Assert::IsTrue(app.commandLineArgs.empty());
+            Assert::IsFalse(app.isElevated);
+            Assert::IsFalse(app.canLaunchElevated);
+            Assert::IsFalse(app.isMinimized);
+            Assert::IsFalse(app.isMaximized);
+            Assert::AreEqual(0, static_cast<int>(app.position.x));
+            Assert::AreEqual(0, static_cast<int>(app.position.y));
+            Assert::AreEqual(0, static_cast<int>(app.position.width));
+            Assert::AreEqual(0, static_cast<int>(app.position.height));
+            Assert::AreEqual(0u, static_cast<unsigned int>(app.monitor));
+        }
+
+        TEST_METHOD(Application_Comparison_EqualObjects)
+        {
+            // Arrange
+            WorkspacesData::WorkspacesProject::Application app1;
+            app1.id = L"test-id";
+            app1.name = L"Test App";
+            app1.position.x = 100;
+            app1.position.y = 200;
+
+            WorkspacesData::WorkspacesProject::Application app2;
+            app2.id = L"test-id";
+            app2.name = L"Test App";
+            app2.position.x = 100;
+            app2.position.y = 200;
+
+            // Act & Assert
+            Assert::IsTrue(app1 == app2);
+        }
+
+        TEST_METHOD(Application_Comparison_DifferentObjects)
+        {
+            // Arrange
+            WorkspacesData::WorkspacesProject::Application app1;
+            app1.id = L"test-id-1";
+            app1.name = L"Test App 1";
+
+            WorkspacesData::WorkspacesProject::Application app2;
+            app2.id = L"test-id-2";
+            app2.name = L"Test App 2";
+
+            // Act & Assert
+            Assert::IsTrue(app1 != app2);
+        }
+
+        TEST_METHOD(Position_Comparison_EqualPositions)
+        {
+            // Arrange
+            WorkspacesData::WorkspacesProject::Application::Position pos1;
+            pos1.x = 100;
+            pos1.y = 200;
+            pos1.width = 800;
+            pos1.height = 600;
+
+            WorkspacesData::WorkspacesProject::Application::Position pos2;
+            pos2.x = 100;
+            pos2.y = 200;
+            pos2.width = 800;
+            pos2.height = 600;
+
+            // Act & Assert
+            Assert::IsTrue(pos1 == pos2);
+        }
+
+        TEST_METHOD(Position_Comparison_DifferentPositions)
+        {
+            // Arrange
+            WorkspacesData::WorkspacesProject::Application::Position pos1;
+            pos1.x = 100;
+            pos1.y = 200;
+            pos1.width = 800;
+            pos1.height = 600;
+
+            WorkspacesData::WorkspacesProject::Application::Position pos2;
+            pos2.x = 150;
+            pos2.y = 200;
+            pos2.width = 800;
+            pos2.height = 600;
+
+            // Act & Assert
+            Assert::IsTrue(pos1 != pos2);
+        }
+    };
+}
--- a/src/modules/Workspaces/WorkspacesLib.UnitTests/WorkspacesLibUnitTests.vcxproj
+++ b/src/modules/Workspaces/WorkspacesLib.UnitTests/WorkspacesLibUnitTests.vcxproj
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A85D4D9F-9A39-4B5D-8B5A-9F2D5C9A8B4C}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>WorkspacesLibUnitTests</RootNamespace>
+    <ProjectName>WorkspacesLibUnitTests</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\tests\Workspaces\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\;..\WorkspacesLib\;$(SolutionDir)src\;$(SolutionDir)src\common;$(SolutionDir)src\common\Telemetry;..\..\;..\..\..\;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <UseFullPaths>true</UseFullPaths>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\\lib;$(SolutionDir)$(Platform)\\$(Configuration)\\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>propsys.lib;comctl32.lib;pathcch.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="targetver.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="WorkspacesDataTests.cpp" />
+    <ClCompile Include="StringUtilsTests.cpp" />
+    <ClCompile Include="JsonUtilsTests.cpp" />
+    <ClCompile Include="AppUtilsTests.cpp" />
+    <ClCompile Include="PwaHelperTests.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\WorkspacesLib\WorkspacesLib.vcxproj">
+      <Project>{b31fcc55-b5a4-4ea7-b414-2dceae6af332}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
+</Project>
--- a/src/modules/Workspaces/WorkspacesLib.UnitTests/WorkspacesLibUnitTests.vcxproj.filters
+++ b/src/modules/Workspaces/WorkspacesLib.UnitTests/WorkspacesLibUnitTests.vcxproj.filters
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="targetver.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="pch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="WorkspacesDataTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="StringUtilsTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="JsonUtilsTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="AppUtilsTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PwaHelperTests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>
--- a/src/modules/Workspaces/WorkspacesLib.UnitTests/packages.config
+++ b/src/modules/Workspaces/WorkspacesLib.UnitTests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
+</packages>
--- a/src/modules/Workspaces/WorkspacesLib.UnitTests/pch.cpp
+++ b/src/modules/Workspaces/WorkspacesLib.UnitTests/pch.cpp
@@ -0,0 +1 @@
+#include "pch.h"
--- a/src/modules/Workspaces/WorkspacesLib.UnitTests/pch.h
+++ b/src/modules/Workspaces/WorkspacesLib.UnitTests/pch.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "targetver.h"
+
+// Headers for CppUnitTest
+#pragma warning(disable : 26466)
+#include "CppUnitTest.h"
+
+// Windows headers
+#include <windows.h>
+#include <string>
+#include <memory>
+#include <vector>
+#include <optional>
+
+// Workspaces headers
+#include <WorkspacesLib/WorkspacesData.h>
+#include <WorkspacesLib/JsonUtils.h>
+#include <WorkspacesLib/Result.h>
+#include <WorkspacesLib/AppUtils.h>
+#include <WorkspacesLib/PwaHelper.h>
--- a/src/modules/Workspaces/WorkspacesLib.UnitTests/targetver.h
+++ b/src/modules/Workspaces/WorkspacesLib.UnitTests/targetver.h
@@ -0,0 +1,8 @@
+#pragma once
+
+// Including SDKDDKVer.h defines the highest available Windows platform.
+
+// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
+// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
+
+#include <SDKDDKVer.h>
--- a/src/modules/Workspaces/WorkspacesLib/StringUtils.h
+++ b/src/modules/Workspaces/WorkspacesLib/StringUtils.h
@@ -6,7 +6,7 @@

 namespace StringUtils
 {
-    bool CaseInsensitiveEquals(const std::wstring& str1, const std::wstring& str2)
+    inline bool CaseInsensitiveEquals(const std::wstring& str1, const std::wstring& str2)
    {
        if (str1.size() != str2.size())
        {
--- a/src/modules/Workspaces/WorkspacesLib/WorkspacesData.h
+++ b/src/modules/Workspaces/WorkspacesLib/WorkspacesData.h
@@ -69,10 +69,10 @@ namespace WorkspacesData

        std::wstring id;
        std::wstring name;
-        time_t creationTime;
+        time_t creationTime{};
        std::optional<time_t> lastLaunchedTime;
-        bool isShortcutNeeded;
-        bool moveExistingWindows;
+        bool isShortcutNeeded{};
+        bool moveExistingWindows{};
        std::vector<Monitor> monitors;
        std::vector<Application> apps;
    };