8000 Merge pull request #26 from ole/refactor-tests · ole/SortedArray@7609357 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7609357

Browse files
oleole
authored
Merge pull request #26 from ole/refactor-tests
Refactor tests: split up tests into separate unit tests and performance tests targets
2 parents 7abc703 + f0d6e46 commit 7609357

File tree

12 files changed

+100
-55
lines changed

12 files changed

+100
-55
lines changed

‎Package.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ let package = Package(
2121
dependencies: [],
2222
path: "Sources"),
2323
.testTarget(
24-
name: "SortedArrayTests",
24+
name: "UnitTests",
25+
dependencies: ["SortedArray"]),
26+
.testTarget(
27+
name: "PerformanceTests",
2528
dependencies: ["SortedArray"]),
2629
],
2730
swiftLanguageVersions: [4]

‎SortedArray.xcodeproj/project.pbxproj

Lines changed: 51 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99
/* Begin PBXBuildFile section */
1010
52D6D9871BEFF229002C0205 /* SortedArray.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D6D97C1BEFF229002C0205 /* SortedArray.framework */; };
1111
52D6D9981BEFF375002C0205 /* SortedArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52D6D9961BEFF375002C0205 /* SortedArray.swift */; };
12-
52D6D99B1BEFF375002C0205 /* SortedArrayTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52D6D9971BEFF375002C0205 /* SortedArrayTests.swift */; };
1312
52D6D9EA1BEFFFA4002C0205 /* SortedArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52D6D9961BEFF375002C0205 /* SortedArray.swift */; };
1413
52D6DA091BF00081002C0205 /* SortedArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52D6D9961BEFF375002C0205 /* SortedArray.swift */; };
1514
52D6DA261BF00118002C0205 /* SortedArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52D6D9961BEFF375002C0205 /* SortedArray.swift */; };
16-
5D6634252003E2C000364E93 /* PerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D6634242003E2C000364E93 /* PerformanceTests.swift */; };
17-
5D6634262003E2C000364E93 /* PerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D6634242003E2C000364E93 /* PerformanceTests.swift */; };
18-
5D6634272003E2C000364E93 /* PerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D6634242003E2C000364E93 /* PerformanceTests.swift */; };
19-
5DA058D21E8813F3006FA2B1 /* TestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DA058D11E8813F3006FA2B1 /* TestHelpers.swift */; };
20-
5DA058D31E8813F3006FA2B1 /* TestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DA058D11E8813F3006FA2B1 /* TestHelpers.swift */; };
21-
5DA058D41E8813F3006FA2B1 /* TestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DA058D11E8813F3006FA2B1 /* TestHelpers.swift */; };
22-
DD7502861C68FDDC006590AF /* SortedArrayTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52D6D9971BEFF375002C0205 /* SortedArrayTests.swift */; };
15+
5DB8B87920D7FF5E00D463D6 /* PerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DB8B87520D7FF4600D463D6 /* PerformanceTests.swift */; };
16+
5DB8B87A20D7FF5F00D463D6 /* PerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DB8B87520D7FF4600D463D6 /* PerformanceTests.swift */; };
17+
5DB8B87B20D7FF5F00D463D6 /* PerformanceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DB8B87520D7FF4600D463D6 /* PerformanceTests.swift */; };
18+
5DB8B87C20D7FF6200D463D6 /* SortedArrayTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DB8B87720D7FF4600D463D6 /* SortedArrayTests.swift */; };
19+
5DB8B87D20D7FF6200D463D6 /* TestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DB8B87820D7FF4600D463D6 /* TestHelpers.swift */; };
20+
5DB8B87E20D7FF6300D463D6 /* SortedArrayTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DB8B87720D7FF4600D463D6 /* SortedArrayTests.swift */; };
21+
5DB8B87F20D7FF6300D463D6 /* TestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DB8B87820D7FF4600D463D6 /* TestHelpers.swift */; };
22+
5DB8B88020D7FF6300D463D6 /* SortedArrayTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DB8B87720D7FF4600D463D6 /* SortedArrayTests.swift */; };
23+
5DB8B88120D7FF6300D463D6 /* TestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DB8B87820D7FF4600D463D6 /* TestHelpers.swift */; };
2324
DD7502881C68FEDE006590AF /* SortedArray.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D6DA0F1BF000BD002C0205 /* SortedArray.framework */; };
2425
DD7502921C690C7A006590AF /* SortedArray.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52D6D9F01BEFFFBE002C0205 /* SortedArray.framework */; };
25-
DD75029A1C690CBE006590AF /* SortedArrayTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52D6D9971BEFF375002C0205 /* SortedArrayTests.swift */; };
2626
/* End PBXBuildFile section */
2727

2828
/* Begin PBXContainerItemProxy section */
@@ -53,17 +53,18 @@
5353
52D6D97C1BEFF229002C0205 /* SortedArray.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SortedArray.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5454
52D6D9861BEFF229002C0205 /* SortedArray-iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SortedArray-iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
5555
52D6D9961BEFF375002C0205 /* SortedArray.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SortedArray.swift; path = Sources/SortedArray.swift; sourceTree = "<group>"; };
56-
52D6D9971BEFF375002C0205 /* SortedArrayTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SortedArrayTests.swift; path = Tests/SortedArrayTests/SortedArrayTests.swift; sourceTree = "<group>"; };
5756
52D6D9E21BEFFF6E002C0205 /* SortedArray.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SortedArray.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5857
52D6D9F01BEFFFBE002C0205 /* SortedArray.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SortedArray.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5958
52D6DA0F1BF000BD002C0205 /* SortedArray.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SortedArray.framework; sourceTree = BUILT_PRODUCTS_DIR; };
60-
5D6634242003E2C000364E93 /* PerformanceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PerformanceTests.swift; path = Tests/SortedArrayTests/PerformanceTests.swift; sourceTree = "<group>"; };
6159
5D7AAFCC20D71F4200080885 /* LICENSE.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE.txt; sourceTree = "<group>"; };
6260
5D7AAFCD20D71F4200080885 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
6361
5D7AAFCE20D71F4200080885 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
6462
5D7AAFD020D722B100080885 /* travis-build-script.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "travis-build-script.sh"; sourceTree = "<group>"; };
6563
5D7AAFD120D7231E00080885 /* .travis.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .travis.yml; sourceTree = "<group>"; };
66-
5DA058D11E8813F3006FA2B1 /* TestHelpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TestHelpers.swift; path = Tests/SortedArrayTests/TestHelpers.swift; sourceTree = "<group>"; };
64+
5DB8B87320D7FF4600D463D6 /* LinuxMain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LinuxMain.swift; sourceTree = "<group>"; };
65+
5DB8B87520D7FF4600D463D6 /* PerformanceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PerformanceTests.swift; sourceTree = "<group>"; };
66+
5DB8B87720D7FF4600D463D6 /* SortedArrayTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SortedArrayTests.swift; sourceTree = "<group>"; };
67+
5DB8B87820D7FF4600D463D6 /* TestHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestHelpers.swift; sourceTree = "<group>"; };
6768
AD2FAA261CD0B6D800659CF4 /* SortedArray.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SortedArray.plist; sourceTree = "<group>"; };
6869
AD2FAA281CD0B6E100659CF4 /* SortedArrayTests.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SortedArrayTests.plist; sourceTree = "<group>"; };
6970
DD75027A1C68FCFC006590AF /* SortedArray-macOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SortedArray-macOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -129,11 +130,9 @@
129130
52D6D9721BEFF229002C0205 = {
130131
isa = PBXGroup;
131132
children = (
132-
5D7AAFCB20D71F0800080885 /* Other files (not in any target) */,
133133
52D6D9961BEFF375002C0205 /* SortedArray.swift */,
134-
52D6D9971BEFF375002C0205 /* SortedArrayTests.swift */,
135-
5D6634242003E2C000364E93 /* PerformanceTests.swift */,
136-
5DA058D11E8813F3006FA2B1 /* TestHelpers.swift */,
134+
5DB8B87220D7FF4600D463D6 /* Tests */,
135+
5D7AAFCB20D71F0800080885 /* Other files (not in any target) */,
137136
5D7AAFCF20D722B100080885 /* scripts */,
138137
52D6D99C1BEFF38C002C0205 /* Configs */,
139138
52D6D97D1BEFF229002C0205 /* Products */,
@@ -182,6 +181,33 @@
182181
path = scripts;
183182
sourceTree = "<group>";
184183
};
184+
5DB8B87220D7FF4600D463D6 /* Tests */ = {
185+
isa = PBXGroup;
186+
children = (
187+
5DB8B87320D7FF4600D463D6 /* LinuxMain.swift */,
188+
5DB8B87420D7FF4600D463D6 /* PerformanceTests */,
189+
5DB8B87620D7FF4600D463D6 /* UnitTests */,
190+
);
191+
path = Tests;
192+
sourceTree = "<group>";
193+
};
194+
5DB8B87420D7FF4600D463D6 /* PerformanceTests */ = {
195+
isa = PBXGroup;
196+
children = (
197+
5DB8B87520D7FF4600D463D6 /* PerformanceTests.swift */,
198+
);
199+
path = PerformanceTests;
200+
sourceTree = "<group>";
201+
};
202+
5DB8B87620D7FF4600D463D6 /* UnitTests */ = {
203+
isa = PBXGroup;
204+
children = (
205+
5DB8B87720D7FF4600D463D6 /* SortedArrayTests.swift */,
206+
5DB8B87820D7FF4600D463D6 /* TestHelpers.swift */,
207+
);
208+
path = UnitTests;
209+
sourceTree = "<group>";
210+
};
185211
DD7502721C68FC1B006590AF /* Frameworks */ = {
186212
isa = PBXGroup;
187213
children = (
@@ -486,9 +512,9 @@
486512
isa = PBXSourcesBuildPhase;
487513
buildActionMask = 2147483647;
488514
files = (
489-
52D6D99B1BEFF375002C0205 /* SortedArrayTests.swift in Sources */,
490-
5D6634252003E2C000364E93 /* PerformanceTests.swift in Sources */,
491-
5DA058D21E8813F3006FA2B1 /* TestHelpers.swift in Sources */,
515+
5DB8B87C20D7FF6200D463D6 /* SortedArrayTests.swift in Sources */,
516+
5DB8B87920D7FF5E00D463D6 /* PerformanceTests.swift in Sources */,
517+
5DB8B87D20D7FF6200D463D6 /* TestHelpers.swift in Sources */,
492518
);
493519
runOnlyForDeploymentPostprocessing = 0;
494520
};
@@ -520,19 +546,19 @@
520546
isa = PBXSourcesBuildPhase;
521547
buildActionMask = 2147483647;
522548
files = (
523-
DD7502861C68FDDC006590AF /* SortedArrayTests.swift in Sources */,
524-
5D6634262003E2C000364E93 /* PerformanceTests.swift in Sources */,
525-
5DA058D31E8813F3006FA2B1 /* TestHelpers.swift in Sources */,
549+
5DB8B87E20D7FF6300D463D6 /* SortedArrayTests.swift in Sources */,
550+
5DB8B87A20D7FF5F00D463D6 /* PerformanceTests.swift in Sources */,
551+
5DB8B87F20D7FF6300D463D6 /* TestHelpers.swift in Sources */,
526552
);
527553
runOnlyForDeploymentPostprocessing = 0;
528554
};
529555
DD7502891C690C7A006590AF /* Sources */ = {
530556
isa = PBXSourcesBuildPhase;
531557
buildActionMask = 2147483647;
532558
files = (
533-
DD75029A1C690CBE006590AF /* SortedArrayTests.swift in Sources */,
534-
5D6634272003E2C000364E93 /* PerformanceTests.swift in Sources */,
535-
5DA058D41E8813F3006FA2B1 /* TestHelpers.swift in Sources */,
559+
5DB8B88020D7FF6300D463D6 /* SortedArrayTests.swift in Sources */,
560+
5DB8B87B20D7FF5F00D463D6 /* PerformanceTests.swift in Sources */,
561+
5DB8B88120D7FF6300D463D6 /* TestHelpers.swift in Sources */,
536562
);
537563
runOnlyForDeploymentPostprocessing = 0;
538564
};

‎SortedArray.xcodeproj/xcshareddata/xcbaselines/DD7502791C68FCFC006590AF.xcbaseline/28BBA58F-EC4C-4E7A-943A-5B8FD5CC1F33.plist

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,59 +11,59 @@
1111
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
1212
<dict>
1313
<key>baselineAverage</key>
14-
<real>0.000401</real>
14+
<real>7.1619e-05</real>
1515
<key>baselineIntegrationDisplayName</key>
16-
<string>4. Feb 2018 at 21:05:48</string>
16+
<string>18. Jun 2018 at 17:12:56</string>
1717
</dict>
1818
</dict>
1919
<key>testPerformanceOfIndexOfObject()</key>
2020
<dict>
2121
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
2222
<dict>
2323
<key>baselineAverage</key>
24-
<real>0.00039832</real>
24+
<real>9.9912e-05</real>
2525
<key>baselineIntegrationDisplayName</key>
26-
<string>4. Feb 2018 at 21:05:48</string>
26+
<string>18. Jun 2018 at 17:12:56</string>
2727
</dict>
2828
</dict>
2929
<key>testPerformanceOfIndexOfObjectInRange()</key>
3030
<dict>
3131
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
3232
<dict>
3333
<key>baselineAverage</key>
34-
<real>7.4326e-05</real>
34+
<real>2.2075e-05</real>
3535
<key>baselineIntegrationDisplayName</key>
36-
<string>4. Feb 2018 at 21:05:48</string>
36+
<string>18. Jun 2018 at 17:12:56</string>
3737
</dict>
3838
</dict>
3939
<key>testPerformanceOfLastIndexOf()</key>
4040
<dict>
4141
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
4242
<dict>
4343
<key>baselineAverage</key>
44-
<real>0.00043735</real>
44+
<real>7.4486e-05</real>
4545
<key>baselineIntegrationDisplayName</key>
46-
<string>4. Feb 2018 at 21:05:48</string>
46+
<string>18. Jun 2018 at 17:12:56</string>
4747
</dict>
4848
</dict>
4949
<key>testPerformanceOfLastIndexOfObject()</key>
5050
<dict>
5151
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
5252
<dict>
5353
<key>baselineAverage</key>
54-
<real>0.00046671</real>
54+
<real>5.5835e-05</real>
5555
<key>baselineIntegrationDisplayName</key>
56-
<string>4. Feb 2018 at 21:05:48</string>
56+
<string>18. Jun 2018 at 17:12:56</string>
5757
</dict>
5858
</dict>
5959
<key>testPerformanceOfLastIndexOfObjectInRange()</key>
6060
<dict>
6161
<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
6262
<dict>
6363
<key>baselineAverage</key>
64-
<real>6.691e-05</real>
64+
<real>1.1141e-05</real>
6565
<key>baselineIntegrationDisplayName</key>
66-
<string>4. Feb 2018 at 21:05:48</string>
66+
<string>18. Jun 2018 at 17:12:56</string>
6767
</dict>
6868
</dict>
6969
</dict>

‎SortedArray.xcodeproj/xcshareddata/xcschemes/Performance-Tests-macOS.xcscheme

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
shouldUseLaunchSchemeArgsEnv = "YES">
3131
<Testables>
3232
<TestableReference
33-
skipped = "NO">
33+
skipped = "NO"
34+
testExecutionOrdering = "random">
3435
<BuildableReference
3536
BuildableIdentifier = "primary"
3637
BlueprintIdentifier = "DD7502791C68FCFC006590AF"

‎SortedArray.xcodeproj/xcshareddata/xcschemes/SortedArray-iOS.xcscheme

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,21 @@
3030
shouldUseLaunchSchemeArgsEnv = "YES">
3131
<Testables>
3232
<TestableReference
33-
skipped = "NO">
33+
skipped = "NO"
34+
parallelizable = "YES"
35+
testExecutionOrdering = "random">
3436
<BuildableReference
3537
BuildableIdentifier = "primary"
3638
BlueprintIdentifier = "52D6D9851BEFF229002C0205"
3739
BuildableName = "SortedArray-iOS Tests.xctest"
3840
BlueprintName = "SortedArray-iOS Tests"
3941
ReferencedContainer = "container:SortedArray.xcodeproj">
4042
</BuildableReference>
43+
<SkippedTests>
44+
<Test
45+
Identifier = "PerformanceTests">
46+
</Test>
47+
</SkippedTests>
4148
</TestableReference>
4249
</Testables>
4350
<MacroExpansion>

‎SortedArray.xcodeproj/xcshareddata/xcschemes/SortedArray-macOS.xcscheme

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,21 @@
3030
shouldUseLaunchSchemeArgsEnv = "YES">
3131
<Testables>
3232
<TestableReference
33-
skipped = "NO">
33+
skipped = "NO"
34+
parallelizable = "YES"
35+
testExecutionOrdering = "random">
3436
<BuildableReference
3537
BuildableIdentifier = "primary"
3638
BlueprintIdentifier = "DD7502791C68FCFC006590AF"
3739
BuildableName = "SortedArray-macOS Tests.xctest"
3840
BlueprintName = "SortedArray-macOS Tests"
3941
ReferencedContainer = "container:SortedArray.xcodeproj">
4042
</BuildableReference>
43+
<SkippedTests>
44+
<Test
45+
Identifier = "PerformanceTests">
46+
</Test>
47+
</SkippedTests>
4148
</TestableReference>
4249
</Testables>
4350
<MacroExpansion>

‎SortedArray.xcodeproj/xcshareddata/xcschemes/SortedArray-tvOS.xcscheme

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,21 @@
3030
shouldUseLaunchSchemeArgsEnv = "YES">
3131
<Testables>
3232
<TestableReference
33-
skipped = "NO">
33+
skipped = "NO"
34+
parallelizable = "YES"
35+
testExecutionOrdering = "random">
3436
<BuildableReference
3537
BuildableIdentifier = "primary"
3638
BlueprintIdentifier = "DD75028C1C690C7A006590AF"
3739
BuildableName = "SortedArray-tvOS Tests.xctest"
3840
BlueprintName = "SortedArray-tvOS Tests"
3941
ReferencedContainer = "container:SortedArray.xcodeproj">
4042
</BuildableReference>
43+
<SkippedTests>
44+
<Test
45+
Identifier = "PerformanceTests">
46+
</Test>
47+
</SkippedTests>
4148
</TestableReference>
4249
</Testables>
4350
<MacroExpansion>

‎Tests/LinuxMain.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import XCTest
2-
@testable import SortedArrayTests
2+
@testable import UnitTests
3+
@testable import PerformanceTests
34

45
XCTMain([
56
testCase(SortedArrayTests.allTests),

‎Tests/SortedArrayTests/PerformanceTests.swift renamed to ‎Tests/PerformanceTests/PerformanceTests.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ import XCTest
44
class PerformanceTests: XCTestCase {
55
func testLinuxTestSuiteIncludesAllTests() {
66
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
7-
#if swift(>=4.0)
8-
let darwinTestCount = PerformanceTests.defaultTestSuite.testCaseCount
9-
#else
10-
let darwinTestCount = Int(PerformanceTests.defaultTestSuite().testCaseCount)
11-
#endif
7+
let darwinTestCount = PerformanceTests.defaultTestSuite.testCaseCount
128
let linuxTestCount = PerformanceTests.allTests.count
139
XCTAssertEqual(linuxTestCount, darwinTestCount, "allTests (used for testing on Linux) is missing \(darwinTestCount - linuxTestCount) tests")
1410
#endif

‎Tests/SortedArrayTests/SortedArrayTests.swift renamed to ‎Tests/UnitTests/SortedArrayTests.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@ class SortedArrayTests: XCTestCase {
1212

1313
func testLinuxTestSuiteIncludesAllTests() {
1414
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
15-
#if swift(>=4.0)
16-
let darwinTestCount = SortedArrayTests.defaultTestSuite.testCaseCount
17-
#else
18-
let darwinTestCount = Int(SortedArrayTests.defaultTestSuite().testCaseCount)
19-
#endif
15+
let darwinTestCount = SortedArrayTests.defaultTestSuite.testCaseCount
2016
let linuxTestCount = SortedArrayTests.allTests.count
2117
XCTAssertEqual(linuxTestCount, darwinTestCount, "allTests (used for testing on Linux) is missing \(darwinTestCount - linuxTestCount) tests")
2218
#endif

0 commit comments

Comments
 (0)
0