Skip to content

Migrate Stores to async/await #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mapostolakis merged 5 commits into from
Nov 11, 2025
Merged

Migrate Stores to async/await #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
167b71d
Introduce new CoreDataFeedStore async method and deprecate the sync one
caiozullo Oct 29, 2025
fb1e44b
Migrate `CoreDataFeedStoreTests` to new async API
caiozullo Oct 29, 2025
c8ef13c
Migrate `CoreDataFeedImageDataStoreTests` to new async API
caiozullo Oct 29, 2025
47582d4
Migrate `CoreDataFeedStoreScheduler` to new async API
caiozullo Oct 29, 2025
624984e
Remove deprecated `CoreDataFeedStore` sync API in favor of the new as…
caiozullo Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions EssentialApp/EssentialApp/CombineHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ extension AnyDispatchQueueScheduler {
CoreDataFeedStoreScheduler(store: store).eraseToAnyScheduler()
}

@MainActor
private struct CoreDataFeedStoreScheduler: Scheduler {
let store: CoreDataFeedStore

Expand All @@ -239,7 +240,9 @@ extension AnyDispatchQueueScheduler {
action()
} else {
nonisolated(unsafe) let uncheckedAction = action
store.perform { uncheckedAction() }
Task.immediate {
await store.perform { uncheckedAction() }
}
}
return AnyCancellable {}
}
Expand All @@ -249,7 +252,9 @@ extension AnyDispatchQueueScheduler {
action()
} else {
nonisolated(unsafe) let uncheckedAction = action
store.perform { uncheckedAction() }
Task.immediate {
await store.perform { uncheckedAction() }
}
}
}

Expand All @@ -258,7 +263,9 @@ extension AnyDispatchQueueScheduler {
action()
} else {
nonisolated(unsafe) let uncheckedAction = action
store.perform { uncheckedAction() }
Task.immediate {
await store.perform { uncheckedAction() }
}
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions EssentialFeed/EssentialFeed/Feed Cache/Infrastructure/CoreData/CoreDataFeedStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ public final class CoreDataFeedStore: Sendable {
}
}

public func perform(_ action: @Sendable @escaping () -> Void) {
context.perform(action)
public func perform<T>(_ action: @escaping @Sendable () throws -> T) async rethrows -> T {
try await context.perform(action)
}

private func cleanUpReferencesToPersistentStores() {
Expand Down
23 changes: 10 additions & 13 deletions EssentialFeed/EssentialFeedTests/Feed Cache/CoreDataFeedImageDataStoreTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,45 +8,42 @@ import EssentialFeed
@MainActor
class CoreDataFeedImageDataStoreTests: XCTestCase, FeedImageDataStoreSpecs {

func test_retrieveImageData_deliversNotFoundWhenEmpty() throws {
try makeSUT { sut, imageDataURL in
func test_retrieveImageData_deliversNotFoundWhenEmpty() async throws {
try await makeSUT { sut, imageDataURL in
assertThatRetrieveImageDataDeliversNotFoundOnEmptyCache(on: sut, imageDataURL: imageDataURL)
}
}

func test_retrieveImageData_deliversNotFoundWhenStoredDataURLDoesNotMatch() throws {
try makeSUT { sut, imageDataURL in
func test_retrieveImageData_deliversNotFoundWhenStoredDataURLDoesNotMatch() async throws {
try await makeSUT { sut, imageDataURL in
assertThatRetrieveImageDataDeliversNotFoundWhenStoredDataURLDoesNotMatch(on: sut, imageDataURL: imageDataURL)
}
}

func test_retrieveImageData_deliversFoundDataWhenThereIsAStoredImageDataMatchingURL() throws {
try makeSUT { sut, imageDataURL in
func test_retrieveImageData_deliversFoundDataWhenThereIsAStoredImageDataMatchingURL() async throws {
try await makeSUT { sut, imageDataURL in
assertThatRetrieveImageDataDeliversFoundDataWhenThereIsAStoredImageDataMatchingURL(on: sut, imageDataURL: imageDataURL)
}
}

func test_retrieveImageData_deliversLastInsertedValue() throws {
try makeSUT { sut, imageDataURL in
func test_retrieveImageData_deliversLastInsertedValue() async throws {
try await makeSUT { sut, imageDataURL in
assertThatRetrieveImageDataDeliversLastInsertedValueForURL(on: sut, imageDataURL: imageDataURL)
}
}

// - MARK: Helpers

private func makeSUT(_ test: @Sendable @escaping (CoreDataFeedStore, URL) -> Void, file: StaticString = #filePath, line: UInt = #line) throws {
private func makeSUT(_ test: @Sendable @escaping (CoreDataFeedStore, URL) -> Void, file: StaticString = #filePath, line: UInt = #line) async throws {
let storeURL = URL(fileURLWithPath: "/dev/null")
let sut = try CoreDataFeedStore(storeURL: storeURL)
trackForMemoryLeaks(sut, file: file, line: line)

let exp = expectation(description: "wait for operation")
sut.perform {
await sut.perform {
let imageDataURL = URL(string: "http://a-url.com")!
insertFeedImage(with: imageDataURL, into: sut, file: file, line: line)
test(sut, imageDataURL)
exp.fulfill()
}
wait(for: [exp], timeout: 0.1)
}

}
Expand Down
51 changes: 24 additions & 27 deletions EssentialFeed/EssentialFeedTests/Feed Cache/CoreDataFeedStoreTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,85 +8,82 @@ import EssentialFeed
@MainActor
class CoreDataFeedStoreTests: XCTestCase, FeedStoreSpecs {

func test_retrieve_deliversEmptyOnEmptyCache() throws {
try makeSUT { sut in
func test_retrieve_deliversEmptyOnEmptyCache() async throws {
try await makeSUT { sut in
assertThatRetrieveDeliversEmptyOnEmptyCache(on: sut)
}
}

func test_retrieve_hasNoSideEffectsOnEmptyCache() throws {
try makeSUT { sut in
func test_retrieve_hasNoSideEffectsOnEmptyCache() async throws {
try await makeSUT { sut in
assertThatRetrieveHasNoSideEffectsOnEmptyCache(on: sut)
}
}

func test_retrieve_deliversFoundValuesOnNonEmptyCache() throws {
try makeSUT { sut in
func test_retrieve_deliversFoundValuesOnNonEmptyCache() async throws {
try await makeSUT { sut in
assertThatRetrieveDeliversFoundValuesOnNonEmptyCache(on: sut)
}
}

func test_retrieve_hasNoSideEffectsOnNonEmptyCache() throws {
try makeSUT { sut in
func test_retrieve_hasNoSideEffectsOnNonEmptyCache() async throws {
try await makeSUT { sut in
assertThatRetrieveHasNoSideEffectsOnNonEmptyCache(on: sut)
}
}

func test_insert_deliversNoErrorOnEmptyCache() throws {
try makeSUT { sut in
func test_insert_deliversNoErrorOnEmptyCache() async throws {
try await makeSUT { sut in
assertThatInsertDeliversNoErrorOnEmptyCache(on: sut)
}
}

func test_insert_deliversNoErrorOnNonEmptyCache() throws {
try makeSUT { sut in
func test_insert_deliversNoErrorOnNonEmptyCache() async throws {
try await makeSUT { sut in
assertThatInsertDeliversNoErrorOnNonEmptyCache(on: sut)
}
}

func test_insert_overridesPreviouslyInsertedCacheValues() throws {
try makeSUT { sut in
func test_insert_overridesPreviouslyInsertedCacheValues() async throws {
try await makeSUT { sut in
assertThatInsertOverridesPreviouslyInsertedCacheValues(on: sut)
}
}

func test_delete_deliversNoErrorOnEmptyCache() throws {
try makeSUT { sut in
func test_delete_deliversNoErrorOnEmptyCache() async throws {
try await makeSUT { sut in
assertThatDeleteDeliversNoErrorOnEmptyCache(on: sut)
}
}

func test_delete_hasNoSideEffectsOnEmptyCache() throws {
try makeSUT { sut in
func test_delete_hasNoSideEffectsOnEmptyCache() async throws {
try await makeSUT { sut in
assertThatDeleteHasNoSideEffectsOnEmptyCache(on: sut)
}
}

func test_delete_deliversNoErrorOnNonEmptyCache() throws {
try makeSUT { sut in
func test_delete_deliversNoErrorOnNonEmptyCache() async throws {
try await makeSUT { sut in
assertThatDeleteDeliversNoErrorOnNonEmptyCache(on: sut)
}
}

func test_delete_emptiesPreviouslyInsertedCache() throws {
try makeSUT { sut in
func test_delete_emptiesPreviouslyInsertedCache() async throws {
try await makeSUT { sut in
assertThatDeleteEmptiesPreviouslyInsertedCache(on: sut)
}
}

// - MARK: Helpers

private func makeSUT(_ test: @Sendable @escaping (CoreDataFeedStore) -> Void, file: StaticString = #filePath, line: UInt = #line) throws {
private func makeSUT(_ test: @Sendable @escaping (CoreDataFeedStore) -> Void, file: StaticString = #filePath, line: UInt = #line) async throws {
let storeURL = URL(fileURLWithPath: "/dev/null")
let sut = try CoreDataFeedStore(storeURL: storeURL)
trackForMemoryLeaks(sut, file: file, line: line)

let exp = expectation(description: "wait for operation")
sut.perform {
await sut.perform {
test(sut)
exp.fulfill()
}
wait(for: [exp], timeout: 0.1)
}

}
8 changes: 4 additions & 4 deletions ...lFeed/EssentialFeedTests/Feed Cache/FeedImageDataStoreSpecs/FeedImageDataStoreSpecs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import Foundation

protocol FeedImageDataStoreSpecs {
func test_retrieveImageData_deliversNotFoundWhenEmpty() throws
func test_retrieveImageData_deliversNotFoundWhenStoredDataURLDoesNotMatch() throws
func test_retrieveImageData_deliversFoundDataWhenThereIsAStoredImageDataMatchingURL() throws
func test_retrieveImageData_deliversLastInsertedValue() throws
func test_retrieveImageData_deliversNotFoundWhenEmpty() async throws
func test_retrieveImageData_deliversNotFoundWhenStoredDataURLDoesNotMatch() async throws
func test_retrieveImageData_deliversFoundDataWhenThereIsAStoredImageDataMatchingURL() async throws
func test_retrieveImageData_deliversLastInsertedValue() async throws
}
34 changes: 17 additions & 17 deletions EssentialFeed/EssentialFeedTests/Feed Cache/FeedStoreSpecs/FeedStoreSpecs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,34 @@
import Foundation

protocol FeedStoreSpecs {
func test_retrieve_deliversEmptyOnEmptyCache() throws
func test_retrieve_hasNoSideEffectsOnEmptyCache() throws
func test_retrieve_deliversFoundValuesOnNonEmptyCache() throws
func test_retrieve_hasNoSideEffectsOnNonEmptyCache() throws
func test_retrieve_deliversEmptyOnEmptyCache() async throws
func test_retrieve_hasNoSideEffectsOnEmptyCache() async throws
func test_retrieve_deliversFoundValuesOnNonEmptyCache() async throws
func test_retrieve_hasNoSideEffectsOnNonEmptyCache() async throws

func test_insert_deliversNoErrorOnEmptyCache() throws
func test_insert_deliversNoErrorOnNonEmptyCache() throws
func test_insert_overridesPreviouslyInsertedCacheValues() throws
func test_insert_deliversNoErrorOnEmptyCache() async throws
func test_insert_deliversNoErrorOnNonEmptyCache() async throws
func test_insert_overridesPreviouslyInsertedCacheValues() async throws

func test_delete_deliversNoErrorOnEmptyCache() throws
func test_delete_hasNoSideEffectsOnEmptyCache() throws
func test_delete_deliversNoErrorOnNonEmptyCache() throws
func test_delete_emptiesPreviouslyInsertedCache() throws
func test_delete_deliversNoErrorOnEmptyCache() async throws
func test_delete_hasNoSideEffectsOnEmptyCache() async throws
func test_delete_deliversNoErrorOnNonEmptyCache() async throws
func test_delete_emptiesPreviouslyInsertedCache() async throws
}

protocol FailableRetrieveFeedStoreSpecs: FeedStoreSpecs {
func test_retrieve_deliversFailureOnRetrievalError() throws
func test_retrieve_hasNoSideEffectsOnFailure() throws
func test_retrieve_deliversFailureOnRetrievalError() async throws
func test_retrieve_hasNoSideEffectsOnFailure() async throws
}

protocol FailableInsertFeedStoreSpecs: FeedStoreSpecs {
func test_insert_deliversErrorOnInsertionError() throws
func test_insert_hasNoSideEffectsOnInsertionError() throws
func test_insert_deliversErrorOnInsertionError() async throws
func test_insert_hasNoSideEffectsOnInsertionError() async throws
}

protocol FailableDeleteFeedStoreSpecs: FeedStoreSpecs {
func test_delete_deliversErrorOnDeletionError() throws
func test_delete_hasNoSideEffectsOnDeletionError() throws
func test_delete_deliversErrorOnDeletionError() async throws
func test_delete_hasNoSideEffectsOnDeletionError() async throws
}

typealias FailableFeedStoreSpecs = FailableRetrieveFeedStoreSpecs & FailableInsertFeedStoreSpecs & FailableDeleteFeedStoreSpecs