Skip to content

Rename TestingInternals to _TestingInternals. #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ let package = Package(
.target(
name: "Testing",
dependencies: [
"TestingInternals",
"_TestingInternals",
"TestingMacros",
],
cxxSettings: .packageSettings,
Expand Down Expand Up @@ -79,7 +79,7 @@ let package = Package(
// "Support" targets: These contain C family code and are used exclusively
// by other targets above, not directly included in product libraries.
.target(
name: "TestingInternals",
name: "_TestingInternals",
cxxSettings: .packageSettings
),

Expand Down
4 changes: 2 additions & 2 deletions [email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ let package = Package(
.target(
name: "Testing",
dependencies: [
"TestingInternals",
"_TestingInternals",
"TestingMacros",
],
cxxSettings: .packageSettings,
Expand Down Expand Up @@ -79,7 +79,7 @@ let package = Package(
// "Support" targets: These contain C family code and are used exclusively
// by other targets above, not directly included in product libraries.
.target(
name: "TestingInternals",
name: "_TestingInternals",
cxxSettings: .packageSettings
),

Expand Down
2 changes: 1 addition & 1 deletion Sources/Testing/EntryPoints/EntryPoint.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// See https://swift.org/CONTRIBUTORS.txt for Swift project authors
//

private import TestingInternals
private import _TestingInternals

/// The common implementation of the entry point functions in this file.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/Testing/EntryPoints/SwiftPMEntryPoint.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// See https://swift.org/CONTRIBUTORS.txt for Swift project authors
//

private import TestingInternals
private import _TestingInternals

/// The entry point to the testing library used by Swift Package Manager.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/Testing/EntryPoints/XCTestScaffold.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//

#if !SWT_NO_XCTEST_SCAFFOLDING && canImport(XCTest)
private import TestingInternals
private import _TestingInternals
public import XCTest

#if SWT_TARGET_OS_APPLE
Expand Down
2 changes: 1 addition & 1 deletion Sources/Testing/Events/Clock.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// See https://swift.org/CONTRIBUTORS.txt for Swift project authors
//

private import TestingInternals
private import _TestingInternals

@_spi(Experimental) @_spi(ForToolsIntegrationOnly)
extension Test {
Expand Down
2 changes: 1 addition & 1 deletion Sources/Testing/Events/TimeValue.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

// `internal` because `TimeValue.init(_ timespec:)` below is internal and
// references a type (`timespec`) which comes from this import.
internal import TestingInternals
internal import _TestingInternals

/// A container type representing a time value that is suitable for storage,
/// conversion, encoding, and decoding.
Expand Down
2 changes: 1 addition & 1 deletion Sources/Testing/ExitTests/ExitCondition.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// See https://swift.org/CONTRIBUTORS.txt for Swift project authors
//

private import TestingInternals
private import _TestingInternals

/// An enumeration describing possible conditions under which an exit test will
/// succeed or fail.
Expand Down
2 changes: 1 addition & 1 deletion Sources/Testing/ExitTests/ExitTest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// See https://swift.org/CONTRIBUTORS.txt for Swift project authors
//

private import TestingInternals
private import _TestingInternals

#if !SWT_NO_EXIT_TESTS
/// A type describing an exit test.
Expand Down
2 changes: 1 addition & 1 deletion Sources/Testing/ExitTests/WaitFor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//

#if !SWT_NO_EXIT_TESTS
internal import TestingInternals
internal import _TestingInternals

#if SWT_TARGET_OS_APPLE || os(Linux)
/// Block the calling thread, wait for the target process to exit, and return
Expand Down
2 changes: 1 addition & 1 deletion Sources/Testing/SourceAttribution/Backtrace.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// See https://swift.org/CONTRIBUTORS.txt for Swift project authors
//

private import TestingInternals
private import _TestingInternals

/// A type representing a backtrace or stack trace.
public struct Backtrace: Sendable {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// See https://swift.org/CONTRIBUTORS.txt for Swift project authors
//

private import TestingInternals
private import _TestingInternals

extension CommandLine {
/// Get the command-line arguments passed to this process.
Expand Down
4 changes: 2 additions & 2 deletions Sources/Testing/Support/CError.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// See https://swift.org/CONTRIBUTORS.txt for Swift project authors
//

internal import TestingInternals
internal import _TestingInternals

/// A type representing an error from a C function such as `fopen()`.
///
Expand Down Expand Up @@ -48,7 +48,7 @@ func strerror(_ errorCode: CInt) -> String {
return strnlen(buffer.baseAddress!, buffer.count)
}
#else
String(cString: TestingInternals.strerror(errorCode))
String(cString: _TestingInternals.strerror(errorCode))
#endif
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/Testing/Support/Environment.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// See https://swift.org/CONTRIBUTORS.txt for Swift project authors
//

private import TestingInternals
private import _TestingInternals

/// A type describing the environment of the current process.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/Testing/Support/FileHandle.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// See https://swift.org/CONTRIBUTORS.txt for Swift project authors
//

internal import TestingInternals
internal import _TestingInternals

#if !SWT_NO_FILE_IO
/// A type representing a file handle.
Expand Down
2 changes: 1 addition & 1 deletion Sources/Testing/Support/Locked.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// See https://swift.org/CONTRIBUTORS.txt for Swift project authors
//

internal import TestingInternals
internal import _TestingInternals

/// A type that wraps a value requiring access from a synchronous caller during
/// concurrent execution.
Expand Down
2 changes: 1 addition & 1 deletion Sources/Testing/Support/Versions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// See https://swift.org/CONTRIBUTORS.txt for Swift project authors
//

private import TestingInternals
private import _TestingInternals

/// A human-readable string describing the current operating system's version.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/Testing/Test+Discovery.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// See https://swift.org/CONTRIBUTORS.txt for Swift project authors
//

private import TestingInternals
private import _TestingInternals

/// A protocol describing a type that contains tests.
///
Expand Down
2 changes: 1 addition & 1 deletion Sources/Testing/Traits/Tags/Tag.Color+Loading.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// See https://swift.org/CONTRIBUTORS.txt for Swift project authors
//

private import TestingInternals
private import _TestingInternals

#if !SWT_NO_FILE_IO
#if os(macOS) || (os(iOS) && targetEnvironment(macCatalyst)) || os(Linux)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/// into Swift without introducing a module dependency (and because the name of
/// that module varies on a platform-by-platform basis), we instead include C
/// standard library headers _à la carte_. Symbols from these headers are then
/// imported into Swift when a Swift file imports the `TestingInternals` module.
/// imported into Swift when a Swift file imports the `_TestingInternals` module.
///
/// Also include any platform-specific headers here that are needed by the
/// testing library.
Expand Down
2 changes: 1 addition & 1 deletion Tests/TestingTests/ABIEntryPointTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#if canImport(Foundation) && !SWT_NO_ABI_ENTRY_POINT
@testable @_spi(Experimental) @_spi(ForToolsIntegrationOnly) import Testing
private import TestingInternals
private import _TestingInternals

@Suite("ABI entry point tests")
struct ABIEntryPointTests {
Expand Down
2 changes: 1 addition & 1 deletion Tests/TestingTests/ClockTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//

@testable @_spi(Experimental) @_spi(ForToolsIntegrationOnly) import Testing
private import TestingInternals
private import _TestingInternals

@Suite("Clock API Tests")
struct ClockTests {
Expand Down
2 changes: 1 addition & 1 deletion Tests/TestingTests/DumpTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//

@testable @_spi(ForToolsIntegrationOnly) import Testing
private import TestingInternals
private import _TestingInternals

// NOTE: The tests in this file are here to exercise Plan.dump(), but they are
// not intended to actually test that the output is in a particular format since
Expand Down
2 changes: 1 addition & 1 deletion Tests/TestingTests/EventTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//

@testable @_spi(Experimental) @_spi(ForToolsIntegrationOnly) import Testing
private import TestingInternals
private import _TestingInternals

@Suite("Event Tests")
struct EventTests {
Expand Down
2 changes: 1 addition & 1 deletion Tests/TestingTests/ExitTestTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//

@testable @_spi(Experimental) @_spi(ForToolsIntegrationOnly) import Testing
private import TestingInternals
private import _TestingInternals

#if !SWT_NO_EXIT_TESTS
@Suite("Exit test tests") struct ExitTestTests {
Expand Down
2 changes: 1 addition & 1 deletion Tests/TestingTests/IssueTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//

@testable @_spi(Experimental) @_spi(ForToolsIntegrationOnly) import Testing
private import TestingInternals
private import _TestingInternals

#if canImport(XCTest)
import XCTest
Expand Down
4 changes: 2 additions & 2 deletions Tests/TestingTests/Support/CErrorTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//

@testable import Testing
private import TestingInternals
private import _TestingInternals

@Suite("CError Tests")
struct CErrorTests {
Expand Down Expand Up @@ -38,4 +38,4 @@ struct Win32ErrorTests {
#expect(expectedMessage == description)
}
}
#endif
#endif
2 changes: 1 addition & 1 deletion Tests/TestingTests/Support/EnvironmentTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//

@testable @_spi(Experimental) import Testing
private import TestingInternals
private import _TestingInternals

@Suite("Environment Tests", .serialized)
struct EnvironmentTests {
Expand Down
2 changes: 1 addition & 1 deletion Tests/TestingTests/Support/FileHandleTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//

@testable import Testing
private import TestingInternals
private import _TestingInternals

#if !SWT_NO_FILE_IO
// NOTE: we don't run these tests on iOS (etc.) because processes on those
Expand Down
2 changes: 1 addition & 1 deletion Tests/TestingTests/SwiftPMTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//

@testable @_spi(Experimental) @_spi(ForToolsIntegrationOnly) import Testing
private import TestingInternals
private import _TestingInternals

private func configurationForEntryPoint(withArguments args: [String]) throws -> Configuration {
let args = try parseCommandLineArguments(from: args)
Expand Down
2 changes: 1 addition & 1 deletion Tests/TestingTests/Traits/TagListTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//

@testable @_spi(Experimental) @_spi(ForToolsIntegrationOnly) import Testing
private import TestingInternals
private import _TestingInternals

@Suite("Tag/Tag List Tests", .tags(.traitRelated))
struct TagListTests {
Expand Down
2 changes: 1 addition & 1 deletion Tests/TestingTests/TypeInfoTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//

@testable @_spi(ForToolsIntegrationOnly) import Testing
private import TestingInternals
private import _TestingInternals

@Suite("TypeInfo Tests")
struct TypeInfoTests {
Expand Down
2 changes: 1 addition & 1 deletion Tests/TestingTests/VariadicGenericTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//

import Testing
private import TestingInternals
private import _TestingInternals

@Test func variadicCStringArguments() async throws {
#expect(swt_pointersNotEqual2("abc", "123"))
Expand Down