dart-lang · dcharkes · Jan 17, 2024 · Jan 17, 2024 · Jan 17, 2024 · Jan 17, 2024
diff --git a/.github/workflows/native.yaml b/.github/workflows/native.yaml
@@ -70,22 +70,22 @@ jobs:
 
       - run: dart pub get
 
-      - run: dart pub get -C test/data/dart_app/
+      - run: dart pub get -C test_data/dart_app/
         if: ${{ matrix.package == 'native_assets_builder' }}
 
-      - run: dart pub get -C test/data/native_add/
+      - run: dart pub get -C test_data/native_add/
         if: ${{ matrix.package == 'native_assets_builder' }}
 
-      - run: dart pub get -C test/data/native_add_add_source/
+      - run: dart pub get -C test_data/native_add_add_source/
         if: ${{ matrix.package == 'native_assets_builder' }}
 
-      - run: dart pub get -C test/data/native_subtract/
+      - run: dart pub get -C test_data/native_subtract/
         if: ${{ matrix.package == 'native_assets_builder' }}
 
-      - run: dart pub get -C test/data/package_reading_metadata/
+      - run: dart pub get -C test_data/package_reading_metadata/
         if: ${{ matrix.package == 'native_assets_builder' }}
 
-      - run: dart pub get -C test/data/package_with_metadata/
+      - run: dart pub get -C test_data/package_with_metadata/
         if: ${{ matrix.package == 'native_assets_builder' }}
 
       - run: dart pub get -C example/native_add_app/

diff --git a/pkgs/native_assets_builder/CHANGELOG.md b/pkgs/native_assets_builder/CHANGELOG.md
@@ -3,6 +3,7 @@
 - Add support for `runPackageName` to avoid native assets for packages that
   the root package depends on but the package being run doesn't.
 - Bump `package:native_assets_cli` to 0.4.1.
+- Moved test projects from `test/data/` to `test_data/`.
 
 ## 0.3.0
 

diff --git a/pkgs/native_assets_builder/test/data/dart_app/pubspec_overrides.yaml b/pkgs/native_assets_builder/test/data/dart_app/pubspec_overrides.yaml
diff --git a/pkgs/native_assets_builder/test/data/native_add/pubspec_overrides.yaml b/pkgs/native_assets_builder/test/data/native_add/pubspec_overrides.yaml
diff --git a/pkgs/native_assets_builder/test/data/native_add_add_source/pubspec_overrides.yaml b/pkgs/native_assets_builder/test/data/native_add_add_source/pubspec_overrides.yaml
diff --git a/pkgs/native_assets_builder/test/data/native_subtract/pubspec_overrides.yaml b/pkgs/native_assets_builder/test/data/native_subtract/pubspec_overrides.yaml
diff --git a/pkgs/native_assets_builder/test/data/some_dev_dep/pubspec_overrides.yaml b/pkgs/native_assets_builder/test/data/some_dev_dep/pubspec_overrides.yaml
diff --git a/pkgs/native_assets_builder/test/data/wrong_build_output/pubspec_overrides.yaml b/pkgs/native_assets_builder/test/data/wrong_build_output/pubspec_overrides.yaml
diff --git a/pkgs/native_assets_builder/test/data/wrong_build_output_2/pubspec_overrides.yaml b/pkgs/native_assets_builder/test/data/wrong_build_output_2/pubspec_overrides.yaml
diff --git a/pkgs/native_assets_builder/test/data/wrong_build_output_3/pubspec_overrides.yaml b/pkgs/native_assets_builder/test/data/wrong_build_output_3/pubspec_overrides.yaml
diff --git a/pkgs/native_assets_builder/test/data/wrong_namespace_asset/pubspec_overrides.yaml b/pkgs/native_assets_builder/test/data/wrong_namespace_asset/pubspec_overrides.yaml
diff --git a/pkgs/native_assets_builder/test/helpers.dart b/pkgs/native_assets_builder/test/helpers.dart
@@ -104,7 +104,7 @@ Uri findPackageRoot(String packageName) {
 
 final pkgNativeAssetsBuilderUri = findPackageRoot('native_assets_builder');
 
-final testDataUri = pkgNativeAssetsBuilderUri.resolve('test/data/');
+final testDataUri = pkgNativeAssetsBuilderUri.resolve('test_data/');
 
 extension on Uri {
   String get name => pathSegments.where((e) => e != '').last;
@@ -153,7 +153,7 @@ Future<void> copyTestProjects({
     final targetFileUri = targetUri.resolveUri(pathToModify);
     final sourceString = await sourceFile.readAsString();
     final modifiedString = sourceString.replaceAll(
-      'path: ../../../',
+      'path: ../../',
       'path: ${pkgNativeAssetsBuilderUri.toFilePath().replaceAll('\\', '/')}',
     );
     await File.fromUri(targetFileUri)

diff --git a/...native_assets_builder/test/data/README.md → ...native_assets_builder/test_data/README.md b/...native_assets_builder/test/data/README.md → ...native_assets_builder/test_data/README.md
diff --git a/...der/test/data/cyclic_package_1/build.dart → ...der/test_data/cyclic_package_1/build.dart b/...der/test/data/cyclic_package_1/build.dart → ...der/test_data/cyclic_package_1/build.dart
diff --git a/...r/test/data/cyclic_package_1/pubspec.yaml → ...r/test_data/cyclic_package_1/pubspec.yaml b/...r/test/data/cyclic_package_1/pubspec.yaml → ...r/test_data/cyclic_package_1/pubspec.yaml
diff --git a/...a/cyclic_package_1/pubspec_overrides.yaml → ...a/cyclic_package_1/pubspec_overrides.yaml b/...a/cyclic_package_1/pubspec_overrides.yaml → ...a/cyclic_package_1/pubspec_overrides.yaml
@@ -1,3 +1,3 @@
 dependency_overrides:
   native_assets_cli:
-    path: ../../../../native_assets_cli/
+    path: ../../../native_assets_cli/
diff --git a/...der/test/data/cyclic_package_2/build.dart → ...der/test_data/cyclic_package_2/build.dart b/...der/test/data/cyclic_package_2/build.dart → ...der/test_data/cyclic_package_2/build.dart
diff --git a/...r/test/data/cyclic_package_2/pubspec.yaml → ...r/test_data/cyclic_package_2/pubspec.yaml b/...r/test/data/cyclic_package_2/pubspec.yaml → ...r/test_data/cyclic_package_2/pubspec.yaml
diff --git a/...a/cyclic_package_2/pubspec_overrides.yaml → ...a/cyclic_package_2/pubspec_overrides.yaml b/...a/cyclic_package_2/pubspec_overrides.yaml → ...a/cyclic_package_2/pubspec_overrides.yaml
@@ -1,3 +1,3 @@
 dependency_overrides:
   native_assets_cli:
-    path: ../../../../native_assets_cli/
+    path: ../../../native_assets_cli/
diff --git a/...ets_builder/test/data/dart_app/.gitignore → ...ets_builder/test_data/dart_app/.gitignore b/...ets_builder/test/data/dart_app/.gitignore → ...ets_builder/test_data/dart_app/.gitignore
diff --git a/...lder/test/data/dart_app/bin/dart_app.dart → ...lder/test_data/dart_app/bin/dart_app.dart b/...lder/test/data/dart_app/bin/dart_app.dart → ...lder/test_data/dart_app/bin/dart_app.dart
diff --git a/...s_builder/test/data/dart_app/pubspec.yaml → ...s_builder/test_data/dart_app/pubspec.yaml b/...s_builder/test/data/dart_app/pubspec.yaml → ...s_builder/test_data/dart_app/pubspec.yaml
diff --git a/pkgs/native_assets_builder/test_data/dart_app/pubspec_overrides.yaml b/pkgs/native_assets_builder/test_data/dart_app/pubspec_overrides.yaml
@@ -0,0 +1,5 @@
+dependency_overrides:
+  native_assets_cli:
+    path: ../../../native_assets_cli/
+  native_toolchain_c:
+    path: ../../../native_toolchain_c/
diff --git a/...ve_assets_builder/test/data/manifest.yaml → ...ve_assets_builder/test_data/manifest.yaml b/...ve_assets_builder/test/data/manifest.yaml → ...ve_assets_builder/test_data/manifest.yaml
diff --git a/...s_builder/test/data/native_add/build.dart → ...s_builder/test_data/native_add/build.dart b/...s_builder/test/data/native_add/build.dart → ...s_builder/test_data/native_add/build.dart
diff --git a/..._builder/test/data/native_add/ffigen.yaml → ..._builder/test_data/native_add/ffigen.yaml b/..._builder/test/data/native_add/ffigen.yaml → ..._builder/test_data/native_add/ffigen.yaml
diff --git a/.../test/data/native_add/lib/native_add.dart → .../test_data/native_add/lib/native_add.dart b/.../test/data/native_add/lib/native_add.dart → .../test_data/native_add/lib/native_add.dart
diff --git a/...t/data/native_add/lib/src/native_add.dart → ...t_data/native_add/lib/src/native_add.dart b/...t/data/native_add/lib/src/native_add.dart → ...t_data/native_add/lib/src/native_add.dart
diff --git a/...ib/src/native_add_bindings_generated.dart → ...ib/src/native_add_bindings_generated.dart b/...ib/src/native_add_bindings_generated.dart → ...ib/src/native_add_bindings_generated.dart
diff --git a/...uilder/test/data/native_add/manifest.yaml → ...uilder/test_data/native_add/manifest.yaml b/...uilder/test/data/native_add/manifest.yaml → ...uilder/test_data/native_add/manifest.yaml
diff --git a/...builder/test/data/native_add/pubspec.yaml → ...builder/test_data/native_add/pubspec.yaml b/...builder/test/data/native_add/pubspec.yaml → ...builder/test_data/native_add/pubspec.yaml
diff --git a/pkgs/native_assets_builder/test_data/native_add/pubspec_overrides.yaml b/pkgs/native_assets_builder/test_data/native_add/pubspec_overrides.yaml
@@ -0,0 +1,5 @@
+dependency_overrides:
+  native_assets_cli:
+    path: ../../../native_assets_cli/
+  native_toolchain_c:
+    path: ../../../native_toolchain_c/
diff --git a/...der/test/data/native_add/src/native_add.c → ...der/test_data/native_add/src/native_add.c b/...der/test/data/native_add/src/native_add.c → ...der/test_data/native_add/src/native_add.c
diff --git a/...der/test/data/native_add/src/native_add.h → ...der/test_data/native_add/src/native_add.h b/...der/test/data/native_add/src/native_add.h → ...der/test_data/native_add/src/native_add.h
diff --git a/...data/native_add/test/native_add_test.dart → ...data/native_add/test/native_add_test.dart b/...data/native_add/test/native_add_test.dart → ...data/native_add/test/native_add_test.dart
diff --git a/...test/data/native_add_add_source/README.md → ...test_data/native_add_add_source/README.md b/...test/data/native_add_add_source/README.md → ...test_data/native_add_add_source/README.md
diff --git a/...est/data/native_add_add_source/build.dart → ...est_data/native_add_add_source/build.dart b/...est/data/native_add_add_source/build.dart → ...est_data/native_add_add_source/build.dart
diff --git a/.../data/native_add_add_source/manifest.yaml → ..._data/native_add_add_source/manifest.yaml b/.../data/native_add_add_source/manifest.yaml → ..._data/native_add_add_source/manifest.yaml
diff --git a/...t/data/native_add_add_source/pubspec.yaml → ...t_data/native_add_add_source/pubspec.yaml b/...t/data/native_add_add_source/pubspec.yaml → ...t_data/native_add_add_source/pubspec.yaml
diff --git a/pkgs/native_assets_builder/test_data/native_add_add_source/pubspec_overrides.yaml b/pkgs/native_assets_builder/test_data/native_add_add_source/pubspec_overrides.yaml
@@ -0,0 +1,5 @@
+dependency_overrides:
+  native_assets_cli:
+    path: ../../../native_assets_cli/
+  native_toolchain_c:
+    path: ../../../native_toolchain_c/
diff --git a/...tive_add_add_source/src/native_multiply.c → ...tive_add_add_source/src/native_multiply.c b/...tive_add_add_source/src/native_multiply.c → ...tive_add_add_source/src/native_multiply.c
diff --git a/...tive_add_add_source/src/native_multiply.h → ...tive_add_add_source/src/native_multiply.h b/...tive_add_add_source/src/native_multiply.h → ...tive_add_add_source/src/native_multiply.h
diff --git a/...test/data/native_add_add_symbol/README.md → ...test_data/native_add_add_symbol/README.md b/...test/data/native_add_add_symbol/README.md → ...test_data/native_add_add_symbol/README.md
diff --git a/.../data/native_add_add_symbol/manifest.yaml → ..._data/native_add_add_symbol/manifest.yaml b/.../data/native_add_add_symbol/manifest.yaml → ..._data/native_add_add_symbol/manifest.yaml
diff --git a/...ta/native_add_add_symbol/src/native_add.c → ...ta/native_add_add_symbol/src/native_add.c b/...ta/native_add_add_symbol/src/native_add.c → ...ta/native_add_add_symbol/src/native_add.c
diff --git a/...ta/native_add_add_symbol/src/native_add.h → ...ta/native_add_add_symbol/src/native_add.h b/...ta/native_add_add_symbol/src/native_add.h → ...ta/native_add_add_symbol/src/native_add.h
diff --git a/...est/data/native_add_break_build/README.md → ...est_data/native_add_break_build/README.md b/...est/data/native_add_break_build/README.md → ...est_data/native_add_break_build/README.md
diff --git a/...data/native_add_break_build/manifest.yaml → ...data/native_add_break_build/manifest.yaml b/...data/native_add_break_build/manifest.yaml → ...data/native_add_break_build/manifest.yaml
diff --git a/...a/native_add_break_build/src/native_add.c → ...a/native_add_break_build/src/native_add.c b/...a/native_add_break_build/src/native_add.c → ...a/native_add_break_build/src/native_add.c
diff --git a/.../test/data/native_add_fix_build/README.md → .../test_data/native_add_fix_build/README.md b/.../test/data/native_add_fix_build/README.md → .../test_data/native_add_fix_build/README.md
diff --git a/...t/data/native_add_fix_build/manifest.yaml → ...t_data/native_add_fix_build/manifest.yaml b/...t/data/native_add_fix_build/manifest.yaml → ...t_data/native_add_fix_build/manifest.yaml
diff --git a/...ata/native_add_fix_build/src/native_add.c → ...ata/native_add_fix_build/src/native_add.c b/...ata/native_add_fix_build/src/native_add.c → ...ata/native_add_fix_build/src/native_add.c
diff --git a/...lder/test/data/native_subtract/build.dart → ...lder/test_data/native_subtract/build.dart b/...lder/test/data/native_subtract/build.dart → ...lder/test_data/native_subtract/build.dart
diff --git a/...der/test/data/native_subtract/ffigen.yaml → ...der/test_data/native_subtract/ffigen.yaml b/...der/test/data/native_subtract/ffigen.yaml → ...der/test_data/native_subtract/ffigen.yaml
diff --git a/.../native_subtract/lib/native_subtract.dart → .../native_subtract/lib/native_subtract.dart b/.../native_subtract/lib/native_subtract.dart → .../native_subtract/lib/native_subtract.dart
diff --git a/...ive_subtract/lib/src/native_subtract.dart → ...ive_subtract/lib/src/native_subtract.dart b/...ive_subtract/lib/src/native_subtract.dart → ...ive_subtract/lib/src/native_subtract.dart
diff --git a/...c/native_subtract_bindings_generated.dart → ...c/native_subtract_bindings_generated.dart b/...c/native_subtract_bindings_generated.dart → ...c/native_subtract_bindings_generated.dart
diff --git a/...er/test/data/native_subtract/pubspec.yaml → ...er/test_data/native_subtract/pubspec.yaml b/...er/test/data/native_subtract/pubspec.yaml → ...er/test_data/native_subtract/pubspec.yaml
diff --git a/pkgs/native_assets_builder/test_data/native_subtract/pubspec_overrides.yaml b/pkgs/native_assets_builder/test_data/native_subtract/pubspec_overrides.yaml
@@ -0,0 +1,5 @@
+dependency_overrides:
+  native_assets_cli:
+    path: ../../../native_assets_cli/
+  native_toolchain_c:
+    path: ../../../native_toolchain_c/
diff --git a/...ata/native_subtract/src/native_subtract.c → ...ata/native_subtract/src/native_subtract.c b/...ata/native_subtract/src/native_subtract.c → ...ata/native_subtract/src/native_subtract.c
diff --git a/...ata/native_subtract/src/native_subtract.h → ...ata/native_subtract/src/native_subtract.h b/...ata/native_subtract/src/native_subtract.h → ...ata/native_subtract/src/native_subtract.h
diff --git a/.../data/package_reading_metadata/build.dart → ..._data/package_reading_metadata/build.dart b/.../data/package_reading_metadata/build.dart → ..._data/package_reading_metadata/build.dart
diff --git a/...ata/package_reading_metadata/pubspec.yaml → ...ata/package_reading_metadata/pubspec.yaml b/...ata/package_reading_metadata/pubspec.yaml → ...ata/package_reading_metadata/pubspec.yaml
diff --git a/...e_reading_metadata/pubspec_overrides.yaml → ...e_reading_metadata/pubspec_overrides.yaml b/...e_reading_metadata/pubspec_overrides.yaml → ...e_reading_metadata/pubspec_overrides.yaml
@@ -1,3 +1,3 @@
 dependency_overrides:
   native_assets_cli:
-    path: ../../../../native_assets_cli/
+    path: ../../../native_assets_cli/
diff --git a/...est/data/package_with_metadata/build.dart → ...est_data/package_with_metadata/build.dart b/...est/data/package_with_metadata/build.dart → ...est_data/package_with_metadata/build.dart
diff --git a/...t/data/package_with_metadata/pubspec.yaml → ...t_data/package_with_metadata/pubspec.yaml b/...t/data/package_with_metadata/pubspec.yaml → ...t_data/package_with_metadata/pubspec.yaml
diff --git a/...kage_with_metadata/pubspec_overrides.yaml → ...kage_with_metadata/pubspec_overrides.yaml b/...kage_with_metadata/pubspec_overrides.yaml → ...kage_with_metadata/pubspec_overrides.yaml
@@ -1,3 +1,3 @@
 dependency_overrides:
   native_assets_cli:
-    path: ../../../../native_assets_cli/
+    path: ../../../native_assets_cli/
diff --git a/...t/data/some_dev_dep/bin/some_dev_dep.dart → ...t_data/some_dev_dep/bin/some_dev_dep.dart b/...t/data/some_dev_dep/bin/some_dev_dep.dart → ...t_data/some_dev_dep/bin/some_dev_dep.dart
diff --git a/...ilder/test/data/some_dev_dep/pubspec.yaml → ...ilder/test_data/some_dev_dep/pubspec.yaml b/...ilder/test/data/some_dev_dep/pubspec.yaml → ...ilder/test_data/some_dev_dep/pubspec.yaml
diff --git a/pkgs/native_assets_builder/test_data/some_dev_dep/pubspec_overrides.yaml b/pkgs/native_assets_builder/test_data/some_dev_dep/pubspec_overrides.yaml
@@ -0,0 +1,3 @@
+dependency_overrides:
+  native_assets_cli:
+    path: ../../../native_assets_cli/
diff --git a/...r/test/data/wrong_build_output/build.dart → ...r/test_data/wrong_build_output/build.dart b/...r/test/data/wrong_build_output/build.dart → ...r/test_data/wrong_build_output/build.dart
diff --git a/...test/data/wrong_build_output/pubspec.yaml → ...test_data/wrong_build_output/pubspec.yaml b/...test/data/wrong_build_output/pubspec.yaml → ...test_data/wrong_build_output/pubspec.yaml
diff --git a/pkgs/native_assets_builder/test_data/wrong_build_output/pubspec_overrides.yaml b/pkgs/native_assets_builder/test_data/wrong_build_output/pubspec_overrides.yaml
@@ -0,0 +1,3 @@
+dependency_overrides:
+  native_assets_cli:
+    path: ../../../native_assets_cli/
diff --git a/...test/data/wrong_build_output_2/build.dart → ...test_data/wrong_build_output_2/build.dart b/...test/data/wrong_build_output_2/build.dart → ...test_data/wrong_build_output_2/build.dart
diff --git a/...st/data/wrong_build_output_2/pubspec.yaml → ...st_data/wrong_build_output_2/pubspec.yaml b/...st/data/wrong_build_output_2/pubspec.yaml → ...st_data/wrong_build_output_2/pubspec.yaml
diff --git a/pkgs/native_assets_builder/test_data/wrong_build_output_2/pubspec_overrides.yaml b/pkgs/native_assets_builder/test_data/wrong_build_output_2/pubspec_overrides.yaml
@@ -0,0 +1,3 @@
+dependency_overrides:
+  native_assets_cli:
+    path: ../../../native_assets_cli/
diff --git a/...test/data/wrong_build_output_3/build.dart → ...test_data/wrong_build_output_3/build.dart b/...test/data/wrong_build_output_3/build.dart → ...test_data/wrong_build_output_3/build.dart
diff --git a/...st/data/wrong_build_output_3/pubspec.yaml → ...st_data/wrong_build_output_3/pubspec.yaml b/...st/data/wrong_build_output_3/pubspec.yaml → ...st_data/wrong_build_output_3/pubspec.yaml
diff --git a/pkgs/native_assets_builder/test_data/wrong_build_output_3/pubspec_overrides.yaml b/pkgs/native_assets_builder/test_data/wrong_build_output_3/pubspec_overrides.yaml
@@ -0,0 +1,3 @@
+dependency_overrides:
+  native_assets_cli:
+    path: ../../../native_assets_cli/
diff --git a/...est/data/wrong_namespace_asset/build.dart → ...est_data/wrong_namespace_asset/build.dart b/...est/data/wrong_namespace_asset/build.dart → ...est_data/wrong_namespace_asset/build.dart
diff --git a/...t/data/wrong_namespace_asset/pubspec.yaml → ...t_data/wrong_namespace_asset/pubspec.yaml b/...t/data/wrong_namespace_asset/pubspec.yaml → ...t_data/wrong_namespace_asset/pubspec.yaml
diff --git a/pkgs/native_assets_builder/test_data/wrong_namespace_asset/pubspec_overrides.yaml b/pkgs/native_assets_builder/test_data/wrong_namespace_asset/pubspec_overrides.yaml
@@ -0,0 +1,3 @@
+dependency_overrides:
+  native_assets_cli:
+    path: ../../../native_assets_cli/