@@ -86,14 +86,20 @@ fn complex_dependency_memo_test() {
8686 assert_eq ! ( d1, 30 ) ; // 15 * 2
8787 assert_eq ! ( e1, 2 ) ; // 5 - 3
8888
89- A . set ( 10 ) ;
90-
9189 SOURCE_A_CALLED . set ( false ) ;
9290 SOURCE_B_CALLED . set ( false ) ;
9391 SOURCE_C_CALLED . set ( false ) ;
9492 SOURCE_D_CALLED . set ( false ) ;
9593 SOURCE_E_CALLED . set ( false ) ;
9694
95+ A . set ( 10 ) ;
96+
97+ assert ! ( !SOURCE_A_CALLED . get( ) ) ;
98+ assert ! ( !SOURCE_B_CALLED . get( ) ) ;
99+ assert ! ( !SOURCE_C_CALLED . get( ) ) ;
100+ assert ! ( !SOURCE_D_CALLED . get( ) ) ;
101+ assert ! ( !SOURCE_E_CALLED . get( ) ) ;
102+
97103 let e2 = derived_e ( ) ;
98104 let d2 = derived_d ( ) ;
99105 let c2 = derived_c ( ) ;
@@ -108,14 +114,20 @@ fn complex_dependency_memo_test() {
108114 assert_eq ! ( d2, d1) ;
109115 assert_eq ! ( e2, e1) ;
110116
111- unsafe { SOURCE_A . invalidate ( ) } ;
112-
113117 SOURCE_A_CALLED . set ( false ) ;
114118 SOURCE_B_CALLED . set ( false ) ;
115119 SOURCE_C_CALLED . set ( false ) ;
116120 SOURCE_D_CALLED . set ( false ) ;
117121 SOURCE_E_CALLED . set ( false ) ;
118122
123+ unsafe { SOURCE_A . invalidate ( ) } ;
124+
125+ assert ! ( !SOURCE_A_CALLED . get( ) ) ;
126+ assert ! ( !SOURCE_B_CALLED . get( ) ) ;
127+ assert ! ( !SOURCE_C_CALLED . get( ) ) ;
128+ assert ! ( !SOURCE_D_CALLED . get( ) ) ;
129+ assert ! ( !SOURCE_E_CALLED . get( ) ) ;
130+
119131 let e3 = derived_e ( ) ;
120132 assert ! ( !SOURCE_A_CALLED . get( ) ) ;
121133 assert ! ( !SOURCE_B_CALLED . get( ) ) ;
@@ -156,14 +168,20 @@ fn signal_set_unchanged_test() {
156168 assert_eq ! ( d1, 30 ) ; // 15 * 2
157169 assert_eq ! ( e1, 2 ) ; // 5 - 3
158170
159- unsafe { SOURCE_A . set ( 10 ) } ;
160-
161171 SOURCE_A_CALLED . set ( false ) ;
162172 SOURCE_B_CALLED . set ( false ) ;
163173 SOURCE_C_CALLED . set ( false ) ;
164174 SOURCE_D_CALLED . set ( false ) ;
165175 SOURCE_E_CALLED . set ( false ) ;
166176
177+ unsafe { SOURCE_A . set ( 10 ) } ;
178+
179+ assert ! ( !SOURCE_A_CALLED . get( ) ) ;
180+ assert ! ( !SOURCE_B_CALLED . get( ) ) ;
181+ assert ! ( !SOURCE_C_CALLED . get( ) ) ;
182+ assert ! ( !SOURCE_D_CALLED . get( ) ) ;
183+ assert ! ( !SOURCE_E_CALLED . get( ) ) ;
184+
167185 let e2 = derived_e ( ) ;
168186 let d2 = derived_d ( ) ;
169187 let c2 = derived_c ( ) ;
@@ -195,14 +213,20 @@ fn signal_set_value_test() {
195213 assert_eq ! ( d1, 30 ) ; // 15 * 2
196214 assert_eq ! ( e1, 2 ) ; // 5 - 3
197215
198- unsafe { SOURCE_A . set ( 20 ) } ;
199-
200216 SOURCE_A_CALLED . set ( false ) ;
201217 SOURCE_B_CALLED . set ( false ) ;
202218 SOURCE_C_CALLED . set ( false ) ;
203219 SOURCE_D_CALLED . set ( false ) ;
204220 SOURCE_E_CALLED . set ( false ) ;
205221
222+ unsafe { SOURCE_A . set ( 20 ) } ;
223+
224+ assert ! ( !SOURCE_A_CALLED . get( ) ) ;
225+ assert ! ( !SOURCE_B_CALLED . get( ) ) ;
226+ assert ! ( !SOURCE_C_CALLED . get( ) ) ;
227+ assert ! ( !SOURCE_D_CALLED . get( ) ) ;
228+ assert ! ( !SOURCE_E_CALLED . get( ) ) ;
229+
206230 let e2 = derived_e ( ) ;
207231 assert ! ( !SOURCE_A_CALLED . get( ) ) ;
208232 assert ! ( !SOURCE_B_CALLED . get( ) ) ;
0 commit comments