More clean up in speech demo (#1217)

* Status is unusued

* clean up

* wip

Author: mluisbrown

Examples/SpeechRecognition/SpeechRecognition/SpeechClient/Live.swift

@@ -24,16 +24,6 @@ extension SpeechClient {
       },
       startTask: { request in
         Effect { subscriber, lifetime in
-          let speechRecognizer = SFSpeechRecognizer(locale: Locale(identifier: "en-US"))!
-          let cancellable = AnyDisposable {
-            audioEngine?.stop()
-            audioEngine?.inputNode.removeTap(onBus: 0)
-            recognitionTask?.cancel()
-            _ = speechRecognizer
-          }
-
-          lifetime += cancellable
-
           audioEngine = AVAudioEngine()
           let audioSession = AVAudioSession.sharedInstance()
           do {
@@ -44,6 +34,7 @@ extension SpeechClient {
             return
           }
 
+          let speechRecognizer = SFSpeechRecognizer(locale: Locale(identifier: "en-US"))!
           recognitionTask = speechRecognizer.recognitionTask(with: request) { result, error in
             switch (result, error) {
             case let (.some(result), _):
@@ -55,6 +46,13 @@ extension SpeechClient {
             }
           }
 
+          let cancellable = AnyDisposable {
+            audioEngine?.stop()
+            audioEngine?.inputNode.removeTap(onBus: 0)
+            recognitionTask?.cancel()
+          }
+          lifetime += cancellable
+
           audioEngine?.inputNode.installTap(
             onBus: 0,
             bufferSize: 1024,

Examples/SpeechRecognition/SpeechRecognition/SpeechRecognition.swift

@@ -12,7 +12,6 @@ private let readMe = """
 struct AppState: Equatable {
   var alert: AlertState<AppAction>?
   var isRecording = false
-  var speechRecognizerAuthorizationStatus = SFSpeechRecognizerAuthorizationStatus.notDetermined
   var transcribedText = ""
 }
 
@@ -68,7 +67,6 @@ let appReducer = Reducer<AppState, AppAction, AppEnvironment> { state, action, e
 
   case let .speechRecognizerAuthorizationStatusResponse(status):
     state.isRecording = status == .authorized
-    state.speechRecognizerAuthorizationStatus = status
 
     switch status {
     case .notDetermined:

Examples/SpeechRecognition/SpeechRecognitionTests/SpeechRecognitionTests.swift

@@ -8,18 +8,15 @@ class SpeechRecognitionTests: XCTestCase {
   let recognitionTaskSubject = Signal<SpeechRecognitionResult, SpeechClient.Error>.pipe()
 
   func testDenyAuthorization() {
-    var speechClient = SpeechClient.unimplemented
-    speechClient.requestAuthorization = { Effect(value: .denied) }
-
     let store = TestStore(
       initialState: AppState(),
       reducer: appReducer,
-      environment: AppEnvironment(
-        mainQueue: ImmediateScheduler(),
-        speechClient: speechClient
-      )
+      environment: .unimplemented
     )
 
+    store.environment.mainQueue = ImmediateScheduler()
+    store.environment.speechClient.requestAuthorization = { Effect(value: .denied) }
+
     store.send(.recordButtonTapped) {
       $0.isRecording = true
     }
@@ -32,50 +29,42 @@ class SpeechRecognitionTests: XCTestCase {
         )
       )
       $0.isRecording = false
-      $0.speechRecognizerAuthorizationStatus = .denied
     }
   }
 
   func testRestrictedAuthorization() {
-    var speechClient = SpeechClient.unimplemented
-    speechClient.requestAuthorization = { Effect(value: .restricted) }
-
     let store = TestStore(
       initialState: AppState(),
       reducer: appReducer,
-      environment: AppEnvironment(
-        mainQueue: ImmediateScheduler(),
-        speechClient: speechClient
-      )
+      environment: .unimplemented
     )
 
+    store.environment.mainQueue = ImmediateScheduler()
+    store.environment.speechClient.requestAuthorization = { Effect(value: .restricted) }
+
     store.send(.recordButtonTapped) {
       $0.isRecording = true
     }
     store.receive(.speechRecognizerAuthorizationStatusResponse(.restricted)) {
       $0.alert = AlertState(title: TextState("Your device does not allow speech recognition."))
       $0.isRecording = false
-      $0.speechRecognizerAuthorizationStatus = .restricted
     }
   }
 
   func testAllowAndRecord() {
-    var speechClient = SpeechClient.unimplemented
-    speechClient.finishTask = {
-      .fireAndForget { self.recognitionTaskSubject.input.sendCompleted() }
-    }
-    speechClient.startTask = { _ in self.recognitionTaskSubject.output.producer }
-    speechClient.requestAuthorization = { Effect(value: .authorized) }
-
     let store = TestStore(
       initialState: AppState(),
       reducer: appReducer,
-      environment: AppEnvironment(
-        mainQueue: ImmediateScheduler(),
-        speechClient: speechClient
-      )
+      environment: .unimplemented
     )
 
+    store.environment.mainQueue = ImmediateScheduler()
+    store.environment.speechClient.finishTask = {
+      .fireAndForget { self.recognitionTaskSubject.input.sendCompleted() }
+    }
+    store.environment.speechClient.requestAuthorization = { Effect(value: .authorized) }
+    store.environment.speechClient.startTask = { _ in self.recognitionTaskSubject.output.producer }
+
     let result = SpeechRecognitionResult(
       bestTranscription: Transcription(
         formattedString: "Hello",
@@ -92,9 +81,7 @@ class SpeechRecognitionTests: XCTestCase {
       $0.isRecording = true
     }
 
-    store.receive(.speechRecognizerAuthorizationStatusResponse(.authorized)) {
-      $0.speechRecognizerAuthorizationStatus = .authorized
-    }
+    store.receive(.speechRecognizerAuthorizationStatusResponse(.authorized))
 
     self.recognitionTaskSubject.input.send(value: result)
     store.receive(.speech(.success(result))) {
@@ -108,26 +95,21 @@ class SpeechRecognitionTests: XCTestCase {
   }
 
   func testAudioSessionFailure() {
-    var speechClient = SpeechClient.unimplemented
-    speechClient.startTask = { _ in self.recognitionTaskSubject.output.producer }
-    speechClient.requestAuthorization = { Effect(value: .authorized) }
-
     let store = TestStore(
       initialState: AppState(),
       reducer: appReducer,
-      environment: AppEnvironment(
-        mainQueue: ImmediateScheduler(),
-        speechClient: speechClient
-      )
+      environment: .unimplemented
     )
 
+    store.environment.mainQueue = ImmediateScheduler()
+    store.environment.speechClient.startTask = { _ in self.recognitionTaskSubject.output.producer }
+    store.environment.speechClient.requestAuthorization = { Effect(value: .authorized) }
+
     store.send(.recordButtonTapped) {
       $0.isRecording = true
     }
 
-    store.receive(.speechRecognizerAuthorizationStatusResponse(.authorized)) {
-      $0.speechRecognizerAuthorizationStatus = .authorized
-    }
+    store.receive(.speechRecognizerAuthorizationStatusResponse(.authorized))
 
     self.recognitionTaskSubject.input.send(error: .couldntConfigureAudioSession)
     store.receive(.speech(.failure(.couldntConfigureAudioSession))) {
@@ -138,26 +120,21 @@ class SpeechRecognitionTests: XCTestCase {
   }
 
   func testAudioEngineFailure() {
-    var speechClient = SpeechClient.unimplemented
-    speechClient.startTask = { _ in self.recognitionTaskSubject.output.producer }
-    speechClient.requestAuthorization = { Effect(value: .authorized) }
-
     let store = TestStore(
       initialState: AppState(),
       reducer: appReducer,
-      environment: AppEnvironment(
-        mainQueue: ImmediateScheduler(),
-        speechClient: speechClient
-      )
+      environment: .unimplemented
     )
 
+    store.environment.mainQueue = ImmediateScheduler()
+    store.environment.speechClient.startTask = { _ in self.recognitionTaskSubject.output.producer }
+    store.environment.speechClient.requestAuthorization = { Effect(value: .authorized) }
+
     store.send(.recordButtonTapped) {
       $0.isRecording = true
     }
 
-    store.receive(.speechRecognizerAuthorizationStatusResponse(.authorized)) {
-      $0.speechRecognizerAuthorizationStatus = .authorized
-    }
+    store.receive(.speechRecognizerAuthorizationStatusResponse(.authorized)) 
 
     self.recognitionTaskSubject.input.send(error: .couldntStartAudioEngine)
     store.receive(.speech(.failure(.couldntStartAudioEngine))) {
@@ -167,3 +144,10 @@ class SpeechRecognitionTests: XCTestCase {
     self.recognitionTaskSubject.input.sendCompleted()
   }
 }
+
+extension AppEnvironment {
+  static let unimplemented = Self(
+    mainQueue: UnimplementedScheduler(),
+    speechClient: .unimplemented
+  )
+}