FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve errors in Feedly statuses operation tests 

Add `error` parameters to completion blocks which now pass them. Assert
these errors are always nil in the existing tests.

Flip calls to `selectPendingCount()` so they are async, with a
completion block that asserts about the results instead of asserting
about the return value. Since the closure takes a Result, unwrap it in a
do/catch block at each site; `XCTAssertNoThrow` doesn't help us bubble a
value out from `Result.get()`, and I'd rather not use `try!` here. There
might be a stylistic discussion to be had about this unwrapping, though.
This commit is contained in:
Tim Ekl 2019-12-31 15:52:54 -06:00
parent 8a85b18d09
commit f82be27666
1 changed files with 101 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
Frameworks/Account/AccountTests/Feedly/FeedlySendArticleStatusesOperationTests.swift
View File

@ -50,7 +50,8 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
let statuses = articleIds.map { SyncStatus(articleID: $0, key: .read, flag: false) }
let insertExpectation = expectation(description: "Inserted Statuses")
container.database.insertStatuses(statuses) {
container.database.insertStatuses(statuses) { error in
XCTAssertNil(error)
insertExpectation.fulfill()
}
@ -74,7 +75,14 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
waitForExpectations(timeout: 2)
XCTAssertEqual(container.database.selectPendingCount(), 0)
container.database.selectPendingCount { result in
do {
let statusCount = try result.get()
XCTAssertEqual(statusCount, 0)
} catch let e {
XCTFail("Error unwrapping database result: \(e)")
}
}
}
func testSendUnreadFailure() {
@ -82,7 +90,8 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
let statuses = articleIds.map { SyncStatus(articleID: $0, key: .read, flag: false) }
let insertExpectation = expectation(description: "Inserted Statuses")
container.database.insertStatuses(statuses) {
container.database.insertStatuses(statuses) { error in
XCTAssertNil(error)
insertExpectation.fulfill()
}
@ -106,7 +115,14 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
waitForExpectations(timeout: 2)
XCTAssertEqual(container.database.selectPendingCount(), statuses.count)
container.database.selectPendingCount { result in
do {
let statusCount = try result.get()
XCTAssertEqual(statusCount, statuses.count)
} catch let e {
XCTFail("Error unwrapping database result: \(e)")
}
}
}
func testSendReadSuccess() {
@ -114,7 +130,8 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
let statuses = articleIds.map { SyncStatus(articleID: $0, key: .read, flag: true) }
let insertExpectation = expectation(description: "Inserted Statuses")
container.database.insertStatuses(statuses) {
container.database.insertStatuses(statuses) { error in
XCTAssertNil(error)
insertExpectation.fulfill()
}
@ -138,7 +155,14 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
waitForExpectations(timeout: 2)
XCTAssertEqual(container.database.selectPendingCount(), 0)
container.database.selectPendingCount { result in
do {
let statusCount = try result.get()
XCTAssertEqual(statusCount, 0)
} catch let e {
XCTFail("Error unwrapping database result: \(e)")
}
}
}
func testSendReadFailure() {
@ -146,7 +170,8 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
let statuses = articleIds.map { SyncStatus(articleID: $0, key: .read, flag: true) }
let insertExpectation = expectation(description: "Inserted Statuses")
container.database.insertStatuses(statuses) {
container.database.insertStatuses(statuses) { error in
XCTAssertNil(error)
insertExpectation.fulfill()
}
@ -170,7 +195,14 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
waitForExpectations(timeout: 2)
XCTAssertEqual(container.database.selectPendingCount(), statuses.count)
container.database.selectPendingCount { result in
do {
let statusCount = try result.get()
XCTAssertEqual(statusCount, statuses.count)
} catch let e {
XCTFail("Error unwrapping database result: \(e)")
}
}
}
func testSendStarredSuccess() {
@ -178,7 +210,8 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
let statuses = articleIds.map { SyncStatus(articleID: $0, key: .starred, flag: true) }
let insertExpectation = expectation(description: "Inserted Statuses")
container.database.insertStatuses(statuses) {
container.database.insertStatuses(statuses) { error in
XCTAssertNil(error)
insertExpectation.fulfill()
}
@ -202,7 +235,14 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
waitForExpectations(timeout: 2)
XCTAssertEqual(container.database.selectPendingCount(), 0)
container.database.selectPendingCount { result in
do {
let statusCount = try result.get()
XCTAssertEqual(statusCount, 0)
} catch let e {
XCTFail("Error unwrapping database result: \(e)")
}
}
}
func testSendStarredFailure() {
@ -210,7 +250,8 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
let statuses = articleIds.map { SyncStatus(articleID: $0, key: .starred, flag: true) }
let insertExpectation = expectation(description: "Inserted Statuses")
container.database.insertStatuses(statuses) {
container.database.insertStatuses(statuses) { error in
XCTAssertNil(error)
insertExpectation.fulfill()
}
@ -234,7 +275,14 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
waitForExpectations(timeout: 2)
XCTAssertEqual(container.database.selectPendingCount(), statuses.count)
container.database.selectPendingCount { result in
do {
let statusCount = try result.get()
XCTAssertEqual(statusCount, statuses.count)
} catch let e {
XCTFail("Error unwrapping database result: \(e)")
}
}
}
func testSendUnstarredSuccess() {
@ -242,7 +290,8 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
let statuses = articleIds.map { SyncStatus(articleID: $0, key: .starred, flag: false) }
let insertExpectation = expectation(description: "Inserted Statuses")
container.database.insertStatuses(statuses) {
container.database.insertStatuses(statuses) { error in
XCTAssertNil(error)
insertExpectation.fulfill()
}
@ -266,7 +315,14 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
waitForExpectations(timeout: 2)
XCTAssertEqual(container.database.selectPendingCount(), 0)
container.database.selectPendingCount { result in
do {
let statusCount = try result.get()
XCTAssertEqual(statusCount, 0)
} catch let e {
XCTFail("Error unwrapping database result: \(e)")
}
}
}
func testSendUnstarredFailure() {
@ -274,7 +330,8 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
let statuses = articleIds.map { SyncStatus(articleID: $0, key: .starred, flag: false) }
let insertExpectation = expectation(description: "Inserted Statuses")
container.database.insertStatuses(statuses) {
container.database.insertStatuses(statuses) { error in
XCTAssertNil(error)
insertExpectation.fulfill()
}
@ -298,7 +355,14 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
waitForExpectations(timeout: 2)
XCTAssertEqual(container.database.selectPendingCount(), statuses.count)
container.database.selectPendingCount { result in
do {
let expectedCount = try result.get()
XCTAssertEqual(expectedCount, statuses.count)
} catch let e {
XCTFail("Error unwrapping database result: \(e)")
}
}
}
func testSendAllSuccess() {
@ -313,7 +377,8 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
}
let insertExpectation = expectation(description: "Inserted Statuses")
container.database.insertStatuses(statuses) {
container.database.insertStatuses(statuses) { error in
XCTAssertNil(error)
insertExpectation.fulfill()
}
@ -346,7 +411,15 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
OperationQueue.main.addOperation(send)
waitForExpectations(timeout: 2)
XCTAssertEqual(container.database.selectPendingCount(), 0)
container.database.selectPendingCount { result in
do {
let statusCount = try result.get()
XCTAssertEqual(statusCount, 0)
} catch let e {
XCTFail("Error unwrapping database result: \(e)")
}
}
}
func testSendAllFailure() {
@ -361,7 +434,8 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
}
let insertExpectation = expectation(description: "Inserted Statuses")
container.database.insertStatuses(statuses) {
container.database.insertStatuses(statuses) { error in
XCTAssertNil(error)
insertExpectation.fulfill()
}
@ -396,6 +470,13 @@ class FeedlySendArticleStatusesOperationTests: XCTestCase {
waitForExpectations(timeout: 2)
XCTAssertEqual(container.database.selectPendingCount(), statuses.count)
container.database.selectPendingCount { result in
do {
let statusCount = try result.get()
XCTAssertEqual(statusCount, statuses.count)
} catch let e {
XCTFail("Error unwrapping database result: \(e)")
}
}
}
}