Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Move zircon_tests from package:litetest to package:async_helper. #55149

Merged
merged 8 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
4 changes: 2 additions & 2 deletions shell/platform/fuchsia/dart-pkg/zircon/test/zircon_tests.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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();
Expand Down
41 changes: 9 additions & 32 deletions shell/platform/fuchsia/dart/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
]
}

Expand Down