[infra] Rename test_helpers to native_test_helpers (#2387)

goderbauer · web-flow · commit c05f8a1d7349 · 2025-07-09T09:39:07.000+02:00
diff --git a/.github/workflows/native.yaml b/.github/workflows/native.yaml
@@ -15,9 +15,9 @@ on:
       - "pkgs/hooks_runner/**"
       - "pkgs/hooks/**"
       - "pkgs/json_syntax_generator/**"
+      - "pkgs/native_test_helpers/**"
       - "pkgs/native_toolchain_c/**"
       - "pkgs/repo_lint_rules/**"
-      - "pkgs/test_helpers/**"
       - "tool/**"
   push:
     branches: [main]
@@ -28,9 +28,9 @@ on:
       - "pkgs/hooks_runner/**"
       - "pkgs/hooks/**"
       - "pkgs/json_syntax_generator/**"
+      - "pkgs/native_test_helpers/**"
       - "pkgs/native_toolchain_c/**"
       - "pkgs/repo_lint_rules/**"
-      - "pkgs/test_helpers/**"
       - "tool/**"
   schedule:
     - cron: "0 0 * * 0" # weekly
diff --git a/.github/workflows/objective_c.yaml b/.github/workflows/objective_c.yaml
@@ -7,15 +7,15 @@ on:
     paths:
       - '.github/workflows/objective_c.yaml'
       - 'pkgs/ffigen/**'
+      - 'pkgs/native_test_helpers/**'
       - 'pkgs/objective_c/**'
-      - 'pkgs/test_helpers/**'
   pull_request:
     branches: [main, stable]
     paths:
       - '.github/workflows/objective_c.yaml'
       - 'pkgs/ffigen/**'
+      - 'pkgs/native_test_helpers/**'
       - 'pkgs/objective_c/**'
-      - 'pkgs/test_helpers/**'
   schedule:
     - cron: "0 0 * * 0"
 
diff --git a/.github/workflows/swift2objc.yaml b/.github/workflows/swift2objc.yaml
@@ -6,14 +6,14 @@ on:
     branches: [main, stable]
     paths:
       - '.github/workflows/swift2objc.yaml'
+      - 'pkgs/native_test_helpers/**'
       - 'pkgs/swift2objc/**'
-      - 'pkgs/test_helpers/**'
   pull_request:
     branches: [main, stable]
     paths:
       - '.github/workflows/swift2objc.yaml'
+      - 'pkgs/native_test_helpers/**'
       - 'pkgs/swift2objc/**'
-      - 'pkgs/test_helpers/**'
   schedule:
     - cron: "0 0 * * 0"
 
diff --git a/.github/workflows/swiftgen.yaml b/.github/workflows/swiftgen.yaml
@@ -7,19 +7,19 @@ on:
     paths:
       - '.github/workflows/swiftgen.yaml'
       - 'pkgs/ffigen/**'
+      - 'pkgs/native_test_helpers/**'
       - 'pkgs/objective_c/**'
       - 'pkgs/swift2objc/**'
       - 'pkgs/swiftgen/**'
-      - 'pkgs/test_helpers/**'
   pull_request:
     branches: [main, stable]
     paths:
       - '.github/workflows/swiftgen.yaml'
       - 'pkgs/ffigen/**'
+      - 'pkgs/native_test_helpers/**'
       - 'pkgs/objective_c/**'
       - 'pkgs/swift2objc/**'
       - 'pkgs/swiftgen/**'
-      - 'pkgs/test_helpers/**'
   schedule:
     - cron: "0 0 * * 0"
 
diff --git a/pkgs/code_assets/pubspec.yaml b/pkgs/code_assets/pubspec.yaml
@@ -27,8 +27,8 @@ dev_dependencies:
   custom_lint: ^0.7.5
   dart_flutter_team_lints: ^3.5.1
   json_schema: ^5.2.0 # May only be used in tool/ and test/json_schema/.
+  native_test_helpers:
+    path: ../native_test_helpers/
   repo_lint_rules:
     path: ../repo_lint_rules/
   test: ^1.25.15
-  test_helpers:
-    path: ../test_helpers/
diff --git a/pkgs/code_assets/test/json_schema/schema_test.dart b/pkgs/code_assets/test/json_schema/schema_test.dart
@@ -7,7 +7,7 @@
 import 'dart:convert';
 
 import 'package:json_schema/json_schema.dart';
-import 'package:test_helpers/test_helpers.dart';
+import 'package:native_test_helpers/native_test_helpers.dart';
 
 import 'helpers.dart';
 
diff --git a/pkgs/data_assets/pubspec.yaml b/pkgs/data_assets/pubspec.yaml
@@ -23,8 +23,8 @@ dev_dependencies:
   custom_lint: ^0.7.5
   dart_flutter_team_lints: ^3.5.1
   json_schema: ^5.2.0 # May only be used in tool/ and test/json_schema/.
+  native_test_helpers:
+    path: ../native_test_helpers
   repo_lint_rules:
     path: ../repo_lint_rules/
   test: ^1.25.15
-  test_helpers:
-    path: ../test_helpers
diff --git a/pkgs/data_assets/test/json_schema/schema_test.dart b/pkgs/data_assets/test/json_schema/schema_test.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:json_schema/json_schema.dart';
-import 'package:test_helpers/test_helpers.dart';
+import 'package:native_test_helpers/native_test_helpers.dart';
 
 import 'helpers.dart';
 
diff --git a/pkgs/hooks/pubspec.yaml b/pkgs/hooks/pubspec.yaml
@@ -38,9 +38,9 @@ dev_dependencies:
   json_schema: ^5.2.0 # May only be used in tool/ and test/json_schema/.
   json_syntax_generator:
     path: ../json_syntax_generator/
+  native_test_helpers:
+    path: ../native_test_helpers/
   path: ^1.9.1
   repo_lint_rules:
     path: ../repo_lint_rules/
   test: ^1.25.15
-  test_helpers:
-    path: ../test_helpers/
diff --git a/pkgs/hooks/test/helpers.dart b/pkgs/hooks/test/helpers.dart
@@ -8,8 +8,8 @@ import 'package:code_assets/code_assets.dart';
 import 'package:data_assets/data_assets.dart';
 import 'package:hooks/hooks.dart';
 import 'package:logging/logging.dart';
+import 'package:native_test_helpers/native_test_helpers.dart';
 import 'package:test/test.dart';
-import 'package:test_helpers/test_helpers.dart';
 
 const keepTempKey = 'KEEP_TEMPORARY_DIRECTORIES';
 
diff --git a/pkgs/hooks/test/json_schema/schema_test.dart b/pkgs/hooks/test/json_schema/schema_test.dart
@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:json_schema/json_schema.dart';
-import 'package:test_helpers/test_helpers.dart';
+import 'package:native_test_helpers/native_test_helpers.dart';
 
 import 'helpers.dart';
 
diff --git a/pkgs/hooks/tool/generate_schemas.dart b/pkgs/hooks/tool/generate_schemas.dart
@@ -6,7 +6,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:test_helpers/test_helpers.dart';
+import 'package:native_test_helpers/native_test_helpers.dart';
 
 import '../test/json_schema/helpers.dart';
 import 'normalize.dart';
diff --git a/pkgs/hooks/tool/generate_syntax.dart b/pkgs/hooks/tool/generate_syntax.dart
@@ -8,7 +8,7 @@ import 'dart:io';
 
 import 'package:args/args.dart';
 import 'package:json_syntax_generator/json_syntax_generator.dart';
-import 'package:test_helpers/test_helpers.dart';
+import 'package:native_test_helpers/native_test_helpers.dart';
 
 import '../test/json_schema/helpers.dart';
 
diff --git a/pkgs/hooks/tool/normalize.dart b/pkgs/hooks/tool/normalize.dart
@@ -6,8 +6,8 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:args/args.dart';
+import 'package:native_test_helpers/native_test_helpers.dart';
 import 'package:path/path.dart' as p;
-import 'package:test_helpers/test_helpers.dart';
 
 void main(List<String> arguments) {
   final stopwatch = Stopwatch()..start();
diff --git a/pkgs/hooks_runner/pubspec.yaml b/pkgs/hooks_runner/pubspec.yaml
@@ -29,8 +29,8 @@ dev_dependencies:
   dart_flutter_team_lints: ^3.5.1
   data_assets: any # Used in tests.
   file_testing: ^3.0.2
+  native_test_helpers:
+    path: ../native_test_helpers/
   repo_lint_rules:
     path: ../repo_lint_rules/
   test: ^1.25.15
-  test_helpers:
-    path: ../test_helpers/
diff --git a/pkgs/hooks_runner/test/helpers.dart b/pkgs/hooks_runner/test/helpers.dart
@@ -11,8 +11,8 @@ import 'package:file/local.dart' show LocalFileSystem;
 import 'package:hooks/hooks.dart';
 import 'package:hooks_runner/src/utils/run_process.dart' as run_process;
 import 'package:logging/logging.dart';
+import 'package:native_test_helpers/native_test_helpers.dart';
 import 'package:test/test.dart';
-import 'package:test_helpers/test_helpers.dart';
 import 'package:yaml/yaml.dart';
 
 extension UriExtension on Uri {
diff --git a/pkgs/hooks_runner/test/locking/locking_test.dart b/pkgs/hooks_runner/test/locking/locking_test.dart
@@ -7,8 +7,8 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
 
+import 'package:native_test_helpers/native_test_helpers.dart';
 import 'package:test/test.dart';
-import 'package:test_helpers/test_helpers.dart';
 
 import '../helpers.dart';
 
diff --git a/pkgs/native_test_helpers/README.md b/pkgs/native_test_helpers/README.md
@@ -4,5 +4,5 @@ Utils for writing tests in this monorepo. This isn't published, and should only
 be used as a dev dependency for the other packages in this repo, via a path dep.
 
 ```shell
-dart pub add "dev:test_helpers:{path: ../test_helpers}"
+dart pub add "dev:native_test_helpers:{path: ../native_test_helpers}"
 ```
diff --git a/pkgs/native_test_helpers/analysis_options.yaml b/pkgs/native_test_helpers/analysis_options.yaml
diff --git a/pkgs/native_test_helpers/lib/native_test_helpers.dart b/pkgs/native_test_helpers/lib/native_test_helpers.dart
diff --git a/pkgs/native_test_helpers/lib/src/find_package_root.dart b/pkgs/native_test_helpers/lib/src/find_package_root.dart
diff --git a/pkgs/native_test_helpers/pubspec.yaml b/pkgs/native_test_helpers/pubspec.yaml
@@ -1,6 +1,6 @@
-name: test_helpers
+name: native_test_helpers
 version: 0.1.0-wip
-repository: https://github.com/dart-lang/native/tree/main/pkgs/test_helpers
+repository: https://github.com/dart-lang/native/tree/main/pkgs/native_test_helpers
 description: Helper functions for tests in this monorepo.
 
 publish_to: none
diff --git a/pkgs/native_toolchain_c/pubspec.yaml b/pkgs/native_toolchain_c/pubspec.yaml
@@ -28,8 +28,8 @@ dev_dependencies:
   collection: ^1.19.1
   custom_lint: ^0.7.5
   dart_flutter_team_lints: ^3.5.1
+  native_test_helpers:
+    path: ../native_test_helpers/
   repo_lint_rules:
     path: ../repo_lint_rules/
   test: ^1.25.15
-  test_helpers:
-    path: ../test_helpers/
diff --git a/pkgs/native_toolchain_c/test/helpers.dart b/pkgs/native_toolchain_c/test/helpers.dart
@@ -8,11 +8,11 @@ import 'dart:io';
 
 import 'package:code_assets/code_assets.dart';
 import 'package:logging/logging.dart';
+import 'package:native_test_helpers/native_test_helpers.dart';
 import 'package:native_toolchain_c/src/native_toolchain/apple_clang.dart';
 import 'package:native_toolchain_c/src/native_toolchain/msvc.dart';
 import 'package:native_toolchain_c/src/utils/run_process.dart';
 import 'package:test/test.dart';
-import 'package:test_helpers/test_helpers.dart';
 
 /// Returns a suffix for a test that is parameterized.
 ///
diff --git a/pkgs/objective_c/pubspec.yaml b/pkgs/objective_c/pubspec.yaml
@@ -31,10 +31,10 @@ dev_dependencies:
   flutter_lints: ^5.0.0
   flutter_test:
     sdk: flutter
+  native_test_helpers:
+    path: ../native_test_helpers/
   path: ^1.9.0
   test: ^1.21.1
-  test_helpers:
-    path: ../test_helpers/
   yaml: ^3.1.0
 
 dependency_overrides:
diff --git a/pkgs/objective_c/test/util.dart b/pkgs/objective_c/test/util.dart
@@ -7,12 +7,12 @@
 import 'dart:ffi';
 
 import 'package:ffi/ffi.dart';
+import 'package:native_test_helpers/native_test_helpers.dart';
 import 'package:objective_c/objective_c.dart';
 import 'package:objective_c/src/internal.dart'
     as internal_for_testing
     show isValidClass;
 import 'package:path/path.dart' as p;
-import 'package:test_helpers/test_helpers.dart';
 
 final _executeInternalCommand = () {
   try {
diff --git a/pkgs/swift2objc/pubspec.yaml b/pkgs/swift2objc/pubspec.yaml
@@ -26,6 +26,6 @@ environment:
 dev_dependencies:
   args: ^2.6.0
   dart_flutter_team_lints: ^3.5.1
+  native_test_helpers:
+    path: ../native_test_helpers
   test: ^1.21.1
-  test_helpers:
-    path: ../test_helpers
diff --git a/pkgs/swift2objc/test/utils.dart b/pkgs/swift2objc/test/utils.dart
@@ -2,9 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import 'package:native_test_helpers/native_test_helpers.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
-import 'package:test_helpers/test_helpers.dart';
 
 final _whitespace = RegExp(r'\s+');
 
diff --git a/pkgs/swiftgen/pubspec.yaml b/pkgs/swiftgen/pubspec.yaml
@@ -27,9 +27,9 @@ dependencies:
 
 dev_dependencies:
   dart_flutter_team_lints: ^3.5.1
+  native_test_helpers:
+    path: ../native_test_helpers
   test: ^1.21.1
-  test_helpers:
-    path: ../test_helpers
 
 dependency_overrides:
   ffigen:
diff --git a/pkgs/swiftgen/test/integration/util.dart b/pkgs/swiftgen/test/integration/util.dart
@@ -5,11 +5,11 @@
 import 'dart:io';
 
 import 'package:ffigen/ffigen.dart' as fg;
+import 'package:native_test_helpers/native_test_helpers.dart';
 import 'package:path/path.dart' as path;
 import 'package:swiftgen/src/util.dart';
 import 'package:swiftgen/swiftgen.dart';
 import 'package:test/test.dart';
-import 'package:test_helpers/test_helpers.dart';
 
 String pkgDir = findPackageRoot('swiftgen').toFilePath();
 
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -57,9 +57,9 @@ workspace:
   - pkgs/hooks/example/link/app_with_asset_treeshaking
   - pkgs/hooks/example/link/package_with_assets
   - pkgs/json_syntax_generator
+  - pkgs/native_test_helpers
   - pkgs/native_toolchain_c
   - pkgs/repo_lint_rules
-  - pkgs/test_helpers
 
 # Hook user-defines are specified in the pub workspace.
 hooks:
