From fcd4f67c477e5a4f2542635c3758522d29c367b9 Mon Sep 17 00:00:00 2001
From: Janez T <hey@dz0ny.dev>
Date: Tue, 25 Feb 2025 11:01:58 +0000
Subject: [PATCH] feat: add test plan and update scheme configuration for
 improved test management

---
 Pareto Security.xcodeproj/project.pbxproj     |   2 +
 .../xcschemes/Pareto Security.xcscheme        | 132 +++---------------
 Pareto Security.xctestplan                    |  31 ++++
 Pareto/Info.plist                             |   2 +-
 4 files changed, 51 insertions(+), 116 deletions(-)
 create mode 100644 Pareto Security.xctestplan

diff --git a/Pareto Security.xcodeproj/project.pbxproj b/Pareto Security.xcodeproj/project.pbxproj
index 5427c29c..9a4b866d 100644
--- a/Pareto Security.xcodeproj/project.pbxproj	
+++ b/Pareto Security.xcodeproj/project.pbxproj	
@@ -382,6 +382,7 @@
 		4FB7C68026AFF25300FB1C41 /* Date.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Date.swift; sourceTree = "<group>"; };
 		4FB7C68626AFF29A00FB1C41 /* NSImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSImage.swift; sourceTree = "<group>"; };
 		4FB7C68C26AFFD2600FB1C41 /* FileVault.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileVault.swift; sourceTree = "<group>"; };
+		4FC45C902D6DD9F300915471 /* Pareto Security.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = "Pareto Security.xctestplan"; sourceTree = "<group>"; };
 		4FC81A4926C41DC8006EABA8 /* ParetoSecurityTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ParetoSecurityTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		4FC81A4B26C41DC8006EABA8 /* ParetoSecurityTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ParetoSecurityTests.swift; sourceTree = "<group>"; };
 		4FCAA78A2B4AD7C300A62B4E /* NoAdminUser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NoAdminUser.swift; sourceTree = "<group>"; };
@@ -673,6 +674,7 @@
 		4FEBA2E5269CD48F009B2469 = {
 			isa = PBXGroup;
 			children = (
+				4FC45C902D6DD9F300915471 /* Pareto Security.xctestplan */,
 				4F196CD72714C1C600A2A7B8 /* JWT.playground */,
 				4F343A5D26F7A3C8007D2F7D /* API.playground */,
 				4FEBA2F0269CD48F009B2469 /* Pareto */,
diff --git a/Pareto Security.xcodeproj/xcshareddata/xcschemes/Pareto Security.xcscheme b/Pareto Security.xcodeproj/xcshareddata/xcschemes/Pareto Security.xcscheme
index 6fe67ac3..a2cb45f1 100644
--- a/Pareto Security.xcodeproj/xcshareddata/xcschemes/Pareto Security.xcscheme	
+++ b/Pareto Security.xcodeproj/xcshareddata/xcschemes/Pareto Security.xcscheme	
@@ -26,32 +26,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "NO"
-      systemAttachmentLifetime = "keepNever"
-      userAttachmentLifetime = "keepAlways"
-      codeCoverageEnabled = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "4FEBA2ED269CD48F009B2469"
-            BuildableName = "Pareto Security.app"
-            BlueprintName = "Pareto Security"
-            ReferencedContainer = "container:Pareto Security.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <CommandLineArguments>
-         <CommandLineArgument
-            argument = "isRunningTests"
-            isEnabled = "YES">
-         </CommandLineArgument>
-      </CommandLineArguments>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "isRunningTests"
-            value = "YES"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:Pareto Security.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -62,93 +43,16 @@
                BlueprintName = "ParetoSecurityTests"
                ReferencedContainer = "container:Pareto Security.xcodeproj">
             </BuildableReference>
-            <SelectedTests>
-               <Test
-                  Identifier = "CheckIntegrationTest">
-               </Test>
-               <Test
-                  Identifier = "LicenseTest/testPersonaLicense()">
-               </Test>
-               <Test
-                  Identifier = "LicenseTest/testPersonaLicenseFail()">
-               </Test>
-               <Test
-                  Identifier = "LicenseTest/testPersonaLicenseVerify()">
-               </Test>
-               <Test
-                  Identifier = "LicenseTest/testProcessAction()">
-               </Test>
-               <Test
-                  Identifier = "LicenseTest/testTeamTicket()">
-               </Test>
-               <Test
-                  Identifier = "LicenseTest/testTeamTicketFail()">
-               </Test>
-               <Test
-                  Identifier = "ParetoAppTest/testActionApp()">
-               </Test>
-               <Test
-                  Identifier = "ParetoAppTest/testActionEnrollPersonal()">
-               </Test>
-               <Test
-                  Identifier = "ParetoAppTest/testActionEnrollTeam()">
-               </Test>
-               <Test
-                  Identifier = "ParetoSecurityTests/testAppInfo()">
-               </Test>
-               <Test
-                  Identifier = "ParetoSecurityTests/testSnooze()">
-               </Test>
-               <Test
-                  Identifier = "ParetoSecurityTests/testThatUUIDsAreUnique()">
-               </Test>
-               <Test
-                  Identifier = "SettingsViewTests/testAbout()">
-               </Test>
-               <Test
-                  Identifier = "SettingsViewTests/testLicense()">
-               </Test>
-               <Test
-                  Identifier = "SettingsViewTests/testSettingsView()">
-               </Test>
-               <Test
-                  Identifier = "SettingsViewTests/testTeam()">
-               </Test>
-               <Test
-                  Identifier = "SoftwareUpdatesTest/testAppVersionFetchers()">
-               </Test>
-               <Test
-                  Identifier = "TeamsTest/testLink()">
-               </Test>
-               <Test
-                  Identifier = "TeamsTest/testReport()">
-               </Test>
-               <Test
-                  Identifier = "TeamsTest/testSettings()">
-               </Test>
-               <Test
-                  Identifier = "UpdaterTest/testParsing()">
-               </Test>
-               <Test
-                  Identifier = "WelcomeTest/testChecksViewShow()">
-               </Test>
-               <Test
-                  Identifier = "WelcomeTest/testEndViewShow()">
-               </Test>
-               <Test
-                  Identifier = "WelcomeTest/testIntroViewShow()">
-               </Test>
-               <Test
-                  Identifier = "WelcomeTest/testPermissionsViewShow()">
-               </Test>
-               <Test
-                  Identifier = "WelcomeTest/testWelcomeViewShow()">
-               </Test>
-            </SelectedTests>
-            <LocationScenarioReference
-               identifier = "London, England"
-               referenceType = "1">
-            </LocationScenarioReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "4FC81A4826C41DC8006EABA8"
+               BuildableName = "ParetoSecurityTests.xctest"
+               BlueprintName = "ParetoSecurityTests"
+               ReferencedContainer = "container:Pareto Security.xcodeproj">
+            </BuildableReference>
          </TestableReference>
          <TestableReference
             skipped = "NO">
@@ -159,8 +63,6 @@
                BlueprintName = "ParetoSecurityUITests"
                ReferencedContainer = "container:Pareto Security.xcodeproj">
             </BuildableReference>
-            <SelectedTests>
-            </SelectedTests>
          </TestableReference>
       </Testables>
    </TestAction>
diff --git a/Pareto Security.xctestplan b/Pareto Security.xctestplan
new file mode 100644
index 00000000..a40ab962
--- /dev/null
+++ b/Pareto Security.xctestplan	
@@ -0,0 +1,31 @@
+{
+  "configurations" : [
+    {
+      "id" : "889B0DFB-1770-41A5-982E-086C58186B4C",
+      "name" : "Configuration 1",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:Pareto Security.xcodeproj",
+        "identifier" : "4FC81A4826C41DC8006EABA8",
+        "name" : "ParetoSecurityTests"
+      }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:Pareto Security.xcodeproj",
+        "identifier" : "4F6A92EE26C555C6006C2F2D",
+        "name" : "ParetoSecurityUITests"
+      }
+    }
+  ],
+  "version" : 1
+}
diff --git a/Pareto/Info.plist b/Pareto/Info.plist
index 74f1b12b..d35031f0 100644
--- a/Pareto/Info.plist
+++ b/Pareto/Info.plist
@@ -26,7 +26,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>5587</string>
+	<string>5593</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>