Skip to content

AINFRA-778 - Make StorageTests a Swift package test target #15794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 23, 2025
Merged

AINFRA-778 - Make StorageTests a Swift package test target #15794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Modules/.swiftpm/xcode/xcshareddata/xcschemes/Storage.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
17 changes: 8 additions & 9 deletions Modules/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down Expand Up @@ -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"
Expand All @@ -286,7 +293,6 @@ enum XcodeSupport {
[
XcodeTargetNames.networkingTests,
XcodeTargetNames.notificationExtension,
XcodeTargetNames.storageTests,
XcodeTargetNames.storeWidgetsExtension,
XcodeTargetNames.uiTestsFoundation,
XcodeTargetNames.wooCommerce,
Expand Down Expand Up @@ -323,13 +329,6 @@ enum XcodeSupport {
.product(name: "KeychainAccess", package: "KeychainAccess"),
]
),
.xcodeTarget(
XcodeTargetNames.storageTests,
dependencies: [
"Storage",
"TestKit"
]
),
.xcodeTarget(
XcodeTargetNames.storeWidgetsExtension,
dependencies: [
Expand Down
7 changes: 0 additions & 7 deletions Modules/Sources/XcodeSupport/XcodeTarget_StorageTests/Empty.swift
View file
Open in desktop

This file was deleted.

0 ...terativeMigrator+MigrationStepTests.swift → ...terativeMigrator+MigrationStepTests.swift
View file
Open in desktop
File renamed without changes.
0 ...Data/CoreDataIterativeMigratorTests.swift → ...Data/CoreDataIterativeMigratorTests.swift
View file
Open in desktop
File renamed without changes.
0 ...Tests/CoreData/CoreDataManagerTests.swift → ...Tests/CoreData/CoreDataManagerTests.swift
View file
Open in desktop
File renamed without changes.
0 ...a/ManagedObjectModelsInventoryTests.swift → ...a/ManagedObjectModelsInventoryTests.swift
View file
Open in desktop
File renamed without changes.
0 ...ageTests/CoreData/MappingModelTests.swift → ...ageTests/CoreData/MappingModelTests.swift
View file
Open in desktop
File renamed without changes.
0 ...torageTests/CoreData/MigrationTests.swift → ...torageTests/CoreData/MigrationTests.swift
View file
Open in desktop
File renamed without changes.
0 .../NSManagedObjectContextStorageTests.swift → .../NSManagedObjectContextStorageTests.swift
View file
Open in desktop
File renamed without changes.
0 ...ensions/NSManagedObjectStorageTests.swift → ...ensions/NSManagedObjectStorageTests.swift
View file
Open in desktop
File renamed without changes.
0 .../StorageTests/Mocks/MockFileManager.swift → .../StorageTests/Mocks/MockFileManager.swift
View file
Open in desktop
File renamed without changes.
0 ...rageTests/Mocks/MockInMemoryStorage.swift → ...rageTests/Mocks/MockInMemoryStorage.swift
View file
Open in desktop
File renamed without changes.
0 ...e/StorageTests/Mocks/SpyFileManager.swift → ...s/StorageTests/Mocks/SpyFileManager.swift
View file
Open in desktop
File renamed without changes.
0 ...Mocks/SpyPersistentStoreCoordinator.swift → ...Mocks/SpyPersistentStoreCoordinator.swift
View file
Open in desktop
File renamed without changes.
0 ...AppSettings/GeneralAppSettingsTests.swift → ...AppSettings/GeneralAppSettingsTests.swift
View file
Open in desktop
File renamed without changes.
0 ...pSettings/GeneralStoreSettingsTests.swift → ...pSettings/GeneralStoreSettingsTests.swift
View file
Open in desktop
File renamed without changes.
0 ...geTests/Model/ProductVariationTests.swift → ...geTests/Model/ProductVariationTests.swift
View file
Open in desktop
File renamed without changes.
0 ...geTests/Mock data/shipment-provider.plist → ...geTests/Resources/shipment-provider.plist
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions Storage/StorageTests/StorageTests.xctestplan → ...ests/StorageTests/StorageTests.xctestplan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"testTargets" : [
{
"target" : {
"containerPath" : "container:Storage.xcodeproj",
"identifier" : "B54CA5A120A4BBA600F38CD1",
"containerPath" : "container:",
"identifier" : "StorageTests",
"name" : "StorageTests"
}
}
Expand Down
0 ...age/StorageTests/TestKit/Assertions.swift → ...sts/StorageTests/TestKit/Assertions.swift
View file
Open in desktop
File renamed without changes.
0 Storage/StorageTests/Tools/Constants.swift → .../Tests/StorageTests/Tools/Constants.swift
View file
Open in desktop
File renamed without changes.
0 Storage/StorageTests/Tools/DummyStack.swift → ...Tests/StorageTests/Tools/DummyStack.swift
View file
Open in desktop
File renamed without changes.
0 ...StorageTests/Tools/FileStorageTests.swift → ...StorageTests/Tools/FileStorageTests.swift
View file
Open in desktop
File renamed without changes.
0 ...ools/GeneralAppSettingsStorageTests.swift → ...ools/GeneralAppSettingsStorageTests.swift
View file
Open in desktop
File renamed without changes.
0 .../NSManagedObjectContext+TestHelpers.swift → .../NSManagedObjectContext+TestHelpers.swift
View file
Open in desktop
File renamed without changes.
0 ...sts/Tools/StorageTypeDeletionsTests.swift → ...sts/Tools/StorageTypeDeletionsTests.swift
View file
Open in desktop
File renamed without changes.
0 ...ts/Tools/StorageTypeExtensionsTests.swift → ...ts/Tools/StorageTypeExtensionsTests.swift
View file
Open in desktop
File renamed without changes.
588 changes: 0 additions & 588 deletions Storage/Storage.xcodeproj/project.pbxproj
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions Storage/Storage.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Storage/Storage.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions Storage/Storage.xcodeproj/xcshareddata/xcschemes/StorageTests.xcscheme
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions Storage/StorageTests/Info.plist
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions WooCommerce.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 25 additions & 25 deletions WooCommerce/WooCommerceTests/UnitTests.xctestplan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@
"testTargets" : [
{
"target" : {
"containerPath" : "container:..\/Modules",
"identifier" : "WooFoundationTests",
"name" : "WooFoundationTests"
"containerPath" : "container:..\/Yosemite\/Yosemite.xcodeproj",
"identifier" : "B5C9DDFD2087FEC0006B910A",
"name" : "YosemiteTests"
Copy link
Contributor Author

@mokagio mokagio Jun 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Beats me why Xcode changes the order almost every time there is an edit.

}
},
{
"target" : {
"containerPath" : "container:..\/Modules",
"identifier" : "WordPressSharedTests",
"name" : "WordPressSharedTests"
"identifier" : "HardwareTests",
"name" : "HardwareTests"
}
},
{
Expand All @@ -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"
}
}
],
Expand Down