Skip to content

Commit 4f0eafd

Browse files
committed
Ease binary distribution: testing
Add a SYSTEM_PACKAGE define and conditionalize import statements in tests to ease testing of binary distributions of System.
1 parent 37e23f2 commit 4f0eafd

12 files changed

+63
-5
lines changed

Package.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ let targets: [PackageDescription.Target] = [
2929

3030
.testTarget(
3131
name: "SystemTests",
32-
dependencies: ["SystemPackage"]),
32+
dependencies: ["SystemPackage"],
33+
swiftSettings: [
34+
.define("SYSTEM_PACKAGE")
35+
]),
3336
]
3437

3538
let package = Package(

Tests/SystemTests/ErrnoTest.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
*/
99

1010
import XCTest
11+
12+
#if SYSTEM_PACKAGE
1113
import SystemPackage
14+
#else
15+
import System
16+
#endif
1217

1318
// @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
1419
final class ErrnoTest: XCTestCase {

Tests/SystemTests/FileOperationsTest.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
*/
99

1010
import XCTest
11+
12+
#if SYSTEM_PACKAGE
1113
import SystemPackage
14+
#else
15+
import System
16+
#endif
1217

1318
// @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
1419
final class FileOperationsTest: XCTestCase {

Tests/SystemTests/FilePathTests/FilePathComponentsTest.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88
*/
99

1010
import XCTest
11-
import SystemPackage
1211

13-
@testable
14-
import SystemPackage
12+
#if SYSTEM_PACKAGE
13+
@testable import SystemPackage
14+
#else
15+
@testable import System
16+
#endif
1517

1618
// @available(9999....)
1719
struct TestPathComponents: TestCase {

Tests/SystemTests/FilePathTests/FilePathExtras.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11

2+
#if SYSTEM_PACKAGE
23
@testable import SystemPackage
4+
#else
5+
@testable import System
6+
#endif
37

48
// Why can't I write this extension on `FilePath.ComponentView.SubSequence`?
59
extension Slice where Base == FilePath.ComponentView {

Tests/SystemTests/FilePathTests/FilePathParsingTest.swift

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
*/
99

1010
import XCTest
11+
12+
#if SYSTEM_PACKAGE
1113
import SystemPackage
14+
#else
15+
import System
16+
#endif
1217

1318
private struct ParsingTestCase: TestCase {
1419
// Whether we want the path to be constructed and syntactically
@@ -57,7 +62,11 @@ extension ParsingTestCase {
5762
}
5863
}
5964

65+
#if SYSTEM_PACKAGE
6066
@testable import SystemPackage
67+
#else
68+
@testable import System
69+
#endif
6170

6271
final class FilePathParsingTest: XCTestCase {
6372
func testNormalization() {

Tests/SystemTests/FilePathTests/FilePathSyntaxTest.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
*/
99

1010
import XCTest
11+
12+
#if SYSTEM_PACKAGE
1113
import SystemPackage
14+
#else
15+
import System
16+
#endif
1217

1318
private struct SyntaxTestCase: TestCase {
1419
// Whether we want the path to be constructed and syntactically

Tests/SystemTests/FilePathTests/FilePathTest.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
*/
99

1010
import XCTest
11+
12+
#if SYSTEM_PACKAGE
1113
import SystemPackage
14+
#else
15+
import System
16+
#endif
1217

1318
// @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
1419
func filePathFromUnterminatedBytes<S: Sequence>(_ bytes: S) -> FilePath where S.Element == UInt8 {

Tests/SystemTests/FileTypesTest.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
*/
99

1010
import XCTest
11+
12+
#if SYSTEM_PACKAGE
1113
import SystemPackage
14+
#else
15+
import System
16+
#endif
1217

1318
// @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
1419
final class FileDescriptorTest: XCTestCase {

Tests/SystemTests/MockingTest.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@
88
*/
99

1010
import XCTest
11+
12+
#if SYSTEM_PACKAGE
1113
import SystemPackage
14+
#else
15+
import System
16+
#endif
17+
1218
@testable import SystemInternals
1319

1420
// @available...

0 commit comments

Comments
 (0)