Fix test

Author: mbrandonw

Sources/ComposableArchitecture/Observation/ObservationStateRegistrar.swift

@@ -52,16 +52,12 @@ extension ObservationStateRegistrar: Equatable, Hashable, Codable {
       _ value: inout Value,
       _ newValue: Value,
       _ isIdentityEqual: (Value, Value) -> Bool,
-      _ shouldNotifyObservers: (Value, Value) -> Bool
+      _ shouldNotifyObservers: (Value, Value) -> Bool = { _, _ in true }
     ) {
-      if isIdentityEqual(value, newValue) {
+      if isIdentityEqual(value, newValue) || !shouldNotifyObservers(value, newValue) {
         value = newValue
       } else {
-        if shouldNotifyObservers(value, newValue) {
-          self.registrar.withMutation(of: subject, keyPath: keyPath) {
-            value = newValue
-          }
-        } else {
+        self.registrar.withMutation(of: subject, keyPath: keyPath) {
           value = newValue
         }
       }

Sources/ComposableArchitectureMacros/ObservableStateMacro.swift

@@ -654,7 +654,7 @@ public struct ObservationStateTrackedMacro: AccessorMacro {
       _modify {
         let oldValue = _$observationRegistrar.willModify(self, keyPath: \\.\(identifier), &_\(identifier))
         defer {
-          _$observationRegistrar.didModify(self, keyPath: \\.\(identifier), &_\(identifier), oldValue, _$isIdentityEqual, shouldNotifyObservers)
+          _$observationRegistrar.didModify(self, keyPath: \\.\(identifier), &_\(identifier), oldValue, _$isIdentityEqual)
         }
         yield &_\(identifier)
       }

Tests/ComposableArchitectureMacrosTests/MacroBaseTestCase.swift

@@ -8,7 +8,7 @@
   class MacroBaseTestCase: XCTestCase {
     override func invokeTest() {
       MacroTesting.withMacroTesting(
-        //isRecording: true,
+        record: .failed,
         macros: [
           ObservableStateMacro.self,
           ObservationStateTrackedMacro.self,

Tests/ComposableArchitectureMacrosTests/ObservableStateMacroTests.swift

@@ -42,7 +42,7 @@
             _modify {
               let oldValue = _$observationRegistrar.willModify(self, keyPath: \.count, &_count)
               defer {
-                _$observationRegistrar.didModify(self, keyPath: \.count, &_count, oldValue, _$isIdentityEqual, shouldNotifyObservers)
+                _$observationRegistrar.didModify(self, keyPath: \.count, &_count, oldValue, _$isIdentityEqual)
               }
               yield &_count
             }
@@ -104,7 +104,7 @@
             _modify {
               let oldValue = _$observationRegistrar.willModify(self, keyPath: \.count, &_count)
               defer {
-                _$observationRegistrar.didModify(self, keyPath: \.count, &_count, oldValue, _$isIdentityEqual, shouldNotifyObservers)
+                _$observationRegistrar.didModify(self, keyPath: \.count, &_count, oldValue, _$isIdentityEqual)
               }
               yield &_count
             }
@@ -166,7 +166,7 @@
             _modify {
               let oldValue = _$observationRegistrar.willModify(self, keyPath: \.count, &_count)
               defer {
-                _$observationRegistrar.didModify(self, keyPath: \.count, &_count, oldValue, _$isIdentityEqual, shouldNotifyObservers)
+                _$observationRegistrar.didModify(self, keyPath: \.count, &_count, oldValue, _$isIdentityEqual)
               }
               yield &_count
             }
@@ -225,7 +225,7 @@
             _modify {
               let oldValue = _$observationRegistrar.willModify(self, keyPath: \.count, &_count)
               defer {
-                _$observationRegistrar.didModify(self, keyPath: \.count, &_count, oldValue, _$isIdentityEqual, shouldNotifyObservers)
+                _$observationRegistrar.didModify(self, keyPath: \.count, &_count, oldValue, _$isIdentityEqual)
               }
               yield &_count
             }