This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Remove currentLocale prepend on iOS #18379
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| // Copyright 2020 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #import <Flutter/Flutter.h> | ||
| #import <XCTest/XCTest.h> | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
Contributor
There was a problem hiding this comment. Remove the header, you can move the interface into the test .m file. |
||
|
|
||
| @interface LocalizationInitializationTest : XCTestCase | ||
| @property(nonatomic, strong) XCUIApplication* application; | ||
| @end | ||
|
|
||
| NS_ASSUME_NONNULL_END | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| // Copyright 2013 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #import "LocalizationInitialization.h" | ||
|
|
||
| FLUTTER_ASSERT_ARC | ||
|
|
||
| @interface XCUIElement (ftr_waitForNonExistence) | ||
| /// Keeps waiting until the element doesn't exist. Returns NO if the timeout is | ||
| /// reached before it doesn't exist. | ||
| - (BOOL)ftr_waitForNonExistenceWithTimeout:(NSTimeInterval)timeout; | ||
| /// Waits the full duration to ensure something doesn't exist for that duration. | ||
| /// Returns NO if at some point the element exists during the duration. | ||
| - (BOOL)ftr_waitForNonExistenceForDuration:(NSTimeInterval)duration; | ||
| @end | ||
|
|
||
| @implementation XCUIElement (ftr_waitForNonExistence) | ||
| - (BOOL)ftr_waitForNonExistenceWithTimeout:(NSTimeInterval)timeout { | ||
| NSTimeInterval delta = 0.5; | ||
| while (timeout > 0.0) { | ||
| if (!self.exists) { | ||
| return YES; | ||
| } | ||
| usleep(delta * 1000000); | ||
|
Contributor
There was a problem hiding this comment. Can we avoid this? Would it help at all if we had EarlyGrey for Flutter instead? If we need that, we should probably add a TODO here to replace this when EarlGrey is available.
Contributor
There was a problem hiding this comment. Something like: NSPredicate *predicate = [NSPredicate predicateWithFormat:@"exists = YES"];
XCTestExpectation *expectation = [self expectationForPredicate:predicate evaluatedWithObject:textInputSemanticsObject handler:NULL];
[self waitForExpectations:@[expectation] timeout:10.0];
Contributor
There was a problem hiding this comment. This is probably better, actually: XCTestExpectation *expectation = [self keyValueObservingExpectationForObject:textInputSemanticsObject keyPath:@"exists" expectedValue:@YES];
[self waitForExpectations:@[expectation] timeout:10.0];(I didn't actually test these).
Contributor
There was a problem hiding this comment. It's coming back to me now - that week I got better at Objective C with your guidance .. and how it faded...
Contributor
There was a problem hiding this comment. I had to look it up myself, it's been awhile...
Contributor
Author
There was a problem hiding this comment. Ahh thanks for the assistance, Trying to learn all the iOS testing frameworks and whatnot to write this haha. This particular code was repurposed from another test, still working on refining/improving it. |
||
| timeout -= delta; | ||
| } | ||
| return NO; | ||
| } | ||
|
|
||
| - (BOOL)ftr_waitForNonExistenceForDuration:(NSTimeInterval)duration { | ||
| return ![self waitForExistenceWithTimeout:duration]; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| @implementation LocalizationInitializationTest | ||
|
|
||
| - (void)setUp { | ||
| [super setUp]; | ||
| self.continueAfterFailure = NO; | ||
|
|
||
| self.application = [[XCUIApplication alloc] init]; | ||
| self.application.launchArguments = @[ @"--locale-initialization" ]; | ||
| [self.application launch]; | ||
| } | ||
|
|
||
| - (void)testNoLocalePrepend { | ||
| NSTimeInterval timeout = 10.0; | ||
|
|
||
| // The locales recieved by dart:ui are exposed onBeginFrame via semantics label. | ||
| // There should only be one locale, as we have removed the locale prepend on iOS. | ||
| XCUIElement* textInputSemanticsObject = | ||
| [[[self.application textFields] matchingIdentifier:@"[en_US]"] element]; | ||
| XCTAssertTrue([textInputSemanticsObject waitForExistenceWithTimeout:timeout]); | ||
| XCTAssertTrue(false); | ||
| } | ||
|
|
||
| @end | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| // Copyright 2020 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| import 'dart:typed_data'; | ||
| import 'dart:ui'; | ||
|
|
||
| import 'scenario.dart'; | ||
|
|
||
| /// Sends the recieved locale data back as semantics information. | ||
| class LocaleInitialization extends Scenario { | ||
| /// Constructor | ||
| LocaleInitialization(Window window) | ||
| : assert(window != null), | ||
| super(window); | ||
|
|
||
| @override | ||
| void onBeginFrame(Duration duration) { | ||
| // Doesn't matter what we draw. Just paint white. | ||
| final SceneBuilder builder = SceneBuilder(); | ||
| final PictureRecorder recorder = PictureRecorder(); | ||
| final Canvas canvas = Canvas(recorder); | ||
|
|
||
| canvas.drawRect( | ||
| Rect.fromLTWH(0, 0, window.physicalSize.width, window.physicalSize.height), | ||
| Paint()..color = const Color.fromARGB(255, 255, 255, 255), | ||
| ); | ||
| final Picture picture = recorder.endRecording(); | ||
|
|
||
| builder.addPicture( | ||
| Offset.zero, | ||
| picture, | ||
| ); | ||
| final Scene scene = builder.build(); | ||
| window.render(scene); | ||
| scene.dispose(); | ||
|
|
||
| // On the first frame, pretend that it drew a text field. Send the | ||
| // corresponding semantics tree comprised of 1 node with the locale data | ||
| // as the label. | ||
| window.updateSemantics((SemanticsUpdateBuilder() | ||
| ..updateNode( | ||
| id: 0, | ||
| // SemanticsFlag.isTextField. | ||
| flags: 16, | ||
| // SemanticsAction.tap. | ||
| actions: 1, | ||
| rect: const Rect.fromLTRB(0.0, 0.0, 414.0, 48.0), | ||
| label: window.locales.toString(), | ||
| textDirection: TextDirection.ltr, | ||
| textSelectionBase: -1, | ||
| textSelectionExtent: -1, | ||
| platformViewId: -1, | ||
| maxValueLength: -1, | ||
| currentValueLength: 0, | ||
| scrollChildren: 0, | ||
| scrollIndex: 0, | ||
| elevation: 0.0, | ||
| thickness: 0.0, | ||
| childrenInTraversalOrder: Int32List(0), | ||
| childrenInHitTestOrder: Int32List(0), | ||
| additionalActions: Int32List(0), | ||
| )).build() | ||
| ); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fun fact: you can change the app's locale and language with launch args
-AppleLanguagesand-AppleLocale.https://developer.apple.com/library/archive/documentation/MacOSX/Conceptual/BPInternational/TestingYourInternationalApp/TestingYourInternationalApp.html#//apple_ref/doc/uid/10000171i-CH7-SW2
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, Will be super useful for the next set of changes that I'll be making immediately after this one!