Skip to content

Bug/fix dict test store #15

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
merged 7 commits into from
Jun 10, 2022
Merged

Bug/fix dict test store #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b57d15f
Prefer diff from custom dump
0xLeif Jun 10, 2022
66faf68
Check diff output
0xLeif Jun 10, 2022
ce34c4b
Check cacheStore diff
0xLeif Jun 10, 2022
ccade5f
Sort before comparing
0xLeif Jun 10, 2022
f86971b
Prefer different diffing
0xLeif Jun 10, 2022
d111a2f
Resolve action being equalated
0xLeif Jun 10, 2022
ad12188
Sort and use diff
0xLeif Jun 10, 2022
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
11 changes: 11 additions & 0 deletions Sources/CacheStore/Stores/CacheStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import c
import Combine
import CustomDump
import SwiftUI

// MARK: -
Expand Down Expand Up @@ -233,6 +234,16 @@ extension CacheStore {
return false
}

if
let storeValueDictionary: [AnyHashable: Any] = storeValue as? [AnyHashable: Any],
let updateValueDictionary: [AnyHashable: Any] = updatedValue as? [AnyHashable: Any]
{
let sortedStoreDictionary = storeValueDictionary.sorted(by: { "\($0.key)" == "\($1.key)" })
let sortedUpdatedStoreDictionary = updateValueDictionary.sorted(by: { "\($0.key)" == "\($1.key)" })

return diff(sortedStoreDictionary, sortedUpdatedStoreDictionary) == nil
}

return "\(updatedValue)" == "\(storeValue)"
}
}
5 changes: 3 additions & 2 deletions Sources/CacheStore/Stores/Store.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,9 +294,10 @@ extension Store {
)
}

let areCacheEqual = cacheStore.isCacheEqual(to: cacheStoreCopy)
let sortedExpectedCacheStore = cacheStore.cache.sorted(by: { "\($0.key)" < "\($1.key)" })
let sortedCacheStore = cacheStoreCopy.cache.sorted(by: { "\($0.key)" < "\($1.key)" })

if areCacheEqual {
if diff(sortedExpectedCacheStore, sortedCacheStore) == nil {
if isDebugging {
print("\t🙅 No State Change")
}
Expand Down
7 changes: 5 additions & 2 deletions Sources/CacheStore/Stores/TestStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@ public class TestStore<Key: Hashable, Action, Dependency> {
return
}

guard expectedCacheStore.isCacheEqual(to: store.cacheStore) else {
let sortedExpectedCacheStore = expectedCacheStore.cache.sorted(by: { "\($0.key)" < "\($1.key)" })
let sortedCacheStore = store.cacheStore.cache.sorted(by: { "\($0.key)" < "\($1.key)" })

guard diff(sortedExpectedCacheStore, sortedCacheStore) == nil else {
TestStoreFailure.handler(
"""
❌ Expectation failed
Expand Down Expand Up @@ -128,7 +131,7 @@ public class TestStore<Key: Hashable, Action, Dependency> {
return
}

guard "\(action)" == "\(nextAction)" else {
guard diff(action, nextAction) == nil else {
TestStoreFailure.handler("❌ Action (\(customDump(action))) does not equal NextAction (\(customDump(nextAction)))", file, line)
return
}
Expand Down