Add more package:test (removing usages of package:litetest)

pubspec.yaml

@@ -87,7 +87,6 @@ workspace:
   - testing/benchmark
   - testing/dart
   - testing/litetest
-  - testing/pkg_test_demo
   - testing/scenario_app
   - testing/skia_gold_client
   - testing/smoke_test_failure
@@ -263,6 +262,8 @@ dependency_overrides:
     path: ./third_party/dart/third_party/pkg/shelf/pkgs/shelf_static
   shelf_web_socket:
     path: ./third_party/dart/third_party/pkg/shelf/pkgs/shelf_web_socket
+  sky_engine:
+    path: ./sky/packages/sky_engine
   smith:
     path: ./third_party/dart/pkg/smith
   source_map_stack_trace:

testing/run_tests.py

@@ -124,7 +124,9 @@ def run_cmd( # pylint: disable=too-many-arguments
         allowed_failure = True
 
     if not allowed_failure:
-      raise RuntimeError('Command "%s" exited with code %s.' % (command_string, process.returncode))
+      raise RuntimeError(
+          'Command "%s" (in %s) exited with code %s.' % (command_string, cwd, process.returncode)
+      )
 
   for forbidden_string in forbidden_output:
     if forbidden_string in output:
@@ -133,7 +135,10 @@ def run_cmd( # pylint: disable=too-many-arguments
       )
 
   print_divider('<')
-  logger.info('Command run successfully in %.2f seconds: %s', end_time - start_time, command_string)
+  logger.info(
+      'Command run successfully in %.2f seconds: %s (in %s)', end_time - start_time, command_string,
+      cwd
+  )
 
 
 def is_mac():
@@ -919,8 +924,7 @@ def gather_dart_package_tests(build_dir, package_path, extra_opts):
     #
     # Until then, assert that no extra_opts are passed and explain the limitation.
     assert not extra_opts, '%s uses package:test and cannot use CLI args' % package_path
-    # TODO(https://github.com/flutter/flutter/issues/154263): Restore `--disable-dart-dev`.
-    opts = ['test']
+    opts = ['test', '--reporter=expanded']
     yield EngineExecutableTask(
         build_dir, os.path.join('dart-sdk', 'bin', 'dart'), None, flags=opts, cwd=package_path
     )
@@ -976,7 +980,6 @@ def build_dart_host_test_list(build_dir):
           ],
       ),
       (os.path.join('flutter', 'testing', 'litetest'), []),
-      (os.path.join('flutter', 'testing', 'pkg_test_demo'), []),
       (os.path.join('flutter', 'testing', 'skia_gold_client'), []),
       (os.path.join('flutter', 'testing', 'scenario_app'), []),
       (

testing/scenario_app/pubspec.yaml

@@ -24,9 +24,4 @@ dependencies:
   sky_engine: any
 
 dev_dependencies:
-  litetest: any
-
-# TODO(matanlurey): Figure out how sky_engine fits into the pub workspace model.
-dependency_overrides:
-  sky_engine:
-    path: ../../sky/packages/sky_engine
+  test: any

testing/scenario_app/test/adb_log_filter_test.dart

@@ -1,4 +1,4 @@
-import 'package:litetest/litetest.dart';
+import 'package:test/test.dart';
 
 import '../bin/utils/adb_logcat_filtering.dart';
 import 'src/fake_adb_logcat.dart';

testing/skia_gold_client/lib/skia_gold_client.dart

@@ -189,10 +189,6 @@ interface class SkiaGoldClient {
 
   /// The path to the local [Directory] where the `goldctl` tool is hosted.
   String get _goldctl {
-    assert(
-      isAvailable(environment: _environment),
-      'Trying to use `goldctl` in an environment where it is not available',
-    );
     final String? result = _environment[_kGoldctlKey];
     if (result == null || result.isEmpty) {
       throw StateError('The environment variable $_kGoldctlKey is not set.');

testing/skia_gold_client/pubspec.yaml

@@ -22,5 +22,5 @@ dependencies:
   process: any
 
 dev_dependencies:
-  litetest: any
   process_fakes: any
+  test: any

testing/skia_gold_client/test/release_version_test.dart

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:litetest/litetest.dart';
 import 'package:skia_gold_client/src/release_version.dart';
+import 'package:test/test.dart';
 
 void main() {
   test('should accept a major and minor version', () {

testing/skia_gold_client/test/skia_gold_client_test.dart

@@ -8,11 +8,11 @@ import 'dart:io' as io;
 import 'dart:typed_data';
 
 import 'package:engine_repo_tools/engine_repo_tools.dart';
-import 'package:litetest/litetest.dart';
 import 'package:path/path.dart' as p;
 import 'package:process_fakes/process_fakes.dart';
 import 'package:skia_gold_client/skia_gold_client.dart';
 import 'package:skia_gold_client/src/release_version.dart';
+import 'package:test/test.dart';
 
 void main() {
   /// A mock commit hash that is used to simulate a successful git call.

testing/smoke_test_failure/fail_test.dart

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:litetest/litetest.dart';
+import 'package:test/test.dart';
 
 void main() {
   test('test smoke test -- this test SHOULD FAIL', () {

testing/smoke_test_failure/pubspec.yaml

@@ -13,4 +13,4 @@ environment:
 resolution: workspace
 
 dependencies:
-  litetest: any
+  test: any

tools/clang_tidy/lib/src/options.dart

@@ -10,7 +10,7 @@ import 'package:path/path.dart' as path;
 
 import 'lint_target.dart';
 
-final Engine _engineRoot = Engine.findWithin(path.dirname(path.fromUri(io.Platform.script)));
+final Engine _engineRoot = Engine.findWithin();
 
 /// Adds warnings as errors for only specific runs.  This is helpful if migrating one platform at a time.
 String? _platformSpecificWarningsAsErrors(ArgResults options) {

tools/clang_tidy/pubspec.yaml

@@ -22,9 +22,6 @@ dependencies:
   process_runner: any
 
 dev_dependencies:
-  async_helper: any
-  expect: any
-  litetest: any
   process_fakes: any
-  smith: any
+  test: any
   yaml: any

tools/clang_tidy/test/clang_tidy_test.dart

@@ -10,12 +10,11 @@ import 'package:clang_tidy/src/command.dart';
 import 'package:clang_tidy/src/lint_target.dart';
 import 'package:clang_tidy/src/options.dart';
 import 'package:engine_repo_tools/engine_repo_tools.dart';
-import 'package:litetest/litetest.dart';
 import 'package:path/path.dart' as path;
 import 'package:process/process.dart';
 import 'package:process_fakes/process_fakes.dart';
 import 'package:process_runner/process_runner.dart';
-
+import 'package:test/test.dart';
 
 /// A test fixture for the `clang-tidy` tool.
 final class Fixture {
@@ -94,8 +93,7 @@ Use -header-filter=.* to display errors from all non-system headers. Use -system
 1 warning treated as error''';
 
 void _withTempFile(String prefix, void Function(String path) func) {
-  final String filePath =
-      path.join(io.Directory.systemTemp.path, '$prefix-temp-file');
+  final String filePath = path.join(io.Directory.systemTemp.path, '$prefix-temp-file');
   final io.File file = io.File(filePath);
   file.createSync();
   try {
@@ -105,16 +103,27 @@ void _withTempFile(String prefix, void Function(String path) func) {
   }
 }
 
-Future<int> main(List<String> args) async {
-  final String? buildCommands =
-      args.firstOrNull ??
-      Engine.findWithin().latestOutput()?.compileCommandsJson.path;
-
-  if (buildCommands == null || args.length > 1) {
-    io.stderr.writeln(
-      'Usage: clang_tidy_test.dart [path/to/compile_commands.json]',
-    );
-    return 1;
+final _engineRoot = Engine.findWithin();
+
+void main() {
+  // This test requires a compile_commands.json file to exist.
+  //
+  // We can provide exactly which build to use, i.e.:
+  //    COMPILE_COMMANDS_PATH=/path/to/compile_commands.json dart test
+  //
+  // Or, we can fall back to the latest build output if one isn't provided.
+  final String buildCommands;
+  if (io.Platform.environment['COMPILE_COMMANDS_PATH'] case final String compileCommandsPath) {
+    buildCommands = compileCommandsPath;
+  } else {
+    final String? inferredPath = _engineRoot.latestOutput()?.compileCommandsJson.path;
+    io.stderr.writeln('No COMPILE_COMMANDS_PATH found in environment.');
+    if (inferredPath != null) {
+      io.stderr.writeln('Inferring the last build output: $inferredPath');
+      buildCommands = inferredPath;
+    } else {
+      fail('No outputs or build commands found.');
+    }
   }
 
   test('--help gives help, and uses host_debug by default outside of an engine root', () async {
@@ -253,7 +262,7 @@ Future<int> main(List<String> args) async {
     final int result = await fixture.tool.run();
 
     expect(result, equals(1));
-    expect(fixture.errBuffer.toString().split('\n')[0], hasMatch(
+    expect(fixture.errBuffer.toString().split('\n')[0], matches(
       r"ERROR: Build commands path .*/does/not/exist doesn't exist.",
     ));
   });
@@ -270,7 +279,7 @@ Future<int> main(List<String> args) async {
     final int result = await fixture.tool.run();
 
     expect(result, equals(1));
-    expect(fixture.errBuffer.toString().split('\n')[0], hasMatch(
+    expect(fixture.errBuffer.toString().split('\n')[0], matches(
       r'ERROR: Build commands path .*/does/not/exist'
       r'[/\\]out[/\\]ios_debug_unopt[/\\]compile_commands.json'
       r" doesn't exist.",
@@ -475,7 +484,13 @@ Future<int> main(List<String> args) async {
     );
 
     // This file needs to exist, and be UTF8 line-parsable.
-    final String filePath = io.Platform.script.toFilePath();
+    final String filePath = path.join(
+      _engineRoot.flutterDir.path,
+      'tools',
+      'clang_tidy',
+      'test',
+      'clang_tidy_test.dart',
+    );
     final List<dynamic> buildCommandsData = <Map<String, dynamic>>[
       <String, dynamic>{
         'directory': '/unused',
@@ -657,6 +672,4 @@ Future<int> main(List<String> args) async {
 
     expect(result, 0);
   });
-
-  return 0;
 }

tools/clang_tidy/test/header_filter_regex_test.dart

@@ -5,14 +5,14 @@
 import 'dart:io';
 
 import 'package:engine_repo_tools/engine_repo_tools.dart';
-import 'package:litetest/litetest.dart';
 import 'package:path/path.dart' as path;
+import 'package:test/test.dart';
 import 'package:yaml/yaml.dart' as yaml;
 
 /// Tests that `HeaderFilterRegex` works as expected in `.clang_tidy`.
 void main() {
   // Find the root of the repo.
-  final Engine engine = Engine.findWithin(path.dirname(Platform.script.path));
+  final Engine engine = Engine.findWithin();
 
   // Find the `.clang_tidy` file and "parse" it (it's YAML).
   final yaml.YamlDocument dotClangTidy = yaml.loadYamlDocument(
@@ -62,11 +62,11 @@ void main() {
     // Create a fake file in that path, and assert that it matches the regex.
     for (final String rootDir in rootDirs) {
       final String file = path.join('..', '..', 'flutter', rootDir, 'foo');
-      if (!regexValue.hasMatch(file)) {
-        // This is because reason: ... doesn't work in pkg/litetest.
-        stderr.writeln('Expected "$file" to be caught by HeaderFilterRegex (${regexValue.pattern}).');
-      }
-      expect(regexValue.hasMatch(file), isTrue);
+      expect(
+        file,
+        matches(regexValue),
+        reason: '$rootDir/foo should be allowed by the regex but was not.',
+      );
     }
   });
 }

tools/golden_tests_harvester/pubspec.yaml

@@ -19,4 +19,4 @@ dependencies:
   skia_gold_client: any
 
 dev_dependencies:
-  litetest: any
+  test: any