From d38bb3bc71591cb9a3bf82e218d364e0b4b3d4df Mon Sep 17 00:00:00 2001 From: Matt Massicotte <85322+mattmassicotte@users.noreply.github.com> Date: Tue, 10 Mar 2020 13:34:36 -0400 Subject: [PATCH] serialQueue wasn't actually serial --- .../Extensions/OperationQueue+Creation.swift | 2 +- OperationPlus/OperationPlus.xcconfig | 4 ++-- OperationPlusTests/OperationQueueTests.swift | 13 +++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/OperationPlus/Extensions/OperationQueue+Creation.swift b/OperationPlus/Extensions/OperationQueue+Creation.swift index 0277367..5d207c6 100644 --- a/OperationPlus/Extensions/OperationQueue+Creation.swift +++ b/OperationPlus/Extensions/OperationQueue+Creation.swift @@ -27,6 +27,6 @@ extension OperationQueue { } public static func serialQueue(named name: String) -> OperationQueue { - return OperationQueue(name: name) + return OperationQueue(name: name, maxConcurrentOperations: 1) } } diff --git a/OperationPlus/OperationPlus.xcconfig b/OperationPlus/OperationPlus.xcconfig index ba054e1..2bada0f 100644 --- a/OperationPlus/OperationPlus.xcconfig +++ b/OperationPlus/OperationPlus.xcconfig @@ -14,8 +14,8 @@ PRODUCT_NAME = OperationPlus PRODUCT_BUNDLE_IDENTIFIER = com.chimehq.OperationPlus PRODUCT_MODULE_NAME = OperationPlus -CURRENT_PROJECT_VERSION = 8 -MARKETING_VERSION = 1.5.0 +CURRENT_PROJECT_VERSION = 9 +MARKETING_VERSION = 1.5.1 INFOPLIST_FILE = OperationPlus/Info.plist diff --git a/OperationPlusTests/OperationQueueTests.swift b/OperationPlusTests/OperationQueueTests.swift index 870f94d..3564c3a 100644 --- a/OperationPlusTests/OperationQueueTests.swift +++ b/OperationPlusTests/OperationQueueTests.swift @@ -11,6 +11,19 @@ import OperationTestingPlus @testable import OperationPlus class OperationQueueTests: XCTestCase { + func testSerialCreation() { + let queue = OperationQueue.serialQueue() + + XCTAssertEqual(queue.maxConcurrentOperationCount, 1) + } + + func testNamedSerialCreation() { + let queue = OperationQueue.serialQueue(named: "myqueue") + + XCTAssertEqual(queue.name, "myqueue") + XCTAssertEqual(queue.maxConcurrentOperationCount, 1) + } + func testDependencies() { let opA = Operation() let opB = Operation()