diff --git a/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn b/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn index f8501b5c312ac..0d13ea12c49fa 100644 --- a/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn +++ b/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/shell/platform/fuchsia/dart-pkg/zircon/test/zircon_tests.dart b/shell/platform/fuchsia/dart-pkg/zircon/test/zircon_tests.dart index a0e380fb34d35..183295251c9b6 100644 --- a/shell/platform/fuchsia/dart-pkg/zircon/test/zircon_tests.dart +++ b/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/shell/platform/fuchsia/dart/BUILD.gn b/shell/platform/fuchsia/dart/BUILD.gn index 6586e16d4c792..b2140f82b547e 100644 --- a/shell/platform/fuchsia/dart/BUILD.gn +++ b/shell/platform/fuchsia/dart/BUILD.gn @@ -59,7 +59,7 @@ dart_library("async_helper") { pubspec = "$package_root/pubspec.yaml" - deps = [] + deps = [ ":expect" ] sources = [ "async_helper.dart", @@ -67,28 +67,13 @@ dart_library("async_helper") { ] } -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", ] }