Skip to content

Commit 915a045

Browse files
committed
AINFRA-779 - Make NetworkingTests a Swift package test target
1 parent 552f49b commit 915a045

File tree

718 files changed

+43
-1618
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

718 files changed

+43
-1618
lines changed
Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES"
88
buildArchitectures = "Automatic">
9+
<BuildActionEntries>
10+
<BuildActionEntry
11+
buildForTesting = "YES"
12+
buildForRunning = "YES"
13+
buildForProfiling = "YES"
14+
buildForArchiving = "YES"
15+
buildForAnalyzing = "YES">
16+
<BuildableReference
17+
BuildableIdentifier = "primary"
18+
BlueprintIdentifier = "Networking"
19+
BuildableName = "Networking"
20+
BlueprintName = "Networking"
21+
ReferencedContainer = "container:">
22+
</BuildableReference>
23+
</BuildActionEntry>
24+
</BuildActionEntries>
925
</BuildAction>
1026
<TestAction
1127
buildConfiguration = "Debug"
@@ -14,22 +30,10 @@
1430
shouldUseLaunchSchemeArgsEnv = "YES">
1531
<TestPlans>
1632
<TestPlanReference
17-
reference = "container:NetworkingTests/NetworkingTests.xctestplan"
33+
reference = "container:Tests/NetworkingTests/NetworkingTests.xctestplan"
1834
default = "YES">
1935
</TestPlanReference>
2036
</TestPlans>
21-
<Testables>
22-
<TestableReference
23-
skipped = "NO">
24-
<BuildableReference
25-
BuildableIdentifier = "primary"
26-
BlueprintIdentifier = "B557D9EB209753AA005962F4"
27-
BuildableName = "NetworkingTests.xctest"
28-
BlueprintName = "NetworkingTests"
29-
ReferencedContainer = "container:Networking.xcodeproj">
30-
</BuildableReference>
31-
</TestableReference>
32-
</Testables>
3337
</TestAction>
3438
<LaunchAction
3539
buildConfiguration = "Debug"
@@ -48,6 +52,15 @@
4852
savedToolIdentifier = ""
4953
useCustomWorkingDirectory = "NO"
5054
debugDocumentVersioning = "YES">
55+
<MacroExpansion>
56+
<BuildableReference
57+
BuildableIdentifier = "primary"
58+
BlueprintIdentifier = "Networking"
59+
BuildableName = "Networking"
60+
BlueprintName = "Networking"
61+
ReferencedContainer = "container:">
62+
</BuildableReference>
63+
</MacroExpansion>
5164
</ProfileAction>
5265
<AnalyzeAction
5366
buildConfiguration = "Debug">

Modules/Package.swift

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,19 @@ let package = Package(
228228
"Hardware"
229229
]
230230
),
231+
.testTarget(
232+
name: "NetworkingTests",
233+
dependencies: [
234+
"Codegen",
235+
"Fakes",
236+
"Networking",
237+
"TestKit",
238+
"WooFoundation",
239+
"WordPressShared",
240+
.product(name: "KeychainAccess", package: "KeychainAccess"),
241+
],
242+
resources: [.process("Responses")]
243+
),
231244
.testTarget(
232245
name: "StorageTests",
233246
dependencies: [
@@ -274,7 +287,6 @@ let package = Package(
274287

275288
enum XcodeTargetNames {
276289
static let fakes = "Fakes"
277-
static let networkingTests = "NetworkingTests"
278290
static let notificationExtension = "NotificationExtension"
279291
static let storeWidgetsExtension = "StoreWidgetsExtension"
280292
static let uiTestsFoundation = "UITestsFoundation"
@@ -291,7 +303,6 @@ enum XcodeTargetNames {
291303
enum XcodeSupport {
292304
static var products: [Product] {
293305
[
294-
XcodeTargetNames.networkingTests,
295306
XcodeTargetNames.notificationExtension,
296307
XcodeTargetNames.storeWidgetsExtension,
297308
XcodeTargetNames.uiTestsFoundation,
@@ -308,18 +319,6 @@ enum XcodeSupport {
308319

309320
static var targets: [Target] {
310321
[
311-
.xcodeTarget(
312-
XcodeTargetNames.networkingTests,
313-
dependencies: [
314-
"Codegen",
315-
"Fakes",
316-
"Networking",
317-
"TestKit",
318-
"WooFoundation",
319-
"WordPressShared",
320-
.product(name: "KeychainAccess", package: "KeychainAccess"),
321-
]
322-
),
323322
.xcodeTarget(
324323
XcodeTargetNames.notificationExtension,
325324
dependencies: [

Modules/Sources/XcodeSupport/XcodeTarget_NetworkingTests/Empty.swift

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)