Skip to content

AINFRA-780 - Make HardwareTests a Swift package test target #15789

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

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
+45 −635
Open

AINFRA-780 - Make HardwareTests a Swift package test target #15789

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
509 changes: 0 additions & 509 deletions Hardware/Hardware.xcodeproj/project.pbxproj
View file
Open in desktop

This file was deleted.

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

This file was deleted.

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

This file was deleted.

9 changes: 7 additions & 2 deletions Modules/.swiftpm/xcode/xcshareddata/xcschemes/Hardware.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/HardwareTests/HardwareTests.xctestplan"
default = "YES">
</TestPlanReference>
</TestPlans>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand Down
14 changes: 6 additions & 8 deletions Modules/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,12 @@ let package = Package(
.product(name: "AutomatticTracks", package: "Automattic-Tracks-iOS"),
]
),
.testTarget(
name: "HardwareTests",
dependencies: [
"Hardware"
]
),
.testTarget(
name: "WooFoundationTests",
dependencies: ["TestKit", .target(name: "WooFoundation")]
Expand Down Expand Up @@ -260,7 +266,6 @@ let package = Package(

enum XcodeTargetNames {
static let fakes = "Fakes"
static let hardwareTests = "HardwareTests"
static let networkingTests = "NetworkingTests"
static let notificationExtension = "NotificationExtension"
static let storageTests = "StorageTests"
Expand All @@ -279,7 +284,6 @@ enum XcodeTargetNames {
enum XcodeSupport {
static var products: [Product] {
[
XcodeTargetNames.hardwareTests,
XcodeTargetNames.networkingTests,
XcodeTargetNames.notificationExtension,
XcodeTargetNames.storageTests,
Expand All @@ -298,12 +302,6 @@ enum XcodeSupport {

static var targets: [Target] {
[
.xcodeTarget(
XcodeTargetNames.hardwareTests,
dependencies: [
"Hardware"
]
),
.xcodeTarget(
XcodeTargetNames.networkingTests,
dependencies: [
Expand Down
0 ...AirPrintReceipt/ReceiptRendererTest.swift → ...AirPrintReceipt/ReceiptRendererTest.swift
View file
Open in desktop
File renamed without changes.
0 Hardware/HardwareTests/CardBrandTests.swift → .../Tests/HardwareTests/CardBrandTests.swift
View file
Open in desktop
File renamed without changes.
0 ...rdwareTests/CardPresentDetailsTests.swift → ...rdwareTests/CardPresentDetailsTests.swift
View file
Open in desktop
File renamed without changes.
0 Hardware/HardwareTests/CardReaderTests.swift → ...Tests/HardwareTests/CardReaderTests.swift
View file
Open in desktop
File renamed without changes.
0 Hardware/HardwareTests/ChargeTests.swift → ...les/Tests/HardwareTests/ChargeTests.swift
View file
Open in desktop
File renamed without changes.
0 ...re/HardwareTests/DeclineReasonTests.swift → ...ts/HardwareTests/DeclineReasonTests.swift
View file
Open in desktop
File renamed without changes.
0 Hardware/HardwareTests/ErrorCodesTests.swift → ...Tests/HardwareTests/ErrorCodesTests.swift
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...re/HardwareTests/HardwareTests.xctestplan → ...ts/HardwareTests/HardwareTests.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:Hardware.xcodeproj",
"identifier" : "D88FDB0725DD216B00CB0DBD",
"containerPath" : "container:",
"identifier" : "HardwareTests",
"name" : "HardwareTests"
}
}
Expand Down
0 .../Mocks/MockStripeCardPresentDetails.swift → .../Mocks/MockStripeCardPresentDetails.swift
View file
Open in desktop
File renamed without changes.
0 ...areTests/Mocks/MockStripeCardReader.swift → ...areTests/Mocks/MockStripeCardReader.swift
View file
Open in desktop
File renamed without changes.
0 ...ardwareTests/Mocks/MockStripeCharge.swift → ...ardwareTests/Mocks/MockStripeCharge.swift
View file
Open in desktop
File renamed without changes.
0 ...Tests/Mocks/MockStripePaymentIntent.swift → ...Tests/Mocks/MockStripePaymentIntent.swift
View file
Open in desktop
File renamed without changes.
0 ...ests/Mocks/MockStripeReceiptDetails.swift → ...ests/Mocks/MockStripeReceiptDetails.swift
View file
Open in desktop
File renamed without changes.
0 ...areTests/PaymentIntentMetadataTests.swift → ...areTests/PaymentIntentMetadataTests.swift
View file
Open in desktop
File renamed without changes.
0 ...eTests/PaymentIntentParametersTests.swift → ...eTests/PaymentIntentParametersTests.swift
View file
Open in desktop
File renamed without changes.
0 ...re/HardwareTests/PaymentIntentTests.swift → ...ts/HardwareTests/PaymentIntentTests.swift
View file
Open in desktop
File renamed without changes.
0 ...e/HardwareTests/ReceiptDetailsTests.swift → ...s/HardwareTests/ReceiptDetailsTests.swift
View file
Open in desktop
File renamed without changes.
0 ...peRefundAfterFailureDeterminerTests.swift → ...peRefundAfterFailureDeterminerTests.swift
View file
Open in desktop
File renamed without changes.
0 ...areTests/StripeCardReaderCacheTests.swift → ...areTests/StripeCardReaderCacheTests.swift
View file
Open in desktop
File renamed without changes.
0 ...reTests/UnderlyingError+StripeTests.swift → ...reTests/UnderlyingError+StripeTests.swift
View file
Open in desktop
File renamed without changes.
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.

60 changes: 30 additions & 30 deletions WooCommerce/WooCommerceTests/UnitTests.xctestplan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,29 +32,15 @@
{
"target" : {
"containerPath" : "container:..\/Modules",
"identifier" : "WordPressSharedTests",
"name" : "WordPressSharedTests"
}
},
{
"target" : {
"containerPath" : "container:..\/Hardware\/Hardware.xcodeproj",
"identifier" : "D88FDB0725DD216B00CB0DBD",
"name" : "HardwareTests"
}
},
{
"target" : {
"containerPath" : "container:..\/Storage\/Storage.xcodeproj",
"identifier" : "B54CA5A120A4BBA600F38CD1",
"name" : "StorageTests"
"identifier" : "WooFoundationTests",
"name" : "WooFoundationTests"
}
},
{
"target" : {
"containerPath" : "container:..\/Modules",
"identifier" : "WooFoundationTests",
"name" : "WooFoundationTests"
"identifier" : "WordPressSharedTests",
"name" : "WordPressSharedTests"
}
},
{
Expand All @@ -81,31 +67,38 @@
},
{
"target" : {
"containerPath" : "container:..\/Yosemite\/Yosemite.xcodeproj",
"identifier" : "B5C9DDFD2087FEC0006B910A",
"name" : "YosemiteTests"
"containerPath" : "container:..\/Modules",
"identifier" : "ExperimentsTests",
"name" : "ExperimentsTests"
}
},
{
"enabled" : false,
"target" : {
"containerPath" : "container:..\/Networking\/Networking.xcodeproj",
"identifier" : "B557D9EB209753AA005962F4",
"name" : "NetworkingTests"
"containerPath" : "container:WooCommerce.xcodeproj",
"identifier" : "3F0904072D26A40800D8ACCE",
"name" : "WordPressAuthenticatorTests"
}
},
{
"target" : {
"containerPath" : "container:..\/Modules",
"identifier" : "ExperimentsTests",
"name" : "ExperimentsTests"
"identifier" : "HardwareTests",
"name" : "HardwareTests"
}
},
{
"enabled" : false,
"target" : {
"containerPath" : "container:WooCommerce.xcodeproj",
"identifier" : "3F0904072D26A40800D8ACCE",
"name" : "WordPressAuthenticatorTests"
"containerPath" : "container:..\/Networking\/Networking.xcodeproj",
"identifier" : "B557D9EB209753AA005962F4",
"name" : "NetworkingTests"
}
},
{
"target" : {
"containerPath" : "container:..\/Yosemite\/Yosemite.xcodeproj",
"identifier" : "B5C9DDFD2087FEC0006B910A",
"name" : "YosemiteTests"
}
},
{
Expand All @@ -114,6 +107,13 @@
"identifier" : "WordPressSharedObjCTests",
"name" : "WordPressSharedObjCTests"
}
},
{
"target" : {
"containerPath" : "container:..\/Storage\/Storage.xcodeproj",
"identifier" : "B54CA5A120A4BBA600F38CD1",
"name" : "StorageTests"
}
}
],
"version" : 1
Expand Down