migrate more unit tests to null safety #106153

jonahwilliams · 2022-06-17T00:52:55Z

Migrates unit tests that do not have any null unsafe code in their transitive closure. this allows the tests to correctly run in sound mode.

jmagman · 2022-06-17T17:17:49Z

packages/flutter_tools/test/general.shard/analytics_test.dart

 // found in the LICENSE file.

-// @dart = 2.8
+


Extra lines in a lot of these files.

jmagman · 2022-06-17T17:21:14Z

packages/flutter_tools/lib/src/cache.dart

      final dynamic data = jsonDecode(versionFile.readAsStringSync());
-      if (data is! Map<String, Object>) {
+      if (data is! Map<String, Object?>) {
        throw Exception("Expected object of type 'Map<String, Object>' but got one of type '${data.runtimeType}'");


Suggested change

throw Exception("Expected object of type 'Map<String, Object>' but got one of type '${data.runtimeType}'");

throw Exception("Expected object of type 'Map<String, Object?>' but got one of type '${data.runtimeType}'");

jmagman · 2022-06-17T17:29:28Z

packages/flutter_tools/test/general.shard/build_system/targets/android_test.dart

-  FileSystem fileSystem;
-  Artifacts artifacts;
-  Logger logger;
+  FakeProcessManager? processManager;


Looks like this should be late

jmagman · 2022-06-17T20:52:41Z

packages/flutter_tools/test/general.shard/build_system/targets/assets_test.dart

-  Environment environment;
-  FileSystem fileSystem;
+  late Environment environment;
+  FileSystem? fileSystem;


should be late

jmagman · 2022-06-17T20:52:53Z

packages/flutter_tools/test/general.shard/build_system/targets/common_test.dart

-  Artifacts artifacts;
-  FileSystem fileSystem;
-  Logger logger;
+  FakeProcessManager? processManager;


jmagman · 2022-06-17T20:58:28Z

packages/flutter_tools/test/general.shard/cold_test.dart


  @override
-  bool supportsHotReload;
+  late bool supportsHotReload;


Suggested change

late bool supportsHotReload;

bool supportsHotReload = false;

jmagman · 2022-06-17T20:58:43Z

packages/flutter_tools/test/general.shard/cold_test.dart


  @override
-  bool supportsHotRestart;
+  late bool supportsHotRestart;


Suggested change

late bool supportsHotRestart;

bool supportsHotRestart = false;

jmagman · 2022-06-17T20:59:31Z

packages/flutter_tools/test/general.shard/dart_plugin_test.dart

-    FileSystem fs;
-    FakeFlutterProject flutterProject;
-    FakeFlutterManifest flutterManifest;
+    FileSystem? fs;


jmagman · 2022-06-17T21:00:11Z

packages/flutter_tools/test/general.shard/flutter_platform_test.dart


 void main() {
-  FileSystem fileSystem;
+  FileSystem? fileSystem;


jmagman · 2022-06-17T21:01:08Z

packages/flutter_tools/test/general.shard/github_template_test.dart

-  BufferLogger logger;
-  FileSystem fs;
+  late BufferLogger logger;
+  FileSystem? fs;


late
I'm running out of steam here, please audit the rest 🙂

jonahwilliams

I think I got em all

jonahwilliams · 2022-06-17T22:27:36Z

packages/flutter_tools/lib/src/cache.dart

      final dynamic data = jsonDecode(versionFile.readAsStringSync());
-      if (data is! Map<String, Object>) {
+      if (data is! Map<String, Object?>) {
        throw Exception("Expected object of type 'Map<String, Object>' but got one of type '${data.runtimeType}'");


jonahwilliams · 2022-06-17T22:31:46Z

packages/flutter_tools/test/general.shard/build_system/targets/assets_test.dart

-  Environment environment;
-  FileSystem fileSystem;
+  late Environment environment;
+  FileSystem? fileSystem;


jonahwilliams · 2022-06-17T22:31:51Z

packages/flutter_tools/test/general.shard/build_system/targets/android_test.dart

-  FileSystem fileSystem;
-  Artifacts artifacts;
-  Logger logger;
+  FakeProcessManager? processManager;


jonahwilliams · 2022-06-17T22:32:26Z

packages/flutter_tools/test/general.shard/build_system/targets/common_test.dart

-  Artifacts artifacts;
-  FileSystem fileSystem;
-  Logger logger;
+  FakeProcessManager? processManager;


jonahwilliams · 2022-06-17T22:32:29Z

packages/flutter_tools/test/general.shard/build_system/targets/common_test.dart

+  late Environment androidEnvironment;
+  late Environment iosEnvironment;
+  late Artifacts artifacts;
+  FileSystem? fileSystem;


jonahwilliams · 2022-06-17T22:37:37Z

packages/flutter_tools/test/general.shard/cmake_test.dart

+  FileSystem? fileSystem;

-  ProcessManager processManager;
+  ProcessManager? processManager;


jonahwilliams · 2022-06-17T22:38:14Z

packages/flutter_tools/test/general.shard/cold_test.dart

+    MemoryFileSystem? memoryFileSystem;
+    FakePlatform? fakePlatform;


jonahwilliams · 2022-06-17T22:39:14Z

packages/flutter_tools/test/general.shard/dart_plugin_test.dart

-    FileSystem fs;
-    FakeFlutterProject flutterProject;
-    FakeFlutterManifest flutterManifest;
+    FileSystem? fs;


jonahwilliams · 2022-06-17T22:47:02Z

packages/flutter_tools/test/general.shard/flutter_platform_test.dart


 void main() {
-  FileSystem fileSystem;
+  FileSystem? fileSystem;


jonahwilliams · 2022-06-17T22:48:09Z

packages/flutter_tools/test/general.shard/github_template_test.dart

-  BufferLogger logger;
-  FileSystem fs;
+  late BufferLogger logger;
+  FileSystem? fs;


jmagman

Nits, LGTM

jmagman · 2022-06-18T01:29:01Z

packages/flutter_tools/test/general.shard/asset_test.dart

 // found in the LICENSE file.

-// @dart = 2.8
+


jmagman · 2022-06-18T01:30:08Z

packages/flutter_tools/test/general.shard/cold_test.dart


  @override
-  bool supportsHotReload;
+  late bool supportsHotReload;


jmagman · 2022-06-18T01:33:28Z

packages/flutter_tools/test/general.shard/macos/application_package_test.dart

+      return <String, Object>{};
    }
-    return castStringKeyedMap(json.decode(file.readAsStringSync()));
+    return castStringKeyedMap(json.decode(file.readAsStringSync()))!.cast();


Huh I would have thought this would need to be .cast<String, Object>()

…migrate_more

jonahwilliams · 2022-06-18T04:34:13Z

Both the google3 and customer testing errors I'm getting are stale. Actually the google3 test errors look like they're coming from the wrong PR

…er/flutter#106153)

migrate more unit tests to null safety

85579a5

flutter-dashboard bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Jun 17, 2022

Jonah Williams added 3 commits June 16, 2022 21:35

++

dbd3851

++

b30778e

revert test

71ca900

jonahwilliams marked this pull request as ready for review June 17, 2022 04:59

Jonah Williams added 2 commits June 16, 2022 23:15

fixes

f5e8591

type fix

51c6b9f

jonahwilliams requested review from christopherfujino and jmagman June 17, 2022 16:06

jmagman reviewed Jun 17, 2022

View reviewed changes

++

558fb61

jonahwilliams commented Jun 17, 2022

View reviewed changes

jmagman approved these changes Jun 18, 2022

View reviewed changes

Jonah Williams added 11 commits June 17, 2022 19:02

++

ceac694

Merge branch 'master' of github.com:flutter/flutter into migrate_more

dcd322d

migrate more unit tests to null safety

d575884

++

776e73e

++

900df26

revert test

6da5020

fixes

cff36df

type fix

f9bd6a3

++

41090da

++

b4077a8

Merge branch 'migrate_more' of github.com:jonahwilliams/flutter into …

3374e8f

…migrate_more

jonahwilliams merged commit db829c1 into flutter:master Jun 18, 2022

jonahwilliams deleted the migrate_more branch June 18, 2022 04:34

engine-flutter-autoroll mentioned this pull request Jun 18, 2022

Roll Flutter from 02558d69d923 to a09d0c147934 (15 revisions) flutter/packages#2262

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jun 18, 2022

db829c1 [flutter_tools] migrate more unit tests to null safety (flutt…

9b81767

…er/flutter#106153)

engine-flutter-autoroll mentioned this pull request Jun 18, 2022

Roll Flutter from 02558d69d923 to a09d0c147934 (15 revisions) flutter/plugins#5989

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Jun 18, 2022

db829c1 [flutter_tools] migrate more unit tests to null safety (flutt…

e75dc8e

…er/flutter#106153)

engine-flutter-autoroll mentioned this pull request Jun 19, 2022

Roll Flutter from 02558d69d923 to 06810e2feb00 (17 revisions) flutter/plugins#5990

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Jun 19, 2022

db829c1 [flutter_tools] migrate more unit tests to null safety (flutt…

97626e8

…er/flutter#106153)

engine-flutter-autoroll mentioned this pull request Jun 20, 2022

Roll Flutter from 02558d69d923 to 4f034a40454b (18 revisions) flutter/plugins#6003

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Jun 20, 2022

db829c1 [flutter_tools] migrate more unit tests to null safety (flutt…

c3ab114

…er/flutter#106153)

engine-flutter-autoroll mentioned this pull request Jun 20, 2022

Roll Flutter from 02558d69d923 to e649210f39dd (20 revisions) flutter/plugins#6004

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Jun 20, 2022

db829c1 [flutter_tools] migrate more unit tests to null safety (flutt…

6d760e9

…er/flutter#106153)

engine-flutter-autoroll mentioned this pull request Jun 20, 2022

Roll Flutter from 02558d69d923 to 672859a0cb79 (21 revisions) flutter/plugins#6005

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Jun 20, 2022

db829c1 [flutter_tools] migrate more unit tests to null safety (flutt…

7262ddc

…er/flutter#106153)

engine-flutter-autoroll mentioned this pull request Jun 21, 2022

Roll Flutter from 02558d69d923 to d4929bc828ff (23 revisions) flutter/plugins#6008

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Jun 21, 2022

db829c1 [flutter_tools] migrate more unit tests to null safety (flutt…

2e13e78

…er/flutter#106153)

engine-flutter-autoroll mentioned this pull request Jun 21, 2022

Roll Flutter from 02558d69d923 to b5c0f8ab9a96 (24 revisions) flutter/plugins#6010

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Jun 21, 2022

db829c1 [flutter_tools] migrate more unit tests to null safety (flutt…

c0f3fc6

…er/flutter#106153)

engine-flutter-autoroll mentioned this pull request Jun 21, 2022

Roll Flutter from 02558d69d923 to dfaec11ba519 (29 revisions) flutter/plugins#6011

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Jun 21, 2022

db829c1 [flutter_tools] migrate more unit tests to null safety (flutt…

56785a2

…er/flutter#106153)

camsim99 pushed a commit to camsim99/flutter that referenced this pull request Aug 10, 2022

[flutter_tools] migrate more unit tests to null safety (flutter#106153)

0d53981

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 30, 2022

db829c1 [flutter_tools] migrate more unit tests to null safety (flutt…

7b6a9ce

…er/flutter#106153)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/plugins that referenced this pull request Aug 30, 2022

db829c1 [flutter_tools] migrate more unit tests to null safety (flutt…

44100eb

…er/flutter#106153)

	throw Exception("Expected object of type 'Map<String, Object>' but got one of type '${data.runtimeType}'");
	throw Exception("Expected object of type 'Map<String, Object?>' but got one of type '${data.runtimeType}'");

	late bool supportsHotRestart;
	bool supportsHotRestart = false;

		MemoryFileSystem? memoryFileSystem;
		FakePlatform? fakePlatform;

migrate more unit tests to null safety #106153

migrate more unit tests to null safety #106153

Uh oh!

Conversation

jonahwilliams commented Jun 17, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jonahwilliams left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jmagman left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

jonahwilliams commented Jun 17, 2022 •

edited

Loading