Skip to content

Commit

Permalink
[web] Make window.locale(s) non-null; upgrade to null safe deps (flut…
Browse files Browse the repository at this point in the history 
…ter#24922)

* Make window.locale(s) non-null

* upgrade deps to null-safe; migrate some test libs
  • Loading branch information
@yjbanov
yjbanov authored Mar 11, 2021
1 parent f104bad commit 4daec2f
Show file tree
Hide file tree
Showing 9 changed files with 77 additions and 67 deletions.
2 changes: 1 addition & 1 deletion lib/web_ui/dev/chrome_installer.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ Future<String> fetchLatestChromeVersion() async {
final Client client = Client();
try {
final Response response = await client.get(
'https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2FLAST_CHANGE?alt=media');
Uri.parse('https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2FLAST_CHANGE?alt=media'));
if (response.statusCode != 200) {
throw BrowserInstallerException(
'Failed to fetch latest Chrome version. Server returned status code ${response.statusCode}');
Expand Down
4 changes: 2 additions & 2 deletions lib/web_ui/lib/src/ui/window.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ abstract class SingletonFlutterWindow extends FlutterWindow {
platformDispatcher.onMetricsChanged = callback;
}

Locale? get locale => platformDispatcher.locale;
List<Locale>? get locales => platformDispatcher.locales;
Locale get locale => platformDispatcher.locale;
List<Locale> get locales => platformDispatcher.locales;

Locale? computePlatformResolvedLocale(List<Locale> supportedLocales) {
return platformDispatcher.computePlatformResolvedLocale(supportedLocales);
Expand Down
27 changes: 14 additions & 13 deletions lib/web_ui/pubspec.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,21 @@ environment:
sdk: ">=2.12.0-0 <3.0.0"

dependencies:
js: 0.6.3-nullsafety.3
meta: 1.3.0-nullsafety.6
js: 0.6.3
meta: 1.3.0

dev_dependencies:
analyzer: 0.39.15
archive: 2.0.13
http: 0.12.1
image: 2.1.13
mockito: 4.1.1
path: 1.8.0-nullsafety.3
test: 1.16.0-nullsafety.9
quiver: 3.0.0-nullsafety.2
yaml: 2.2.1
watcher: 0.9.7+15
analyzer: 1.1.0
archive: 3.1.2
html: 0.15.0
http: 0.13.0
image: 3.0.1
mockito: 5.0.0
path: 1.8.0
quiver: 3.0.0
test: 1.16.6
yaml: 3.0.0
watcher: 1.0.0
web_test_utils:
path: ../../web_sdk/web_test_utils
web_engine_tester:
Expand All @@ -32,4 +33,4 @@ dev_dependencies:
git:
url: git://github.com/flutter/web_installers.git
path: packages/web_drivers/
ref: 58081a8b2fbf234e9c8da86fce28adfefe3c2093
ref: 946111ae3248132e3773bf5c5327bcbbefa0c5f2
16 changes: 10 additions & 6 deletions lib/web_ui/test/engine/history_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// @dart = 2.6
// @dart = 2.12
@TestOn('!safari')
// TODO(nurhan): https://github.com/flutter/flutter/issues/51169

Expand Down Expand Up @@ -471,14 +471,14 @@ void testMain() {
});

group('$HashUrlStrategy', () {
TestPlatformLocation location;
late TestPlatformLocation location;

setUp(() {
location = TestPlatformLocation();
});

tearDown(() {
location = null;
location = TestPlatformLocation();
});

test('leading slash is optional', () {
Expand Down Expand Up @@ -544,11 +544,15 @@ Future<void> systemNavigatorPop() {

/// A mock implementation of [PlatformLocation] that doesn't access the browser.
class TestPlatformLocation extends PlatformLocation {
String pathname;
String search;
String hash;
String? hash;
dynamic state;

@override
String get pathname => throw UnimplementedError();

@override
String get search => throw UnimplementedError();

@override
void addPopStateListener(html.EventListener fn) {
throw UnimplementedError();
Expand Down
43 changes: 21 additions & 22 deletions lib/web_ui/test/matchers.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// found in the LICENSE file.

/// Provides utilities for testing engine code.
// @dart = 2.6
// @dart = 2.12
library matchers;

import 'dart:html' as html;
Expand All @@ -12,7 +12,6 @@ import 'dart:math' as math;
import 'package:html/parser.dart' as html_package;
import 'package:html/dom.dart' as html_package;

import 'package:meta/meta.dart';
import 'package:test/test.dart';

import 'package:ui/ui.dart';
Expand All @@ -23,9 +22,9 @@ import 'package:ui/src/engine.dart';
/// If [root] is `null` returns all surfaces from the last rendered scene.
///
/// Surfaces are returned in a depth-first order.
Iterable<PersistedSurface> enumerateSurfaces([PersistedSurface root]) {
Iterable<PersistedSurface> enumerateSurfaces([PersistedSurface? root]) {
root ??= SurfaceSceneBuilder.debugLastFrameScene;
final List<PersistedSurface> surfaces = <PersistedSurface>[root];
final List<PersistedSurface> surfaces = <PersistedSurface>[root!];

root.visitChildren((PersistedSurface surface) {
surfaces.addAll(enumerateSurfaces(surface));
Expand All @@ -37,15 +36,15 @@ Iterable<PersistedSurface> enumerateSurfaces([PersistedSurface root]) {
/// Enumerates all pictures nested under [root].
///
/// If [root] is `null` returns all pictures from the last rendered scene.
Iterable<PersistedPicture> enumeratePictures([PersistedSurface root]) {
Iterable<PersistedPicture> enumeratePictures([PersistedSurface? root]) {
root ??= SurfaceSceneBuilder.debugLastFrameScene;
return enumerateSurfaces(root).whereType<PersistedPicture>();
}

/// Enumerates all offset surfaces nested under [root].
///
/// If [root] is `null` returns all pictures from the last rendered scene.
Iterable<PersistedOffset> enumerateOffsets([PersistedSurface root]) {
Iterable<PersistedOffset> enumerateOffsets([PersistedSurface? root]) {
root ??= SurfaceSceneBuilder.debugLastFrameScene;
return enumerateSurfaces(root).whereType<PersistedOffset>();
}
Expand Down Expand Up @@ -76,7 +75,7 @@ typedef DistanceFunction<T> = num Function(T a, T b);
///
/// Calling an instance of this type must either be done dynamically, or by
/// first casting it to a [DistanceFunction<T>] for some concrete T.
typedef AnyDistanceFunction = num Function(Null a, Null b);
typedef AnyDistanceFunction = num Function(Never a, Never b);

const Map<Type, AnyDistanceFunction> _kStandardDistanceFunctions =
<Type, AnyDistanceFunction>{
Expand Down Expand Up @@ -108,7 +107,7 @@ double _rectDistance(Rect a, Rect b) {
}

double _sizeDistance(Size a, Size b) {
final Offset delta = b - a;
final Offset delta = (b - a) as Offset;
return delta.distance;
}

Expand All @@ -134,11 +133,11 @@ double _sizeDistance(Size a, Size b) {
/// [double]s and has an optional `epsilon` parameter.
/// * [closeTo], which specializes in numbers only.
Matcher within<T>({
@required num distance,
@required T from,
DistanceFunction<T> distanceFunction,
required num distance,
required T from,
DistanceFunction<T>? distanceFunction,
}) {
distanceFunction ??= _kStandardDistanceFunctions[T];
distanceFunction ??= _kStandardDistanceFunctions[T] as DistanceFunction<T>?;

if (distanceFunction == null) {
throw ArgumentError(
Expand All @@ -158,7 +157,7 @@ class _IsWithinDistance<T> extends Matcher {
final num epsilon;

@override
bool matches(Object object, Map<dynamic, dynamic> matchState) {
bool matches(Object? object, Map<dynamic, dynamic> matchState) {
if (object is! T) {
return false;
}
Expand All @@ -183,7 +182,7 @@ class _IsWithinDistance<T> extends Matcher {

@override
Description describeMismatch(
Object object,
Object? object,
Description mismatchDescription,
Map<dynamic, dynamic> matchState,
bool verbose,
Expand Down Expand Up @@ -230,11 +229,11 @@ enum HtmlComparisonMode {
String canonicalizeHtml(String htmlContent,
{HtmlComparisonMode mode = HtmlComparisonMode.nonLayoutOnly,
bool throwOnUnusedAttributes = false}) {
if (htmlContent == null || htmlContent.trim().isEmpty) {
if (htmlContent.trim().isEmpty) {
return '';
}

String _unusedAttribute(String name) {
String? _unusedAttribute(String name) {
if (throwOnUnusedAttributes) {
fail('Provided HTML contains style attribute "$name" which '
'is not used for comparison in the test. The HTML was:\n\n$htmlContent');
Expand All @@ -244,7 +243,7 @@ String canonicalizeHtml(String htmlContent,
}

html_package.Element _cleanup(html_package.Element original) {
String replacementTag = original.localName;
String replacementTag = original.localName!;
switch (replacementTag) {
case 'flt-scene':
replacementTag = 's';
Expand All @@ -256,7 +255,7 @@ String canonicalizeHtml(String htmlContent,
replacementTag = 'o';
break;
case 'flt-clip':
final String clipType = original.attributes['clip-type'];
final String? clipType = original.attributes['clip-type'];
switch (clipType) {
case 'rect':
replacementTag = 'clip';
Expand Down Expand Up @@ -314,7 +313,7 @@ String canonicalizeHtml(String htmlContent,
});

if (original.attributes.containsKey('style')) {
final String styleValue = original.attributes['style'];
final String styleValue = original.attributes['style']!;

int attrCount = 0;
final String processedAttributes = styleValue
Expand Down Expand Up @@ -368,7 +367,7 @@ String canonicalizeHtml(String htmlContent,
attrCount++;
return attr.trim();
})
.where((String attr) => attr != null && attr.isNotEmpty)
.where((String? attr) => attr != null && attr.isNotEmpty)
.join('; ');

if (attrCount > 0) {
Expand Down Expand Up @@ -412,7 +411,7 @@ void expectHtml(html.Element element, String expectedHtml,
{HtmlComparisonMode mode = HtmlComparisonMode.nonLayoutOnly}) {
expectedHtml =
canonicalizeHtml(expectedHtml, mode: mode, throwOnUnusedAttributes: true);
final String actualHtml = canonicalizeHtml(element.outerHtml, mode: mode);
final String actualHtml = canonicalizeHtml(element.outerHtml!, mode: mode);
expect(actualHtml, expectedHtml);
}

Expand Down Expand Up @@ -462,7 +461,7 @@ class SceneTester {
final SurfaceScene scene;

void expectSceneHtml(String expectedHtml) {
expectHtml(scene.webOnlyRootElement, expectedHtml,
expectHtml(scene.webOnlyRootElement!, expectedHtml,
mode: HtmlComparisonMode.noAttributes);
}
}
Expand Down
10 changes: 5 additions & 5 deletions lib/web_ui/test/spy.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// @dart = 2.6
// @dart = 2.12
import 'dart:typed_data';

import 'package:ui/src/engine.dart' hide window;
Expand Down Expand Up @@ -31,8 +31,8 @@ class PlatformMessage {
/// It holds all intercepted platform messages in a [messages] list that can
/// be inspected in tests.
class PlatformMessagesSpy {
PlatformMessageCallback _callback;
PlatformMessageCallback _backup;
PlatformMessageCallback? _callback;
PlatformMessageCallback? _backup;

bool get _isActive => _callback != null;

Expand All @@ -44,8 +44,8 @@ class PlatformMessagesSpy {
/// This is typically called inside a test's `setUp` callback.
void setUp() {
assert(!_isActive);
_callback = (String channel, ByteData data,
PlatformMessageResponseCallback callback) {
_callback = (String channel, ByteData? data,
PlatformMessageResponseCallback? callback) {
messages.add(PlatformMessage(
channel,
const JSONMethodCodec().decodeMethodCall(data),
Expand Down
Loading

0 comments on commit 4daec2f

Please sign in to comment.