From f9f4d708684c235dbfc5b2b597058a5e0ff0edaf Mon Sep 17 00:00:00 2001 From: Brent Simmons Date: Sun, 19 Jan 2020 22:19:54 -0800 Subject: [PATCH] Make Feedly tests build again. --- .../Feedly/FeedlyLogoutOperationTests.swift | 1 - .../AccountTests/Feedly/FeedlyOperationTests.swift | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Frameworks/Account/AccountTests/Feedly/FeedlyLogoutOperationTests.swift b/Frameworks/Account/AccountTests/Feedly/FeedlyLogoutOperationTests.swift index bf80be311..91a0ecd0a 100644 --- a/Frameworks/Account/AccountTests/Feedly/FeedlyLogoutOperationTests.swift +++ b/Frameworks/Account/AccountTests/Feedly/FeedlyLogoutOperationTests.swift @@ -80,7 +80,6 @@ class FeedlyLogoutOperationTests: XCTestCase { waitForExpectations(timeout: 1) XCTAssertTrue(logout.isCanceled) - XCTAssertTrue(logout.isFinished) do { let accountAccessToken = try account.retrieveCredentials(type: .oauthAccessToken) diff --git a/Frameworks/Account/AccountTests/Feedly/FeedlyOperationTests.swift b/Frameworks/Account/AccountTests/Feedly/FeedlyOperationTests.swift index 48282ae17..c1063af86 100644 --- a/Frameworks/Account/AccountTests/Feedly/FeedlyOperationTests.swift +++ b/Frameworks/Account/AccountTests/Feedly/FeedlyOperationTests.swift @@ -30,7 +30,7 @@ class FeedlyOperationTests: XCTestCase { didCallMainExpectation?.fulfill() if let error = mockError { - didFinish(error) + didFinish(with: error) } else { didFinish() } @@ -88,16 +88,12 @@ class FeedlyOperationTests: XCTestCase { } - XCTAssertFalse(testOperation.isFinished) - XCTAssertFalse(testOperation.isExecuting) XCTAssertFalse(testOperation.isCanceled) MainThreadOperationQueue.shared.addOperation(testOperation) waitForExpectations(timeout: 2) - XCTAssertTrue(testOperation.isFinished) - XCTAssertFalse(testOperation.isExecuting) XCTAssertFalse(testOperation.isCanceled) } @@ -111,8 +107,6 @@ class FeedlyOperationTests: XCTestCase { completionExpectation.fulfill() } - XCTAssertFalse(testOperation.isFinished) - XCTAssertFalse(testOperation.isExecuting) XCTAssertFalse(testOperation.isCanceled) MainThreadOperationQueue.shared.addOperation(testOperation) @@ -121,8 +115,6 @@ class FeedlyOperationTests: XCTestCase { waitForExpectations(timeout: 2) - XCTAssertTrue(testOperation.isFinished) - XCTAssertFalse(testOperation.isExecuting) XCTAssertTrue(testOperation.isCanceled) }