Skip to content

Commit 9906ead

Browse files
connor-ricksconnor-ricks
committed
🛠 Cleanup tests and reorder.
1 parent aed6c1f commit 9906ead

File tree

4 files changed

+28
-138
lines changed

4 files changed

+28
-138
lines changed

‎.swiftpm/xcode/xcshareddata/xcschemes/BuffableAsyncPublishers.xcscheme‎ renamed to ‎.swiftpm/xcode/xcshareddata/xcschemes/Fuse.xcscheme‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "BuffableAsyncPublishers"
18-
BuildableName = "BuffableAsyncPublishers"
19-
BlueprintName = "BuffableAsyncPublishers"
17+
BlueprintIdentifier = "Fuse"
18+
BuildableName = "Fuse"
19+
BlueprintName = "Fuse"
2020
ReferencedContainer = "container:">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -29,7 +29,7 @@
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<TestPlans>
3131
<TestPlanReference
32-
reference = "container:Tests/BuffableAsyncPublishersTests/BuffableAsyncPublishers.xctestplan"
32+
reference = "container:Tests/FuseTests/Fuse.xctestplan"
3333
default = "YES">
3434
</TestPlanReference>
3535
</TestPlans>
@@ -54,9 +54,9 @@
5454
<MacroExpansion>
5555
<BuildableReference
5656
BuildableIdentifier = "primary"
57-
BlueprintIdentifier = "BuffableAsyncPublishers"
58-
BuildableName = "BuffableAsyncPublishers"
59-
BlueprintName = "BuffableAsyncPublishers"
57+
BlueprintIdentifier = "Fuse"
58+
BuildableName = "Fuse"
59+
BlueprintName = "Fuse"
6060
ReferencedContainer = "container:">
6161
</BuildableReference>
6262
</MacroExpansion>

‎.swiftpm/xcode/xcshareddata/xcschemes/swift-nibbles-Package.xcscheme‎

Lines changed: 9 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "Stash"
18-
BuildableName = "Stash"
19-
BlueprintName = "Stash"
17+
BlueprintIdentifier = "Extensions"
18+
BuildableName = "Extensions"
19+
BlueprintName = "Extensions"
2020
ReferencedContainer = "container:">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -28,9 +28,9 @@
2828
buildForAnalyzing = "YES">
2929
<BuildableReference
3030
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "Extensions"
32-
BuildableName = "Extensions"
33-
BlueprintName = "Extensions"
31+
BlueprintIdentifier = "Fuse"
32+
BuildableName = "Fuse"
33+
BlueprintName = "Fuse"
3434
ReferencedContainer = "container:">
3535
</BuildableReference>
3636
</BuildActionEntry>
@@ -62,62 +62,6 @@
6262
ReferencedContainer = "container:">
6363
</BuildableReference>
6464
</BuildActionEntry>
65-
<BuildActionEntry
66-
buildForTesting = "YES"
67-
buildForRunning = "YES"
68-
buildForProfiling = "NO"
69-
buildForArchiving = "NO"
70-
buildForAnalyzing = "YES">
71-
<BuildableReference
72-
BuildableIdentifier = "primary"
73-
BlueprintIdentifier = "StashTests"
74-
BuildableName = "StashTests"
75-
BlueprintName = "StashTests"
76-
ReferencedContainer = "container:">
77-
</BuildableReference>
78-
</BuildActionEntry>
79-
<BuildActionEntry
80-
buildForTesting = "YES"
81-
buildForRunning = "YES"
82-
buildForProfiling = "NO"
83-
buildForArchiving = "NO"
84-
buildForAnalyzing = "YES">
85-
<BuildableReference
86-
BuildableIdentifier = "primary"
87-
BlueprintIdentifier = "ExtensionsTests"
88-
BuildableName = "ExtensionsTests"
89-
BlueprintName = "ExtensionsTests"
90-
ReferencedContainer = "container:">
91-
</BuildableReference>
92-
</BuildActionEntry>
93-
<BuildActionEntry
94-
buildForTesting = "YES"
95-
buildForRunning = "YES"
96-
buildForProfiling = "NO"
97-
buildForArchiving = "NO"
98-
buildForAnalyzing = "YES">
99-
<BuildableReference
100-
BuildableIdentifier = "primary"
101-
BlueprintIdentifier = "HTTPNetworkingTests"
102-
BuildableName = "HTTPNetworkingTests"
103-
BlueprintName = "HTTPNetworkingTests"
104-
ReferencedContainer = "container:">
105-
</BuildableReference>
106-
</BuildActionEntry>
107-
<BuildActionEntry
108-
buildForTesting = "YES"
109-
buildForRunning = "YES"
110-
buildForProfiling = "NO"
111-
buildForArchiving = "NO"
112-
buildForAnalyzing = "YES">
113-
<BuildableReference
114-
BuildableIdentifier = "primary"
115-
BlueprintIdentifier = "IdentifiedTests"
116-
BuildableName = "IdentifiedTests"
117-
BlueprintName = "IdentifiedTests"
118-
ReferencedContainer = "container:">
119-
</BuildableReference>
120-
</BuildActionEntry>
12165
<BuildActionEntry
12266
buildForTesting = "YES"
12367
buildForRunning = "YES"
@@ -126,9 +70,9 @@
12670
buildForAnalyzing = "YES">
12771
<BuildableReference
12872
BuildableIdentifier = "primary"
129-
BlueprintIdentifier = "Fuse"
130-
BuildableName = "Fuse"
131-
BlueprintName = "Fuse"
73+
BlueprintIdentifier = "Stash"
74+
BuildableName = "Stash"
75+
BlueprintName = "Stash"
13276
ReferencedContainer = "container:">
13377
</BuildableReference>
13478
</BuildActionEntry>
@@ -145,68 +89,6 @@
14589
default = "YES">
14690
</TestPlanReference>
14791
</TestPlans>
148-
<Testables>
149-
<TestableReference
150-
skipped = "NO">
151-
<BuildableReference
152-
BuildableIdentifier = "primary"
153-
BlueprintIdentifier = "StashTests"
154-
BuildableName = "StashTests"
155-
BlueprintName = "StashTests"
156-
ReferencedContainer = "container:">
157-
</BuildableReference>
158-
</TestableReference>
159-
<TestableReference
160-
skipped = "NO">
161-
<BuildableReference
162-
BuildableIdentifier = "primary"
163-
BlueprintIdentifier = "ExtensionsTests"
164-
BuildableName = "ExtensionsTests"
165-
BlueprintName = "ExtensionsTests"
166-
ReferencedContainer = "container:">
167-
</BuildableReference>
168-
</TestableReference>
169-
<TestableReference
170-
skipped = "NO">
171-
<BuildableReference
172-
BuildableIdentifier = "primary"
173-
BlueprintIdentifier = "HTTPNetworkingTests"
174-
BuildableName = "HTTPNetworkingTests"
175-
BlueprintName = "HTTPNetworkingTests"
176-
ReferencedContainer = "container:">
177-
</BuildableReference>
178-
</TestableReference>
179-
<TestableReference
180-
skipped = "NO">
181-
<BuildableReference
182-
BuildableIdentifier = "primary"
183-
BlueprintIdentifier = "IdentifiedTests"
184-
BuildableName = "IdentifiedTests"
185-
BlueprintName = "IdentifiedTests"
186-
ReferencedContainer = "container:">
187-
</BuildableReference>
188-
</TestableReference>
189-
<TestableReference
190-
skipped = "NO">
191-
<BuildableReference
192-
BuildableIdentifier = "primary"
193-
BlueprintIdentifier = "BuffableAsyncPublishersTests"
194-
BuildableName = "BuffableAsyncPublishersTests"
195-
BlueprintName = "BuffableAsyncPublishersTests"
196-
ReferencedContainer = "container:">
197-
</BuildableReference>
198-
</TestableReference>
199-
<TestableReference
200-
skipped = "NO">
201-
<BuildableReference
202-
BuildableIdentifier = "primary"
203-
BlueprintIdentifier = "FuseTests"
204-
BuildableName = "FuseTests"
205-
BlueprintName = "FuseTests"
206-
ReferencedContainer = "container:">
207-
</BuildableReference>
208-
</TestableReference>
209-
</Testables>
21092
</TestAction>
21193
<LaunchAction
21294
buildConfiguration = "Debug"

‎Package.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,14 @@ let package = Package(
1111
.watchOS(.v9),
1212
],
1313
products: [
14-
.library(name: "Stash", targets: ["Stash"]),
1514
.library(name: "Extensions", targets: ["Extensions"]),
1615
.library(name: "Fuse", targets: ["Fuse"]),
1716
.library(name: "HTTPNetworking", targets: ["HTTPNetworking"]),
1817
.library(name: "Identified", targets: ["Identified"]),
18+
.library(name: "Stash", targets: ["Stash"]),
1919
.plugin(name: "Create TCA Feature", targets: ["Create TCA Feature"])
2020
],
2121
targets: [
22-
.target(name: "Stash"),
23-
.testTarget(name: "StashTests", dependencies: ["Stash"]),
24-
2522
.target(name: "Extensions"),
2623
.testTarget(name: "ExtensionsTests", dependencies: ["Extensions"]),
2724

@@ -34,6 +31,9 @@ let package = Package(
3431
.target(name: "Identified"),
3532
.testTarget(name: "IdentifiedTests", dependencies: ["Identified"]),
3633

34+
.target(name: "Stash"),
35+
.testTarget(name: "StashTests", dependencies: ["Stash"]),
36+
3737
.plugin(
3838
name: "Create TCA Feature",
3939
capability: .command(

‎Tests/swift-nibbles-Package.xctestplan‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@
2222
"name" : "ExtensionsTests"
2323
}
2424
},
25+
{
26+
"parallelizable" : true,
27+
"target" : {
28+
"containerPath" : "container:",
29+
"identifier" : "FuseTests",
30+
"name" : "FuseTests"
31+
}
32+
},
2533
{
2634
"parallelizable" : true,
2735
"target" : {

0 commit comments

Comments
 (0)