From 152b1f2b8a5d95ab33cc12b9159ff267542bfd87 Mon Sep 17 00:00:00 2001 From: Tim Ekl Date: Tue, 31 Dec 2019 19:27:47 -0600 Subject: [PATCH] Fix errors in Feedly sync unread operations tests Yet more completion blocks with Results; apply the usual do/catch/Result.get() dance. --- ...edlySyncUnreadStatusesOperationTests.swift | 37 +++++++++++++------ 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/Frameworks/Account/AccountTests/Feedly/FeedlySyncUnreadStatusesOperationTests.swift b/Frameworks/Account/AccountTests/Feedly/FeedlySyncUnreadStatusesOperationTests.swift index fa4864a73..67b9dd4e9 100644 --- a/Frameworks/Account/AccountTests/Feedly/FeedlySyncUnreadStatusesOperationTests.swift +++ b/Frameworks/Account/AccountTests/Feedly/FeedlySyncUnreadStatusesOperationTests.swift @@ -56,10 +56,15 @@ class FeedlySyncUnreadStatusesOperationTests: XCTestCase { let expectedArticleIds = Set(ids) let fetchIdsExpectation = expectation(description: "Fetch Article Ids") - account.fetchUnreadArticleIDs { unreadArticleIds in - let missingIds = expectedArticleIds.subtracting(unreadArticleIds) - XCTAssertTrue(missingIds.isEmpty, "These article ids were not marked as unread.") - fetchIdsExpectation.fulfill() + account.fetchUnreadArticleIDs { unreadArticleIdsResult in + do { + let unreadArticleIds = try unreadArticleIdsResult.get() + let missingIds = expectedArticleIds.subtracting(unreadArticleIds) + XCTAssertTrue(missingIds.isEmpty, "These article ids were not marked as unread.") + fetchIdsExpectation.fulfill() + } catch let e { + XCTFail("Error checking unread article IDs: \(e)") + } } waitForExpectations(timeout: 2) } @@ -93,9 +98,14 @@ class FeedlySyncUnreadStatusesOperationTests: XCTestCase { waitForExpectations(timeout: 2) let fetchIdsExpectation = expectation(description: "Fetch Article Ids") - account.fetchUnreadArticleIDs { unreadArticleIds in - XCTAssertTrue(unreadArticleIds.isEmpty) - fetchIdsExpectation.fulfill() + account.fetchUnreadArticleIDs { unreadArticleIdsResult in + do { + let unreadArticleIds = try unreadArticleIdsResult.get() + XCTAssertTrue(unreadArticleIds.isEmpty) + fetchIdsExpectation.fulfill() + } catch let e { + XCTFail("Error checking unread article IDs: \(e)") + } } waitForExpectations(timeout: 2) } @@ -142,10 +152,15 @@ class FeedlySyncUnreadStatusesOperationTests: XCTestCase { // Find statuses inserted. let expectedArticleIds = Set(service.pages.values.map { $0.ids }.flatMap { $0 }) let fetchIdsExpectation = expectation(description: "Fetch Article Ids") - account.fetchUnreadArticleIDs { unreadArticleIds in - let missingIds = expectedArticleIds.subtracting(unreadArticleIds) - XCTAssertTrue(missingIds.isEmpty, "These article ids were not marked as unread.") - fetchIdsExpectation.fulfill() + account.fetchUnreadArticleIDs { unreadArticleIdsResult in + do { + let unreadArticleIds = try unreadArticleIdsResult.get() + let missingIds = expectedArticleIds.subtracting(unreadArticleIds) + XCTAssertTrue(missingIds.isEmpty, "These article ids were not marked as unread.") + fetchIdsExpectation.fulfill() + } catch let e { + XCTFail("Error checking unread article IDs: \(e)") + } } waitForExpectations(timeout: 2) }