Clean up fact client tests (#1172)

mluisbrown · mluisbrown · commit 2829061b5632 · 2022-08-08T11:10:00.000+01:00
* Clean up fact client tests

* wip
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/02-Effects-Basics.swift b/Examples/CaseStudies/SwiftUICaseStudies/02-Effects-Basics.swift
@@ -32,7 +32,7 @@ enum EffectsBasicsAction: Equatable {
   case decrementButtonTapped
   case incrementButtonTapped
   case numberFactButtonTapped
-  case numberFactResponse(Result<String, FactClient.Error>)
+  case numberFactResponse(Result<String, FactClient.Failure>)
 }
 
 struct EffectsBasicsEnvironment {
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/02-Effects-Cancellation.swift b/Examples/CaseStudies/SwiftUICaseStudies/02-Effects-Cancellation.swift
@@ -26,7 +26,7 @@ enum EffectsCancellationAction: Equatable {
   case cancelButtonTapped
   case stepperChanged(Int)
   case triviaButtonTapped
-  case triviaResponse(Result<String, FactClient.Error>)
+  case triviaResponse(Result<String, FactClient.Failure>)
 }
 
 struct EffectsCancellationEnvironment {
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/02-Effects-Refreshable.swift b/Examples/CaseStudies/SwiftUICaseStudies/02-Effects-Refreshable.swift
@@ -21,7 +21,7 @@ struct RefreshableState: Equatable {
 enum RefreshableAction: Equatable {
   case cancelButtonTapped
   case decrementButtonTapped
-  case factResponse(Result<String, FactClient.Error>)
+  case factResponse(Result<String, FactClient.Failure>)
   case incrementButtonTapped
   case refresh
 }
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/FactClient.swift b/Examples/CaseStudies/SwiftUICaseStudies/FactClient.swift
@@ -4,34 +4,34 @@ import ReactiveSwift
 import XCTestDynamicOverlay
 
 struct FactClient {
-  var fetch: (Int) -> Effect<String, Error>
+  var fetch: (Int) -> Effect<String, Failure>
 
-  struct Error: Swift.Error, Equatable {}
+  struct Failure: Error, Equatable {}
 }
 
 // This is the "live" fact dependency that reaches into the outside world to fetch trivia.
 // Typically this live implementation of the dependency would live in its own module so that the
 // main feature doesn't need to compile it.
 extension FactClient {
-    static let live = Self(
-      fetch: { number in
-        Effect.task {
+  static let live = Self(
+    fetch: { number in
+      Effect.task {
         try await Task.sleep(nanoseconds: NSEC_PER_SEC)
-            let (data, _) = try await URLSession.shared
-              .data(from: URL(string: "http://numbersapi.com/\(number)/trivia")!)
-            return String(decoding: data, as: UTF8.self)
-          }
-      .mapError { _ in Error() }
+        let (data, _) = try await URLSession.shared
+          .data(from: URL(string: "http://numbersapi.com/\(number)/trivia")!)
+        return String(decoding: data, as: UTF8.self)
       }
-    )
+      .mapError { _ in Failure() }
+    }
+  )
 }
 
 #if DEBUG
   extension FactClient {
     // This is the "unimplemented" fact dependency that is useful to plug into tests that you want
     // to prove do not need the dependency.
     static let unimplemented = Self(
-      fetch: { _ in .unimplemented("\(Self.self).fact") }
+      fetch: { _ in .unimplemented("\(Self.self).fetch") }
     )
   }
 #endif
diff --git a/Examples/CaseStudies/SwiftUICaseStudiesTests/02-Effects-BasicsTests.swift b/Examples/CaseStudies/SwiftUICaseStudiesTests/02-Effects-BasicsTests.swift
@@ -49,7 +49,7 @@ class EffectsBasicsTests: XCTestCase {
       environment: .unimplemented
     )
 
-    store.environment.fact.fetch = { _ in Effect(error: FactClient.Error()) }
+    store.environment.fact.fetch = { _ in Effect(error: FactClient.Failure()) }
     store.environment.mainQueue = ImmediateScheduler()
 
     store.send(.incrementButtonTapped) {
@@ -58,7 +58,7 @@ class EffectsBasicsTests: XCTestCase {
     store.send(.numberFactButtonTapped) {
       $0.isNumberFactRequestInFlight = true
     }
-    store.receive(.numberFactResponse(.failure(FactClient.Error()))) {
+    store.receive(.numberFactResponse(.failure(FactClient.Failure()))) {
       $0.isNumberFactRequestInFlight = false
     }
   }
diff --git a/Examples/CaseStudies/SwiftUICaseStudiesTests/02-Effects-CancellationTests.swift b/Examples/CaseStudies/SwiftUICaseStudiesTests/02-Effects-CancellationTests.swift
@@ -9,11 +9,11 @@ class EffectsCancellationTests: XCTestCase {
     let store = TestStore(
       initialState: EffectsCancellationState(),
       reducer: effectsCancellationReducer,
-      environment: EffectsCancellationEnvironment(
-        fact: FactClient(fetch: { n in Effect(value: "\(n) is a good number Brent") }),
-        mainQueue: ImmediateScheduler()
+      environment: .unimplemented
       )
-    )
+
+    store.environment.fact.fetch = { Effect(value: "\($0) is a good number Brent") }
+    store.environment.mainQueue = ImmediateScheduler()
 
     store.send(.stepperChanged(1)) {
       $0.count = 1
@@ -34,16 +34,16 @@ class EffectsCancellationTests: XCTestCase {
     let store = TestStore(
       initialState: EffectsCancellationState(),
       reducer: effectsCancellationReducer,
-      environment: .init(
-        fact: .init(fetch: { _ in Effect(error: FactClient.Error()) }),
-        mainQueue: ImmediateScheduler()
+      environment: .unimplemented
       )
-    )
+
+    store.environment.fact.fetch = { _ in Effect(error: FactClient.Failure()) }
+    store.environment.mainQueue = ImmediateScheduler()
 
     store.send(.triviaButtonTapped) {
       $0.isTriviaRequestInFlight = true
     }
-    store.receive(.triviaResponse(.failure(FactClient.Error()))) {
+    store.receive(.triviaResponse(.failure(FactClient.Failure()))) {
       $0.isTriviaRequestInFlight = false
     }
   }
@@ -59,11 +59,11 @@ class EffectsCancellationTests: XCTestCase {
     let store = TestStore(
       initialState: EffectsCancellationState(),
       reducer: effectsCancellationReducer,
-      environment: EffectsCancellationEnvironment(
-        fact: FactClient(fetch: { n in Effect(value: "\(n) is a good number Brent") }),
-        mainQueue: mainQueue
+      environment: .unimplemented
       )
-    )
+
+    store.environment.fact.fetch = { Effect(value: "\($0) is a good number Brent") }
+    store.environment.mainQueue = mainQueue
 
     store.send(.triviaButtonTapped) {
       $0.isTriviaRequestInFlight = true
@@ -79,11 +79,11 @@ class EffectsCancellationTests: XCTestCase {
     let store = TestStore(
       initialState: EffectsCancellationState(),
       reducer: effectsCancellationReducer,
-      environment: EffectsCancellationEnvironment(
-        fact: FactClient(fetch: { n in Effect(value: "\(n) is a good number Brent") }),
-        mainQueue: mainQueue
+      environment: .unimplemented
       )
-    )
+
+    store.environment.fact.fetch = { Effect(value: "\($0) is a good number Brent") }
+    store.environment.mainQueue = mainQueue
 
     store.send(.triviaButtonTapped) {
       $0.isTriviaRequestInFlight = true
@@ -95,3 +95,10 @@ class EffectsCancellationTests: XCTestCase {
     mainQueue.advance()
   }
 }
+
+extension EffectsCancellationEnvironment {
+  static let unimplemented = Self(
+    fact: .unimplemented,
+    mainQueue: UnimplementedScheduler()
+  )
+}
diff --git a/Examples/CaseStudies/SwiftUICaseStudiesTests/02-Effects-RefreshableTests.swift b/Examples/CaseStudies/SwiftUICaseStudiesTests/02-Effects-RefreshableTests.swift
@@ -9,12 +9,12 @@ class RefreshableTests: XCTestCase {
     let store = TestStore(
       initialState: RefreshableState(),
       reducer: refreshableReducer,
-      environment: RefreshableEnvironment(
-        fact: FactClient(fetch: { Effect(value: "\($0) is a good number.") }),
-        mainQueue: ImmediateScheduler()
-      )
+      environment: .unimplemented
     )
 
+    store.environment.fact.fetch = { Effect(value: "\($0) is a good number.") }
+    store.environment.mainQueue = ImmediateScheduler()
+
     store.send(.incrementButtonTapped) {
       $0.count = 1
     }
@@ -31,19 +31,19 @@ class RefreshableTests: XCTestCase {
     let store = TestStore(
       initialState: RefreshableState(),
       reducer: refreshableReducer,
-      environment: RefreshableEnvironment(
-        fact: FactClient(fetch: { _ in Effect(error: FactClient.Error()) }),
-        mainQueue: ImmediateScheduler()
-      )
+      environment: .unimplemented
     )
 
+    store.environment.fact.fetch = { _ in Effect(error: FactClient.Failure()) }
+    store.environment.mainQueue = ImmediateScheduler()
+
     store.send(.incrementButtonTapped) {
       $0.count = 1
     }
     store.send(.refresh) {
       $0.isLoading = true
     }
-    store.receive(.factResponse(.failure(FactClient.Error()))) {
+    store.receive(.factResponse(.failure(FactClient.Failure()))) {
       $0.isLoading = false
     }
   }
@@ -54,12 +54,12 @@ class RefreshableTests: XCTestCase {
     let store = TestStore(
       initialState: RefreshableState(),
       reducer: refreshableReducer,
-      environment: RefreshableEnvironment(
-        fact: FactClient(fetch: { Effect(value: "\($0) is a good number.") }),
-        mainQueue: mainQueue
-      )
+      environment: .unimplemented
     )
 
+    store.environment.fact.fetch = { Effect(value: "\($0) is a good number.") }
+    store.environment.mainQueue = mainQueue
+
     store.send(.incrementButtonTapped) {
       $0.count = 1
     }
@@ -71,3 +71,10 @@ class RefreshableTests: XCTestCase {
     }
   }
 }
+
+extension RefreshableEnvironment {
+  static let unimplemented = Self(
+    fact: .unimplemented,
+    mainQueue: UnimplementedScheduler()
+  )
+}

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ enum EffectsBasicsAction: Equatable {`
`32`	`32`	`case decrementButtonTapped`
`33`	`33`	`case incrementButtonTapped`
`34`	`34`	`case numberFactButtonTapped`
`35`		`- case numberFactResponse(Result<String, FactClient.Error>)`
	`35`	`+ case numberFactResponse(Result<String, FactClient.Failure>)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`struct EffectsBasicsEnvironment {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ enum EffectsCancellationAction: Equatable {`
`26`	`26`	`case cancelButtonTapped`
`27`	`27`	`case stepperChanged(Int)`
`28`	`28`	`case triviaButtonTapped`
`29`		`- case triviaResponse(Result<String, FactClient.Error>)`
	`29`	`+ case triviaResponse(Result<String, FactClient.Failure>)`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`struct EffectsCancellationEnvironment {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ struct RefreshableState: Equatable {`
`21`	`21`	`enum RefreshableAction: Equatable {`
`22`	`22`	`case cancelButtonTapped`
`23`	`23`	`case decrementButtonTapped`
`24`		`- case factResponse(Result<String, FactClient.Error>)`
	`24`	`+ case factResponse(Result<String, FactClient.Failure>)`
`25`	`25`	`case incrementButtonTapped`
`26`	`26`	`case refresh`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class EffectsBasicsTests: XCTestCase {`
`49`	`49`	`environment: .unimplemented`
`50`	`50`	`)`
`51`	`51`
`52`		`- store.environment.fact.fetch = { _ in Effect(error: FactClient.Error()) }`
	`52`	`+ store.environment.fact.fetch = { _ in Effect(error: FactClient.Failure()) }`
`53`	`53`	`store.environment.mainQueue = ImmediateScheduler()`
`54`	`54`
`55`	`55`	`store.send(.incrementButtonTapped) {`
`@@ -58,7 +58,7 @@ class EffectsBasicsTests: XCTestCase {`
`58`	`58`	`store.send(.numberFactButtonTapped) {`
`59`	`59`	`$0.isNumberFactRequestInFlight = true`
`60`	`60`	`}`
`61`		`- store.receive(.numberFactResponse(.failure(FactClient.Error()))) {`
	`61`	`+ store.receive(.numberFactResponse(.failure(FactClient.Failure()))) {`
`62`	`62`	`$0.isNumberFactRequestInFlight = false`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,12 @@ class RefreshableTests: XCTestCase {`
`9`	`9`	`let store = TestStore(`
`10`	`10`	`initialState: RefreshableState(),`
`11`	`11`	`reducer: refreshableReducer,`
`12`		`- environment: RefreshableEnvironment(`
`13`		`- fact: FactClient(fetch: { Effect(value: "\($0) is a good number.") }),`
`14`		`- mainQueue: ImmediateScheduler()`
`15`		`- )`
	`12`	`+ environment: .unimplemented`
`16`	`13`	`)`
`17`	`14`
	`15`	`+ store.environment.fact.fetch = { Effect(value: "\($0) is a good number.") }`
	`16`	`+ store.environment.mainQueue = ImmediateScheduler()`
	`17`	`+`
`18`	`18`	`store.send(.incrementButtonTapped) {`
`19`	`19`	`$0.count = 1`
`20`	`20`	`}`
`@@ -31,19 +31,19 @@ class RefreshableTests: XCTestCase {`
`31`	`31`	`let store = TestStore(`
`32`	`32`	`initialState: RefreshableState(),`
`33`	`33`	`reducer: refreshableReducer,`
`34`		`- environment: RefreshableEnvironment(`
`35`		`- fact: FactClient(fetch: { _ in Effect(error: FactClient.Error()) }),`
`36`		`- mainQueue: ImmediateScheduler()`
`37`		`- )`
	`34`	`+ environment: .unimplemented`
`38`	`35`	`)`
`39`	`36`
	`37`	`+ store.environment.fact.fetch = { _ in Effect(error: FactClient.Failure()) }`
	`38`	`+ store.environment.mainQueue = ImmediateScheduler()`
	`39`	`+`
`40`	`40`	`store.send(.incrementButtonTapped) {`
`41`	`41`	`$0.count = 1`
`42`	`42`	`}`
`43`	`43`	`store.send(.refresh) {`
`44`	`44`	`$0.isLoading = true`
`45`	`45`	`}`
`46`		`- store.receive(.factResponse(.failure(FactClient.Error()))) {`
	`46`	`+ store.receive(.factResponse(.failure(FactClient.Failure()))) {`
`47`	`47`	`$0.isLoading = false`
`48`	`48`	`}`
`49`	`49`	`}`
`@@ -54,12 +54,12 @@ class RefreshableTests: XCTestCase {`
`54`	`54`	`let store = TestStore(`
`55`	`55`	`initialState: RefreshableState(),`
`56`	`56`	`reducer: refreshableReducer,`
`57`		`- environment: RefreshableEnvironment(`
`58`		`- fact: FactClient(fetch: { Effect(value: "\($0) is a good number.") }),`
`59`		`- mainQueue: mainQueue`
`60`		`- )`
	`57`	`+ environment: .unimplemented`
`61`	`58`	`)`
`62`	`59`
	`60`	`+ store.environment.fact.fetch = { Effect(value: "\($0) is a good number.") }`
	`61`	`+ store.environment.mainQueue = mainQueue`
	`62`	`+`
`63`	`63`	`store.send(.incrementButtonTapped) {`
`64`	`64`	`$0.count = 1`
`65`	`65`	`}`
`@@ -71,3 +71,10 @@ class RefreshableTests: XCTestCase {`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`}`
	`74`	`+`
	`75`	`+extension RefreshableEnvironment {`
	`76`	`+ static let unimplemented = Self(`
	`77`	`+ fact: .unimplemented,`
	`78`	`+ mainQueue: UnimplementedScheduler()`
	`79`	`+ )`
	`80`	`+}`