AINFRA-778 - Make StorageTests a Swift package test target

Author: mokagio

Modules/.swiftpm/xcode/xcshareddata/xcschemes/Storage.xcscheme

@@ -27,8 +27,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:Tests/StorageTests/StorageTests.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"

Modules/Package.swift

@@ -228,6 +228,14 @@ let package = Package(
                 "Hardware"
             ]
         ),
+        .testTarget(
+            name: "StorageTests",
+            dependencies: [
+                "Storage",
+                "TestKit"
+            ],
+            resources: [.process("Resources")]
+        ),
         .testTarget(
             name: "WooFoundationTests",
             dependencies: ["TestKit", .target(name: "WooFoundation")]
@@ -268,7 +276,6 @@ enum XcodeTargetNames {
     static let fakes = "Fakes"
     static let networkingTests = "NetworkingTests"
     static let notificationExtension = "NotificationExtension"
-    static let storageTests = "StorageTests"
     static let storeWidgetsExtension = "StoreWidgetsExtension"
     static let uiTestsFoundation = "UITestsFoundation"
     static let wooCommerce = "WooCommerce"
@@ -286,7 +293,6 @@ enum XcodeSupport {
         [
             XcodeTargetNames.networkingTests,
             XcodeTargetNames.notificationExtension,
-            XcodeTargetNames.storageTests,
             XcodeTargetNames.storeWidgetsExtension,
             XcodeTargetNames.uiTestsFoundation,
             XcodeTargetNames.wooCommerce,
@@ -323,13 +329,6 @@ enum XcodeSupport {
                     .product(name: "KeychainAccess", package: "KeychainAccess"),
                 ]
             ),
-            .xcodeTarget(
-                XcodeTargetNames.storageTests,
-                dependencies: [
-                    "Storage",
-                    "TestKit"
-                ]
-            ),
             .xcodeTarget(
                 XcodeTargetNames.storeWidgetsExtension,
                 dependencies: [

Modules/Sources/XcodeSupport/XcodeTarget_StorageTests/Empty.swift

@@ -14,8 +14,8 @@
   "testTargets" : [
     {
       "target" : {
-        "containerPath" : "container:Storage.xcodeproj",
-        "identifier" : "B54CA5A120A4BBA600F38CD1",
+        "containerPath" : "container:",
+        "identifier" : "StorageTests",
         "name" : "StorageTests"
       }
     }

Storage/StorageTests/CoreData/CoreDataIterativeMigrator+MigrationStepTests.swift renamed to Modules/Tests/StorageTests/CoreData/CoreDataIterativeMigrator+MigrationStepTests.swift

@@ -31,16 +31,16 @@
   "testTargets" : [
     {
       "target" : {
-        "containerPath" : "container:..\/Modules",
-        "identifier" : "WooFoundationTests",
-        "name" : "WooFoundationTests"
+        "containerPath" : "container:..\/Yosemite\/Yosemite.xcodeproj",
+        "identifier" : "B5C9DDFD2087FEC0006B910A",
+        "name" : "YosemiteTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:..\/Modules",
-        "identifier" : "WordPressSharedTests",
-        "name" : "WordPressSharedTests"
+        "identifier" : "HardwareTests",
+        "name" : "HardwareTests"
       }
     },
     {
@@ -67,52 +67,52 @@
     },
     {
       "target" : {
-        "containerPath" : "container:..\/Modules",
-        "identifier" : "ExperimentsTests",
-        "name" : "ExperimentsTests"
+        "containerPath" : "container:..\/Networking\/Networking.xcodeproj",
+        "identifier" : "B557D9EB209753AA005962F4",
+        "name" : "NetworkingTests"
       }
     },
     {
-      "enabled" : false,
       "target" : {
-        "containerPath" : "container:WooCommerce.xcodeproj",
-        "identifier" : "3F0904072D26A40800D8ACCE",
-        "name" : "WordPressAuthenticatorTests"
+        "containerPath" : "container:..\/Modules",
+        "identifier" : "WooFoundationTests",
+        "name" : "WooFoundationTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:..\/Modules",
-        "identifier" : "HardwareTests",
-        "name" : "HardwareTests"
+        "identifier" : "WordPressSharedObjCTests",
+        "name" : "WordPressSharedObjCTests"
       }
     },
     {
       "target" : {
-        "containerPath" : "container:..\/Networking\/Networking.xcodeproj",
-        "identifier" : "B557D9EB209753AA005962F4",
-        "name" : "NetworkingTests"
+        "containerPath" : "container:",
+        "identifier" : "StorageTests",
+        "name" : "StorageTests"
       }
     },
     {
       "target" : {
-        "containerPath" : "container:..\/Yosemite\/Yosemite.xcodeproj",
-        "identifier" : "B5C9DDFD2087FEC0006B910A",
-        "name" : "YosemiteTests"
+        "containerPath" : "container:..\/Modules",
+        "identifier" : "WordPressSharedTests",
+        "name" : "WordPressSharedTests"
       }
     },
     {
       "target" : {
         "containerPath" : "container:..\/Modules",
-        "identifier" : "WordPressSharedObjCTests",
-        "name" : "WordPressSharedObjCTests"
+        "identifier" : "ExperimentsTests",
+        "name" : "ExperimentsTests"
       }
     },
     {
+      "enabled" : false,
       "target" : {
-        "containerPath" : "container:..\/Storage\/Storage.xcodeproj",
-        "identifier" : "B54CA5A120A4BBA600F38CD1",
-        "name" : "StorageTests"
+        "containerPath" : "container:WooCommerce.xcodeproj",
+        "identifier" : "3F0904072D26A40800D8ACCE",
+        "name" : "WordPressAuthenticatorTests"
       }
     }
   ],