From d1d666bf96cbe8b7ac47ab07fdedb5d4f00d3cf5 Mon Sep 17 00:00:00 2001 From: Nikita Konopelko Date: Mon, 8 Apr 2024 14:05:39 +0200 Subject: [PATCH] renaming NQueue -> Threading --- Package.resolved | 12 ++++---- Package.swift | 24 ++++++++-------- Package@swift-5.5.swift | 18 ++++++------ Package@swift-5.6.swift | 18 ++++++------ Package@swift-5.7.swift | 18 ++++++------ Package@swift-5.8.swift | 18 ++++++------ TestHelpers/DelayedQueue+TestHelper.swift | 4 +-- TestHelpers/FakeMutexing.swift | 16 +++++------ TestHelpers/FakeQueue.swift | 34 ++++++++++++----------- TestHelpers/Queue+TestHelper.swift | 4 +-- Tests/DelayedQueueTests.swift | 7 ++--- Tests/DispatchTime+QueueTests.swift | 6 ++-- Tests/QueueTests.swift | 6 ++-- 13 files changed, 91 insertions(+), 94 deletions(-) diff --git a/Package.resolved b/Package.resolved index d7d573c..8ad3677 100644 --- a/Package.resolved +++ b/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/mattgallagher/CwlCatchException.git", "state" : { - "revision" : "3b123999de19bf04905bc1dfdb76f817b0f2cc00", - "version" : "2.1.2" + "revision" : "3ef6999c73b6938cc0da422f2c912d0158abb0a0", + "version" : "2.2.0" } }, { @@ -19,12 +19,12 @@ } }, { - "identity" : "nspry", + "identity" : "sprykit", "kind" : "remoteSourceControl", - "location" : "https://github.com/NikSativa/NSpry.git", + "location" : "https://github.com/NikSativa/SpryKit.git", "state" : { - "revision" : "2bd07efd49af15a1afd1e44ea9212383c55d3a31", - "version" : "2.1.4" + "revision" : "e15daa49ecd106aeceab734e4fd7207e26a8ba4c", + "version" : "2.2.0" } } ], diff --git a/Package.swift b/Package.swift index 641a8e2..216aa7b 100644 --- a/Package.swift +++ b/Package.swift @@ -3,7 +3,7 @@ import PackageDescription let package = Package( - name: "NQueue", + name: "Threading", platforms: [ .iOS(.v13), .macOS(.v11), @@ -13,34 +13,34 @@ let package = Package( .watchOS(.v6) ], products: [ - .library(name: "NQueue", targets: ["NQueue"]), - .library(name: "NQueueTestHelpers", targets: ["NQueueTestHelpers"]) + .library(name: "Threading", targets: ["Threading"]), + .library(name: "ThreadingTestHelpers", targets: ["ThreadingTestHelpers"]) ], dependencies: [ - .package(url: "https://github.com/NikSativa/NSpry.git", .upToNextMajor(from: "2.1.4")) + .package(url: "https://github.com/NikSativa/SpryKit.git", .upToNextMajor(from: "2.2.0")) ], targets: [ - .target(name: "NQueue", + .target(name: "Threading", dependencies: [ ], path: "Source", resources: [ .copy("../PrivacyInfo.xcprivacy") ]), - .target(name: "NQueueTestHelpers", + .target(name: "ThreadingTestHelpers", dependencies: [ - "NQueue", - "NSpry" + "Threading", + "SpryKit" ], path: "TestHelpers", resources: [ .copy("../PrivacyInfo.xcprivacy") ]), - .testTarget(name: "NQueueTests", + .testTarget(name: "ThreadingTests", dependencies: [ - "NQueue", - "NQueueTestHelpers", - "NSpry" + "Threading", + "ThreadingTestHelpers", + "SpryKit" ], path: "Tests") ] diff --git a/Package@swift-5.5.swift b/Package@swift-5.5.swift index 07985da..f017323 100644 --- a/Package@swift-5.5.swift +++ b/Package@swift-5.5.swift @@ -3,7 +3,7 @@ import PackageDescription let package = Package( - name: "NQueue", + name: "Threading", platforms: [ .iOS(.v13), .macOS(.v11), @@ -12,33 +12,33 @@ let package = Package( .watchOS(.v6) ], products: [ - .library(name: "NQueue", targets: ["NQueue"]), - .library(name: "NQueueTestHelpers", targets: ["NQueueTestHelpers"]) + .library(name: "Threading", targets: ["Threading"]), + .library(name: "ThreadingTestHelpers", targets: ["ThreadingTestHelpers"]) ], dependencies: [ .package(url: "https://github.com/NikSativa/NSpry.git", .upToNextMajor(from: "2.1.4")) ], targets: [ - .target(name: "NQueue", + .target(name: "Threading", dependencies: [ ], path: "Source", resources: [ .copy("../PrivacyInfo.xcprivacy") ]), - .target(name: "NQueueTestHelpers", + .target(name: "ThreadingTestHelpers", dependencies: [ - "NQueue", + "Threading", "NSpry" ], path: "TestHelpers", resources: [ .copy("../PrivacyInfo.xcprivacy") ]), - .testTarget(name: "NQueueTests", + .testTarget(name: "ThreadingTests", dependencies: [ - "NQueue", - "NQueueTestHelpers", + "Threading", + "ThreadingTestHelpers", "NSpry" ], path: "Tests") diff --git a/Package@swift-5.6.swift b/Package@swift-5.6.swift index a45a4ef..468d5a6 100644 --- a/Package@swift-5.6.swift +++ b/Package@swift-5.6.swift @@ -3,7 +3,7 @@ import PackageDescription let package = Package( - name: "NQueue", + name: "Threading", platforms: [ .iOS(.v13), .macOS(.v11), @@ -12,33 +12,33 @@ let package = Package( .watchOS(.v6) ], products: [ - .library(name: "NQueue", targets: ["NQueue"]), - .library(name: "NQueueTestHelpers", targets: ["NQueueTestHelpers"]) + .library(name: "Threading", targets: ["Threading"]), + .library(name: "ThreadingTestHelpers", targets: ["ThreadingTestHelpers"]) ], dependencies: [ .package(url: "https://github.com/NikSativa/NSpry.git", .upToNextMajor(from: "2.1.4")) ], targets: [ - .target(name: "NQueue", + .target(name: "Threading", dependencies: [ ], path: "Source", resources: [ .copy("../PrivacyInfo.xcprivacy") ]), - .target(name: "NQueueTestHelpers", + .target(name: "ThreadingTestHelpers", dependencies: [ - "NQueue", + "Threading", "NSpry" ], path: "TestHelpers", resources: [ .copy("../PrivacyInfo.xcprivacy") ]), - .testTarget(name: "NQueueTests", + .testTarget(name: "ThreadingTests", dependencies: [ - "NQueue", - "NQueueTestHelpers", + "Threading", + "ThreadingTestHelpers", "NSpry" ], path: "Tests") diff --git a/Package@swift-5.7.swift b/Package@swift-5.7.swift index 9f38882..2a2f8c8 100644 --- a/Package@swift-5.7.swift +++ b/Package@swift-5.7.swift @@ -3,7 +3,7 @@ import PackageDescription let package = Package( - name: "NQueue", + name: "Threading", platforms: [ .iOS(.v13), .macOS(.v11), @@ -12,33 +12,33 @@ let package = Package( .watchOS(.v6) ], products: [ - .library(name: "NQueue", targets: ["NQueue"]), - .library(name: "NQueueTestHelpers", targets: ["NQueueTestHelpers"]) + .library(name: "Threading", targets: ["Threading"]), + .library(name: "ThreadingTestHelpers", targets: ["ThreadingTestHelpers"]) ], dependencies: [ .package(url: "https://github.com/NikSativa/NSpry.git", .upToNextMajor(from: "2.1.4")) ], targets: [ - .target(name: "NQueue", + .target(name: "Threading", dependencies: [ ], path: "Source", resources: [ .copy("../PrivacyInfo.xcprivacy") ]), - .target(name: "NQueueTestHelpers", + .target(name: "ThreadingTestHelpers", dependencies: [ - "NQueue", + "Threading", "NSpry" ], path: "TestHelpers", resources: [ .copy("../PrivacyInfo.xcprivacy") ]), - .testTarget(name: "NQueueTests", + .testTarget(name: "ThreadingTests", dependencies: [ - "NQueue", - "NQueueTestHelpers", + "Threading", + "ThreadingTestHelpers", "NSpry" ], path: "Tests") diff --git a/Package@swift-5.8.swift b/Package@swift-5.8.swift index 14ab857..daead10 100644 --- a/Package@swift-5.8.swift +++ b/Package@swift-5.8.swift @@ -3,7 +3,7 @@ import PackageDescription let package = Package( - name: "NQueue", + name: "Threading", platforms: [ .iOS(.v13), .macOS(.v11), @@ -12,33 +12,33 @@ let package = Package( .watchOS(.v6) ], products: [ - .library(name: "NQueue", targets: ["NQueue"]), - .library(name: "NQueueTestHelpers", targets: ["NQueueTestHelpers"]) + .library(name: "Threading", targets: ["Threading"]), + .library(name: "ThreadingTestHelpers", targets: ["ThreadingTestHelpers"]) ], dependencies: [ .package(url: "https://github.com/NikSativa/NSpry.git", .upToNextMajor(from: "2.1.4")) ], targets: [ - .target(name: "NQueue", + .target(name: "Threading", dependencies: [ ], path: "Source", resources: [ .copy("../PrivacyInfo.xcprivacy") ]), - .target(name: "NQueueTestHelpers", + .target(name: "ThreadingTestHelpers", dependencies: [ - "NQueue", + "Threading", "NSpry" ], path: "TestHelpers", resources: [ .copy("../PrivacyInfo.xcprivacy") ]), - .testTarget(name: "NQueueTests", + .testTarget(name: "ThreadingTests", dependencies: [ - "NQueue", - "NQueueTestHelpers", + "Threading", + "ThreadingTestHelpers", "NSpry" ], path: "Tests") diff --git a/TestHelpers/DelayedQueue+TestHelper.swift b/TestHelpers/DelayedQueue+TestHelper.swift index cab2118..0fac36f 100644 --- a/TestHelpers/DelayedQueue+TestHelper.swift +++ b/TestHelpers/DelayedQueue+TestHelper.swift @@ -1,6 +1,6 @@ import Foundation -import NQueue -import NSpry +import SpryKit +import Threading // MARK: - DelayedQueue + Equatable, SpryEquatable diff --git a/TestHelpers/FakeMutexing.swift b/TestHelpers/FakeMutexing.swift index e40badf..d002555 100644 --- a/TestHelpers/FakeMutexing.swift +++ b/TestHelpers/FakeMutexing.swift @@ -1,27 +1,27 @@ import Foundation -import NQueue -import NSpry +import SpryKit +import Threading -final class FakeMutexing: Mutexing, Spryable { - enum ClassFunction: String, StringRepresentable { +public final class FakeMutexing: Mutexing, Spryable { + public enum ClassFunction: String, StringRepresentable { case empty } - enum Function: String, StringRepresentable { + public enum Function: String, StringRepresentable { case async = "sync(execute:)" case trySync = "trySync(execute:)" } - var shouldFireClosures: Bool = false + public var shouldFireClosures: Bool = false - func sync(execute work: () throws -> R) rethrows -> R { + public func sync(execute work: () throws -> R) rethrows -> R { if shouldFireClosures { return try spryify(fallbackValue: work()) } return spryify() } - func trySync(execute work: () throws -> R) rethrows -> R { + public func trySync(execute work: () throws -> R) rethrows -> R { if shouldFireClosures { return try spryify(fallbackValue: work()) } diff --git a/TestHelpers/FakeQueue.swift b/TestHelpers/FakeQueue.swift index 6474f6b..cae0302 100644 --- a/TestHelpers/FakeQueue.swift +++ b/TestHelpers/FakeQueue.swift @@ -1,13 +1,13 @@ import Foundation -import NQueue -import NSpry +import SpryKit +import Threading -final class FakeQueueable: Queueable, Spryable { - enum ClassFunction: String, StringRepresentable { +public final class FakeQueueable: Queueable, Spryable { + public enum ClassFunction: String, StringRepresentable { case empty } - enum Function: String, StringRepresentable { + public enum Function: String, StringRepresentable { case async = "async(execute:)" case asyncAfter = "asyncAfter(deadline:execute:)" case asyncAfterWithFlags = "asyncAfter(deadline:flags:execute:)" @@ -16,25 +16,27 @@ final class FakeQueueable: Queueable, Spryable { case syncWithFlags = "sync(flags:execute:)" } - var shouldFireSyncClosures: Bool = false - var asyncWorkItem: (() -> Void)? + public init() {} - func async(execute workItem: @escaping () -> Void) { + public var shouldFireSyncClosures: Bool = false + public var asyncWorkItem: (() -> Void)? + + public func async(execute workItem: @escaping () -> Void) { asyncWorkItem = workItem return spryify(arguments: workItem) } - func asyncAfter(deadline: DispatchTime, flags: Queue.Flags, execute work: @escaping () -> Void) { + public func asyncAfter(deadline: DispatchTime, flags: Queue.Flags, execute work: @escaping () -> Void) { asyncWorkItem = work return spryify(arguments: deadline, flags, work) } - func asyncAfter(deadline: DispatchTime, execute work: @escaping () -> Void) { + public func asyncAfter(deadline: DispatchTime, execute work: @escaping () -> Void) { asyncWorkItem = work return spryify(arguments: deadline, work) } - func sync(execute workItem: () -> Void) { + public func sync(execute workItem: () -> Void) { if shouldFireSyncClosures { workItem() } @@ -42,7 +44,7 @@ final class FakeQueueable: Queueable, Spryable { return spryify() } - func sync(execute workItem: () throws -> Void) rethrows { + public func sync(execute workItem: () throws -> Void) rethrows { if shouldFireSyncClosures { try workItem() } @@ -50,7 +52,7 @@ final class FakeQueueable: Queueable, Spryable { return spryify() } - func sync(flags: Queue.Flags, execute work: () throws -> T) rethrows -> T { + public func sync(flags: Queue.Flags, execute work: () throws -> T) rethrows -> T { if shouldFireSyncClosures { return try spryify(arguments: flags, fallbackValue: work()) } @@ -58,7 +60,7 @@ final class FakeQueueable: Queueable, Spryable { return spryify(arguments: flags) } - func sync(execute work: () throws -> T) rethrows -> T { + public func sync(execute work: () throws -> T) rethrows -> T { if shouldFireSyncClosures { return try spryify(fallbackValue: work()) } @@ -66,7 +68,7 @@ final class FakeQueueable: Queueable, Spryable { return spryify() } - func sync(flags: Queue.Flags, execute work: () -> T) -> T { + public func sync(flags: Queue.Flags, execute work: () -> T) -> T { if shouldFireSyncClosures { return spryify(arguments: flags, fallbackValue: work()) } @@ -74,7 +76,7 @@ final class FakeQueueable: Queueable, Spryable { return spryify(arguments: flags) } - func sync(execute work: () -> T) -> T { + public func sync(execute work: () -> T) -> T { if shouldFireSyncClosures { return spryify(fallbackValue: work()) } diff --git a/TestHelpers/Queue+TestHelper.swift b/TestHelpers/Queue+TestHelper.swift index e557ed0..a8fa2bb 100644 --- a/TestHelpers/Queue+TestHelper.swift +++ b/TestHelpers/Queue+TestHelper.swift @@ -1,6 +1,6 @@ import Foundation -import NQueue -import NSpry +import SpryKit +import Threading extension Queue: SpryEquatable {} extension Queue.Attributes: SpryEquatable {} diff --git a/Tests/DelayedQueueTests.swift b/Tests/DelayedQueueTests.swift index a42560a..f1842c8 100644 --- a/Tests/DelayedQueueTests.swift +++ b/Tests/DelayedQueueTests.swift @@ -1,11 +1,10 @@ import Dispatch import Foundation -import NSpry +import SpryKit +import Threading +import ThreadingTestHelpers import XCTest -@testable import NQueue -@testable import NQueueTestHelpers - final class DelayedQueueTests: XCTestCase { // MARK: - fake diff --git a/Tests/DispatchTime+QueueTests.swift b/Tests/DispatchTime+QueueTests.swift index 66a6f16..1152a1d 100644 --- a/Tests/DispatchTime+QueueTests.swift +++ b/Tests/DispatchTime+QueueTests.swift @@ -1,11 +1,9 @@ import Dispatch import Foundation -import NSpry +import SpryKit +import Threading import XCTest -@testable import NQueue -@testable import NQueueTestHelpers - final class DispatchTime_QueueTests: XCTestCase { func test_seconds() { XCTAssertEqual(DispatchTimeInterval.seconds(2.2), .nanoseconds(22 * Int(1E+8))) diff --git a/Tests/QueueTests.swift b/Tests/QueueTests.swift index fc9eb06..58929a5 100644 --- a/Tests/QueueTests.swift +++ b/Tests/QueueTests.swift @@ -1,11 +1,9 @@ import Dispatch import Foundation -import NSpry +import SpryKit +import Threading import XCTest -@testable import NQueue -@testable import NQueueTestHelpers - final class QueueTests: XCTestCase { func test_async() { let callExpectation = expectation(description: "should be called")