Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Revert "fix On iOS, dialog titles are announced twice (#19826)" #21714

Merged
fluttergithubbot merged 3 commits into from
Oct 10, 2020
Merged

Revert "fix On iOS, dialog titles are announced twice (#19826)" #21714

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
998c5be
Revert "fix On iOS, dialog titles are announced twice (#19826)"
gaaclarke Oct 6, 2020
0076f4d
reformat
gaaclarke Oct 8, 2020
8f2ccd2
fixed some tests
gaaclarke Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions shell/platform/darwin/ios/framework/Source/accessibility_bridge_test.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ - (void)testAnnouncesRouteChanges {
bridge->UpdateSemantics(/*nodes=*/nodes, /*actions=*/actions);

XCTAssertEqual([accessibility_notifications count], 1ul);
XCTAssertEqualObjects(accessibility_notifications[0][@"argument"], @"route");
XCTAssertEqualObjects(accessibility_notifications[0][@"argument"], @"node3");

@gaaclarke gaaclarke Oct 10, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was just a bad revert I think.

@chunhtai chunhtai Oct 10, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, this looks good

XCTAssertEqual([accessibility_notifications[0][@"notification"] unsignedIntValue],
UIAccessibilityScreenChangedNotification);
}
Expand Down Expand Up @@ -371,7 +371,8 @@ - (void)testAnnouncesRouteChangesWhenNoNamesRoute {
flutter::SemanticsNode node1;
node1.id = 1;
node1.label = "node1";
node1.flags = static_cast<int32_t>(flutter::SemanticsFlags::kScopesRoute);
node1.flags = static_cast<int32_t>(flutter::SemanticsFlags::kScopesRoute) |
static_cast<int32_t>(flutter::SemanticsFlags::kNamesRoute);
node1.childrenInTraversalOrder = {2, 3};
node1.childrenInHitTestOrder = {2, 3};
nodes[node1.id] = node1;
Expand All @@ -392,9 +393,9 @@ - (void)testAnnouncesRouteChangesWhenNoNamesRoute {

// Notification should focus first focusable node, which is node1.
XCTAssertEqual([accessibility_notifications count], 1ul);
SemanticsObject* focusObject = accessibility_notifications[0][@"argument"];
XCTAssertEqual([focusObject uid], 2);
XCTAssertEqualObjects([focusObject accessibilityLabel], @"node2");
id focusObject = accessibility_notifications[0][@"argument"];
XCTAssertTrue([focusObject isKindOfClass:[NSString class]]);
XCTAssertEqualObjects(focusObject, @"node1");
XCTAssertEqual([accessibility_notifications[0][@"notification"] unsignedIntValue],
UIAccessibilityScreenChangedNotification);
}
Expand Down