Fix and add tests

flutter · Oct 31, 2018 · def0f23 · def0f23
1 parent 69bcc34
commit def0f23
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/ui/window.dart b/lib/ui/window.dart
@@ -395,7 +395,6 @@ class Locale {
   ///
   /// The format of the produced string is 'language-script_country'. Any null field
   /// will result in the corresponding encoding being omitted.
-  @override
   String toCompleteString() {
     final StringBuffer out = StringBuffer(languageCode);
     if (scriptCode != null)

diff --git a/testing/dart/locale_test.dart b/testing/dart/locale_test.dart
@@ -27,7 +27,10 @@ void main() {
 
     expect(const Locale.fromSubtags(languageCode: 'en').toString(), 'en');
     expect(const Locale.fromSubtags(languageCode: 'en').languageCode, 'en');
-    expect(const Locale.fromSubtags(scriptCode: 'Latn').toString(), 'und_Latn');
+    expect(const Locale.fromSubtags(scriptCode: 'Latn').toString(), 'und');
+    expect(const Locale.fromSubtags(scriptCode: 'Latn').toCompleteString(), 'und-Latn');
+    expect(const Locale.fromSubtags(scriptCode: 'Latn', countryCode: 'US').toCompleteString(), 'und_US');
+    expect(const Locale.fromSubtags(scriptCode: 'Latn', countryCode: 'US').toCompleteString(), 'und-Latn_US');
     expect(const Locale.fromSubtags(scriptCode: 'Latn').scriptCode, 'Latn');
     expect(const Locale.fromSubtags(countryCode: 'US').toString(), 'und_US');
     expect(const Locale.fromSubtags(countryCode: 'US').countryCode, 'US');