@@ -1187,7 +1187,9 @@ public void itCanPredictSetSelection() {
11871187
11881188 @ Test
11891189 public void itPerformsClearAccessibilityFocusCorrectly () {
1190- AccessibilityChannel mockChannel = mock (AccessibilityChannel .class );
1190+ BasicMessageChannel mockChannel = mock (BasicMessageChannel .class );
1191+ AccessibilityChannel accessibilityChannel =
1192+ new AccessibilityChannel (mockChannel , mock (FlutterJNI .class ));
11911193 AccessibilityViewEmbedder mockViewEmbedder = mock (AccessibilityViewEmbedder .class );
11921194 AccessibilityManager mockManager = mock (AccessibilityManager .class );
11931195 View mockRootView = mock (View .class );
@@ -1197,7 +1199,7 @@ public void itPerformsClearAccessibilityFocusCorrectly() {
11971199 AccessibilityBridge accessibilityBridge =
11981200 setUpBridge (
11991201 /*rootAccessibilityView=*/ mockRootView ,
1200- /*accessibilityChannel=*/ mockChannel ,
1202+ /*accessibilityChannel=*/ accessibilityChannel ,
12011203 /*accessibilityManager=*/ mockManager ,
12021204 /*contentResolver=*/ null ,
12031205 /*accessibilityViewEmbedder=*/ mockViewEmbedder ,
@@ -1220,6 +1222,11 @@ public void itPerformsClearAccessibilityFocusCorrectly() {
12201222 accessibilityBridge .performAction (0 , AccessibilityNodeInfo .ACTION_ACCESSIBILITY_FOCUS , null );
12211223 AccessibilityNodeInfo nodeInfo = accessibilityBridge .createAccessibilityNodeInfo (0 );
12221224 assertTrue (nodeInfo .isAccessibilityFocused ());
1225+
1226+ HashMap <String , Object > message = new HashMap <>();
1227+ message .put ("type" , "didGainFocus" );
1228+ message .put ("nodeId" , 0 );
1229+ verify (mockChannel ).send (message );
12231230 // Clear focus on non-focused node shouldn't do anything
12241231 accessibilityBridge .performAction (
12251232 1 , AccessibilityNodeInfo .ACTION_CLEAR_ACCESSIBILITY_FOCUS , null );
@@ -1310,7 +1317,10 @@ public void itSetsBoldTextFlagCorrectly() {
13101317
13111318 @ Test
13121319 public void itSetsFocusedNodeBeforeSendingEvent () {
1313- AccessibilityChannel mockChannel = mock (AccessibilityChannel .class );
1320+ BasicMessageChannel mockChannel = mock (BasicMessageChannel .class );
1321+ AccessibilityChannel accessibilityChannel =
1322+ new AccessibilityChannel (mockChannel , mock (FlutterJNI .class ));
1323+
13141324 AccessibilityViewEmbedder mockViewEmbedder = mock (AccessibilityViewEmbedder .class );
13151325 AccessibilityManager mockManager = mock (AccessibilityManager .class );
13161326 View mockRootView = mock (View .class );
@@ -1320,7 +1330,7 @@ public void itSetsFocusedNodeBeforeSendingEvent() {
13201330 AccessibilityBridge accessibilityBridge =
13211331 setUpBridge (
13221332 /*rootAccessibilityView=*/ mockRootView ,
1323- /*accessibilityChannel=*/ mockChannel ,
1333+ /*accessibilityChannel=*/ accessibilityChannel ,
13241334 /*accessibilityManager=*/ mockManager ,
13251335 /*contentResolver=*/ null ,
13261336 /*accessibilityViewEmbedder=*/ mockViewEmbedder ,
@@ -1361,11 +1371,18 @@ public boolean verify(InvocationOnMock invocation) {
13611371 .thenAnswer (invocation -> verifier .verify (invocation ));
13621372 accessibilityBridge .performAction (0 , AccessibilityNodeInfo .ACTION_ACCESSIBILITY_FOCUS , null );
13631373 assertTrue (verifier .verified );
1374+
1375+ HashMap <String , Object > message = new HashMap <>();
1376+ message .put ("type" , "didGainFocus" );
1377+ message .put ("nodeId" , 0 );
1378+ verify (mockChannel ).send (message );
13641379 }
13651380
13661381 @ Test
13671382 public void itClearsFocusedNodeBeforeSendingEvent () {
1368- AccessibilityChannel mockChannel = mock (AccessibilityChannel .class );
1383+ BasicMessageChannel mockChannel = mock (BasicMessageChannel .class );
1384+ AccessibilityChannel accessibilityChannel =
1385+ new AccessibilityChannel (mockChannel , mock (FlutterJNI .class ));
13691386 AccessibilityViewEmbedder mockViewEmbedder = mock (AccessibilityViewEmbedder .class );
13701387 AccessibilityManager mockManager = mock (AccessibilityManager .class );
13711388 View mockRootView = mock (View .class );
@@ -1375,7 +1392,7 @@ public void itClearsFocusedNodeBeforeSendingEvent() {
13751392 AccessibilityBridge accessibilityBridge =
13761393 setUpBridge (
13771394 /*rootAccessibilityView=*/ mockRootView ,
1378- /*accessibilityChannel=*/ mockChannel ,
1395+ /*accessibilityChannel=*/ accessibilityChannel ,
13791396 /*accessibilityManager=*/ mockManager ,
13801397 /*contentResolver=*/ null ,
13811398 /*accessibilityViewEmbedder=*/ mockViewEmbedder ,
@@ -1395,6 +1412,10 @@ public void itClearsFocusedNodeBeforeSendingEvent() {
13951412 accessibilityBridge .performAction (0 , AccessibilityNodeInfo .ACTION_ACCESSIBILITY_FOCUS , null );
13961413 AccessibilityNodeInfo nodeInfo = accessibilityBridge .createAccessibilityNodeInfo (0 );
13971414 assertTrue (nodeInfo .isAccessibilityFocused ());
1415+ HashMap <String , Object > message = new HashMap <>();
1416+ message .put ("type" , "didGainFocus" );
1417+ message .put ("nodeId" , 0 );
1418+ verify (mockChannel ).send (message );
13981419
13991420 class Verifier {
14001421 public Verifier (AccessibilityBridge accessibilityBridge ) {
0 commit comments