Skip to content

Commit 767ac35

Browse files
committed
Tests: remove @testable import Basics
Use the newly extended APIs for testing and use a non-testable import of the package, avoiding a recompilation.
1 parent b89560c commit 767ac35

26 files changed

+25
-27
lines changed

Tests/BasicsTests/Archiver/TarArchiverTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import Basics
14-
@testable import struct Basics.TarArchiver
14+
import struct Basics.TarArchiver
1515
import TSCclibc // for SPM_posix_spawn_file_actions_addchdir_np_supported
1616
import _InternalTestSupport
1717
import XCTest

Tests/BasicsTests/Archiver/UniversalArchiverTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import Basics
14-
@testable import struct Basics.TarArchiver
15-
@testable import struct Basics.ZipArchiver
14+
import struct Basics.TarArchiver
15+
import struct Basics.ZipArchiver
1616
import TSCclibc // for SPM_posix_spawn_file_actions_addchdir_np_supported
1717
import _InternalTestSupport
1818
import XCTest

Tests/BasicsTests/Archiver/ZipArchiverTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import Basics
14-
@testable import struct Basics.ZipArchiver
14+
import struct Basics.ZipArchiver
1515
import _InternalTestSupport
1616
import XCTest
1717
import TSCclibc // for SPM_posix_spawn_file_actions_addchdir_np_supported

Tests/BasicsTests/AuthorizationProviderTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
@testable import Basics
13+
import Basics
1414
import _InternalTestSupport
1515
import XCTest
1616

Tests/BasicsTests/CancellatorTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
@testable import Basics
13+
import Basics
1414
import _InternalTestSupport
1515
import XCTest
1616

Tests/BasicsTests/ConcurrencyHelpersTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212
import Foundation
1313

14-
@testable import Basics
14+
import Basics
1515
import TSCTestSupport
1616
import Testing
1717

Tests/BasicsTests/DictionaryTest.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
@testable import Basics
13+
import Basics
1414
import Testing
1515

1616
struct DictionaryTests {

Tests/BasicsTests/Environment/EnvironmentKeyTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212
import Foundation
1313

14-
@testable import Basics
14+
import Basics
1515
import Testing
1616

1717
struct EnvironmentKeyTests {

Tests/BasicsTests/Environment/EnvironmentTests.swift

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

1414
@_spi(SwiftPMInternal)
15-
@testable
1615
import Basics
1716

1817
import Testing

Tests/BasicsTests/FileSystem/FileSystemTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import Foundation
1313
import TSCTestSupport
1414
import Testing
1515

16-
@testable import Basics
16+
import Basics
1717

1818
struct FileSystemTests {
1919
@Test

Tests/BasicsTests/Graph/AdjacencyMatrixTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
@testable import Basics
13+
import Basics
1414
import Testing
1515

1616
struct AdjacencyMatrixTests {

Tests/BasicsTests/HTTPClientTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212
import Foundation
1313

14-
@testable import Basics
14+
import Basics
1515
import _Concurrency
1616
import _InternalTestSupport
1717
import Testing

Tests/BasicsTests/LegacyHTTPClientTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
@testable import Basics
13+
import Basics
1414
import _InternalTestSupport
1515
import XCTest
1616

Tests/BasicsTests/ObservabilitySystemTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212
import Foundation
1313

14-
@testable import Basics
14+
import Basics
1515
import _InternalTestSupport
1616
import Testing
1717

Tests/BasicsTests/ProgressAnimationTests.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import _Concurrency
1414
import Testing
1515

1616
@_spi(SwiftPMInternal)
17-
@testable
1817
import Basics
1918
import TSCBasic
2019

Tests/BasicsTests/SQLiteBackedCacheTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212
import Foundation
1313

14-
@testable import Basics
14+
import Basics
1515
import _InternalTestSupport
1616
import tsan_utils
1717
import Testing

Tests/BasicsTests/SandboxTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
@testable import Basics
13+
import Basics
1414
import _InternalTestSupport
1515
import XCTest
1616

Tests/BasicsTests/Serialization/SerializedJSONTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
@testable import Basics
13+
import Basics
1414
import XCTest
1515
import _InternalTestSupport // for XCTSkipOnWindows
1616

Tests/BasicsTests/URLSessionHTTPClientTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
@testable import Basics
13+
import Basics
1414
import Foundation
1515
#if canImport(FoundationNetworking)
1616
// TODO: this brings OpenSSL dependency` on Linux

Tests/BuildTests/BuildPlanTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
@testable import Basics
13+
import Basics
1414
@testable import Build
1515

1616
@testable

Tests/CommandsTests/SwiftCommandStateTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
@testable import Basics
13+
import Basics
1414
@testable import Build
1515
@testable import Commands
1616
@testable import CoreCommands

Tests/PackageLoadingTests/ManifestLoaderCacheTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
@testable import Basics
13+
import Basics
1414
@testable import PackageLoading
1515
import PackageModel
1616
import _InternalTestSupport

Tests/PackageModelTests/SwiftSDKTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
@testable import Basics
13+
import Basics
1414

1515
@_spi(SwiftPMInternal)
1616
@testable import PackageModel

Tests/PackageModelTests/ToolsetTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
@testable import Basics
13+
import Basics
1414
@testable import PackageModel
1515
import _InternalTestSupport
1616
import XCTest

Tests/SourceControlTests/RepositoryManagerTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
@testable import Basics
13+
import Basics
1414
import _Concurrency
1515
import PackageModel
1616
import _InternalTestSupport

Tests/WorkspaceTests/AuthorizationProviderTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212
import Foundation
1313

14-
@testable import Basics
14+
import Basics
1515
import _InternalTestSupport
1616
import Workspace
1717
import Testing

0 commit comments

Comments
 (0)