Skip to content

Commit 927f554

Browse files
committed
[Tests] Remove now unnecessary deps on Utility.
1 parent 5c50b7f commit 927f554

File tree

7 files changed

+9
-17
lines changed

7 files changed

+9
-17
lines changed

Package.swift

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ let package = Package(
8383
dependencies: ["Basic", "PackageGraph"]),
8484

8585
// MARK: Commands
86+
8687
Target(
8788
/** High-level commands */
8889
name: "Commands",
@@ -103,17 +104,12 @@ let package = Package(
103104
/** Shim tool to find test names on OS X */
104105
name: "swiftpm-xctest-helper",
105106
dependencies: []),
106-
Target(
107-
/** FIXME: The Basic tests currently have a layering violation and a dependency on Utility for infrastructure. */
108-
name: "BasicTests",
109-
dependencies: ["Basic", "Utility"]),
107+
108+
// MARK: Additional Test Dependencies
109+
110110
Target(
111111
name: "FunctionalTests",
112112
dependencies: ["Basic", "Utility", "PackageModel"]),
113-
Target(
114-
/** FIXME: Turns out PackageLoadingTests violate encapsulation :( */
115-
name: "PackageLoadingTests",
116-
dependencies: ["Get", "PackageLoading"]),
117113
])
118114

119115

Tests/BasicTests/FileSystemTests.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import XCTest
1212

1313
import Basic
1414
import POSIX
15-
import Utility
1615

1716
func XCTAssertThrows<T: Swift.Error>(_ expectedError: T, file: StaticString = #file, line: UInt = #line, _ body: () throws -> ()) where T: Equatable {
1817
do {

Tests/BasicTests/PathShimTests.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import XCTest
1313

1414
import Basic
1515
import POSIX
16-
import Utility
1716

1817
class PathShimTests : XCTestCase {
1918

Tests/BasicTests/PathTests.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
*/
1010

1111
import XCTest
12-
import POSIX
13-
import Basic
14-
import Utility
1512

13+
import Basic
14+
import POSIX
1615

1716
class PathTests: XCTestCase {
1817

Tests/BasicTests/SynchronizedQueueTests.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import Foundation
1212
import XCTest
1313

1414
import Basic
15-
import Utility
1615

1716
class SyncronizedQueueTests: XCTestCase {
1817

Tests/BasicTests/TemporaryFileTests.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
*/
1010

1111
import XCTest
12-
import Utility
13-
import Basic
12+
1413
import class Foundation.FileManager
1514

15+
import Basic
16+
1617
class TemporaryFileTests: XCTestCase {
1718
func testBasicReadWrite() throws {
1819
let filePath: AbsolutePath

Tests/BasicTests/ThreadTests.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import XCTest
1212

1313
import Basic
14-
import Utility
1514

1615
typealias Thread = Basic.Thread
1716

0 commit comments

Comments
 (0)