Move zircon_tests from package:litetest to package:async_helper. (flutter/engine#55149)

matanlurey · web-flow · commit ca6c46441e0e · 2024-09-12T21:10:52.000Z
The engine has historically used `package:litetest`, a home grown invention that is a wrapper around the Dart SDK. In #133569, we've moved over to the heavier weight `package:test`, which has been simplified since first evaluated by the Dart SDK vending the dependencies we need. The last user of `package:litetest` is a single test in the Fuchsia SDK, `zircon_tests`. This PR migrates the test from `litetest` (which will be deleted) to the Dart SK vendored `async_minittest`. For this simple test case, there is only a 1-line behavioral change (`notEquals(foo)` becomes `!= foo, true`), and it allows us to remove dependencies from the tree.
diff --git a/engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn
@@ -65,7 +65,7 @@ dart_library("zircon_tests_lib") {
   package_root = "test"
 
   sources = [ "zircon_tests.dart" ]
-  deps = [ "//flutter/shell/platform/fuchsia/dart:litetest" ]
+  deps = [ "//flutter/shell/platform/fuchsia/dart:async_helper" ]
 }
 
 flutter_component("zircon_tests_component") {
diff --git a/engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon/test/zircon_tests.dart b/engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon/test/zircon_tests.dart
@@ -8,7 +8,7 @@ import 'dart:io';
 import 'dart:typed_data';
 import 'dart:zircon';
 
-import 'package:litetest/litetest.dart';
+import 'package:async_helper/async_minitest.dart';
 
 /// Helper method to turn a [String] into a [ByteData] containing the
 /// text of the string encoded as UTF-8.
@@ -198,7 +198,7 @@ void main() {
       final HandleResult vmo = System.vmoCreate(0);
       expect(vmo.status, equals(ZX.OK));
       int originalKoid = vmo.handle.koid;
-      expect(originalKoid, notEquals(ZX.KOID_INVALID));
+      expect(originalKoid != ZX.KOID_INVALID, true);
       // Cached koid should be same value.
       expect(originalKoid, equals(vmo.handle.koid));
       vmo.handle.close();
diff --git a/engine/src/flutter/shell/platform/fuchsia/dart/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/dart/BUILD.gn
@@ -59,36 +59,21 @@ dart_library("async_helper") {
 
   pubspec = "$package_root/pubspec.yaml"
 
-  deps = []
+  deps = [ ":expect" ]
 
   sources = [
     "async_helper.dart",
     "async_minitest.dart",
   ]
 }
 
-dart_library("meta") {
-  package_root = "$dart_src/pkg/meta"
-  package_name = "meta"
-
-  pubspec = "$package_root/pubspec.yaml"
-
-  deps = []
-
-  sources = [
-    "dart2js.dart",
-    "meta.dart",
-    "meta_meta.dart",
-  ]
-}
-
 dart_library("expect") {
   package_root = "$dart_src/pkg/expect"
   package_name = "expect"
 
   pubspec = "$package_root/pubspec.yaml"
 
-  deps = [ ":meta" ]
+  deps = []
 
   sources = [
     "config.dart",
@@ -98,26 +83,18 @@ dart_library("expect") {
   ]
 }
 
-dart_library("litetest") {
-  package_root = "//flutter/testing/litetest"
-  package_name = "litetest"
+dart_library("meta") {
+  package_root = "$dart_src/pkg/meta"
+  package_name = "meta"
 
   pubspec = "$package_root/pubspec.yaml"
 
-  source_dir = "lib"
-
-  deps = [
-    ":async_helper",
-    ":expect",
-    ":meta",
-  ]
+  deps = []
 
   sources = [
-    "litetest.dart",
-    "src/async_minitest.dart",
-    "src/matchers.dart",
-    "src/test.dart",
-    "src/test_suite.dart",
+    "dart2js.dart",
+    "meta.dart",
+    "meta_meta.dart",
   ]
 }
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ dart_library("zircon_tests_lib") {`
`65`	`65`	`package_root = "test"`
`66`	`66`
`67`	`67`	`sources = [ "zircon_tests.dart" ]`
`68`		`- deps = [ "//flutter/shell/platform/fuchsia/dart:litetest" ]`
	`68`	`+ deps = [ "//flutter/shell/platform/fuchsia/dart:async_helper" ]`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`flutter_component("zircon_tests_component") {`