From 5ac18b14a7a316952bf32ecbc34dc35d849d7f50 Mon Sep 17 00:00:00 2001 From: Tim Ekl Date: Wed, 1 Jan 2020 13:39:17 -0800 Subject: [PATCH] Add missing expectations to send statuses tests f82be27666 flipped around calls to `selectPendingCount(_:)` so that it respected the new async nature of the method; however, it neglected to add enough XCTestExpectations to keep the test methods running through the callbacks. Add those here. --- ...dlySendArticleStatusesOperationTests.swift | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/Frameworks/Account/AccountTests/Feedly/FeedlySendArticleStatusesOperationTests.swift b/Frameworks/Account/AccountTests/Feedly/FeedlySendArticleStatusesOperationTests.swift index 1aee58245..d316b688c 100644 --- a/Frameworks/Account/AccountTests/Feedly/FeedlySendArticleStatusesOperationTests.swift +++ b/Frameworks/Account/AccountTests/Feedly/FeedlySendArticleStatusesOperationTests.swift @@ -75,14 +75,17 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase { waitForExpectations(timeout: 2) + let selectPendingCountExpectation = expectation(description: "Did Select Pending Count") container.database.selectPendingCount { result in do { let statusCount = try result.get() XCTAssertEqual(statusCount, 0) + selectPendingCountExpectation.fulfill() } catch let e { XCTFail("Error unwrapping database result: \(e)") } } + waitForExpectations(timeout: 2) } func testSendUnreadFailure() { @@ -115,14 +118,17 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase { waitForExpectations(timeout: 2) + let selectPendingCountExpectation = expectation(description: "Did Select Pending Count") container.database.selectPendingCount { result in do { let statusCount = try result.get() XCTAssertEqual(statusCount, statuses.count) + selectPendingCountExpectation.fulfill() } catch let e { XCTFail("Error unwrapping database result: \(e)") } } + waitForExpectations(timeout: 2) } func testSendReadSuccess() { @@ -155,14 +161,17 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase { waitForExpectations(timeout: 2) + let selectPendingCountExpectation = expectation(description: "Did Select Pending Count") container.database.selectPendingCount { result in do { let statusCount = try result.get() XCTAssertEqual(statusCount, 0) + selectPendingCountExpectation.fulfill() } catch let e { XCTFail("Error unwrapping database result: \(e)") } } + waitForExpectations(timeout: 2) } func testSendReadFailure() { @@ -195,14 +204,17 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase { waitForExpectations(timeout: 2) + let selectPendingCountExpectation = expectation(description: "Did Select Pending Count") container.database.selectPendingCount { result in do { let statusCount = try result.get() XCTAssertEqual(statusCount, statuses.count) + selectPendingCountExpectation.fulfill() } catch let e { XCTFail("Error unwrapping database result: \(e)") } } + waitForExpectations(timeout: 2) } func testSendStarredSuccess() { @@ -235,14 +247,17 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase { waitForExpectations(timeout: 2) + let selectPendingCountExpectation = expectation(description: "Did Select Pending Count") container.database.selectPendingCount { result in do { let statusCount = try result.get() XCTAssertEqual(statusCount, 0) + selectPendingCountExpectation.fulfill() } catch let e { XCTFail("Error unwrapping database result: \(e)") } } + waitForExpectations(timeout: 2) } func testSendStarredFailure() { @@ -275,14 +290,17 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase { waitForExpectations(timeout: 2) + let selectPendingCountExpectation = expectation(description: "Did Select Pending Count") container.database.selectPendingCount { result in do { let statusCount = try result.get() XCTAssertEqual(statusCount, statuses.count) + selectPendingCountExpectation.fulfill() } catch let e { XCTFail("Error unwrapping database result: \(e)") } } + waitForExpectations(timeout: 2) } func testSendUnstarredSuccess() { @@ -315,14 +333,17 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase { waitForExpectations(timeout: 2) + let selectPendingCountExpectation = expectation(description: "Did Select Pending Count") container.database.selectPendingCount { result in do { let statusCount = try result.get() XCTAssertEqual(statusCount, 0) + selectPendingCountExpectation.fulfill() } catch let e { XCTFail("Error unwrapping database result: \(e)") } } + waitForExpectations(timeout: 2) } func testSendUnstarredFailure() { @@ -355,14 +376,17 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase { waitForExpectations(timeout: 2) + let selectPendingCountExpectation = expectation(description: "Did Select Pending Count") container.database.selectPendingCount { result in do { let expectedCount = try result.get() XCTAssertEqual(expectedCount, statuses.count) + selectPendingCountExpectation.fulfill() } catch let e { XCTFail("Error unwrapping database result: \(e)") } } + waitForExpectations(timeout: 2) } func testSendAllSuccess() { @@ -412,14 +436,17 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase { waitForExpectations(timeout: 2) + let selectPendingCountExpectation = expectation(description: "Did Select Pending Count") container.database.selectPendingCount { result in do { let statusCount = try result.get() XCTAssertEqual(statusCount, 0) + selectPendingCountExpectation.fulfill() } catch let e { XCTFail("Error unwrapping database result: \(e)") } } + waitForExpectations(timeout: 2) } func testSendAllFailure() { @@ -470,13 +497,16 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase { waitForExpectations(timeout: 2) + let selectPendingCountExpectation = expectation(description: "Did Select Pending Count") container.database.selectPendingCount { result in do { let statusCount = try result.get() XCTAssertEqual(statusCount, statuses.count) + selectPendingCountExpectation.fulfill() } catch let e { XCTFail("Error unwrapping database result: \(e)") } } + waitForExpectations(timeout: 2) } }