Fix generator tests after rebase

realm · Feb 7, 2024 · 6ac22ab · 6ac22ab
1 parent 61d5983
commit 6ac22ab
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 34 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -369,7 +369,8 @@ jobs:
       BAAS_BAASAAS_API_KEY: ${{ secrets.BAASAAS_API_KEY}}
     defaults:
       run:
-        working-directory: packages/realm/tests  
+        shell: bash
+        working-directory: packages/realm/tests
 
     steps:
       - name: Checkout
@@ -469,6 +470,10 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu, macos, windows]
+    defaults:
+      run:
+        shell: bash
+        working-directory: packages/realm_generator
 
     runs-on: ${{ matrix.os }}-latest
     name: Generator Tests
@@ -484,9 +489,9 @@ jobs:
         with:
           channel: 'stable'
 
-      - name: Delete generated files
-        run: find . -name "*.realm.dart" -not -path "./generator/*" -delete
-        shell: bash
+      - name: Delete generated files in realm_dart
+        run: find . -name "*.realm.dart"
+        working-directory: packages/realm_dart
 
       - name: Run generator in realm_dart
         run: |
@@ -523,13 +528,11 @@ jobs:
             git --no-pager diff -w
             exit 1
           fi
-        shell: bash
 
       - name: Run generator tests
         run: |
           dart pub get
           dart test -r expanded --coverage ./coverage/ --test-randomize-ordering-seed random
-        working-directory: packages/realm_generator
 
       - name: Generate generator coverage report
         if: matrix.os == 'ubuntu'
@@ -541,7 +544,6 @@ jobs:
             --lcov \
             --packages .dart_tool/package_config.json \
             --report-on lib
-        working-directory: packages/realm_generator
 
       - name: Publish Generator Coverage
         if: matrix.os == 'ubuntu'

diff --git a/packages/realm_generator/test/error_test_data/invalid_model_name_mapping.dart b/packages/realm_generator/test/error_test_data/invalid_model_name_mapping.dart
diff --git a/packages/realm_generator/test/error_test_data/invalid_model_name_mapping.expected b/packages/realm_generator/test/error_test_data/invalid_model_name_mapping.expected
diff --git a/packages/realm_generator/test/error_test_data/invalid_model_name_mapping.realm.dart b/packages/realm_generator/test/error_test_data/invalid_model_name_mapping.realm.dart
diff --git a/packages/realm_generator/test/good_test_data/asymmetric_object.dart b/packages/realm_generator/test/good_test_data/asymmetric_object.dart
@@ -1,5 +1,7 @@
 import 'package:realm_common/realm_common.dart';
 
+part 'asymmetric_object.realm.dart';
+
 @RealmModel()
 class _Asymmetric {
   @PrimaryKey()

diff --git a/packages/realm_generator/test/good_test_data/asymmetric_object.expected b/packages/realm_generator/test/good_test_data/asymmetric_object.expected
@@ -1,3 +1,7 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'asymmetric_object.dart';
+
 // **************************************************************************
 // RealmObjectGenerator
 // **************************************************************************

diff --git a/packages/realm_generator/test/good_test_data/asymmetric_object.realm.dart b/packages/realm_generator/test/good_test_data/asymmetric_object.realm.dart
@@ -0,0 +1,2 @@
+// MOCK FILE!
+part of 'asymmetric_object.dart';
diff --git a/packages/realm_generator/test/good_test_data/binary_type.dart b/packages/realm_generator/test/good_test_data/binary_type.dart
@@ -2,6 +2,8 @@ import 'dart:typed_data';
 
 import 'package:realm_common/realm_common.dart';
 
+part 'binary_type.realm.dart';
+
 @RealmModel()
 class _Foo {
   late Uint8List requiredBinaryProp;

diff --git a/packages/realm_generator/test/good_test_data/binary_type.expected b/packages/realm_generator/test/good_test_data/binary_type.expected
@@ -1,3 +1,7 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'binary_type.dart';
+
 // **************************************************************************
 // RealmObjectGenerator
 // **************************************************************************

diff --git a/packages/realm_generator/test/good_test_data/binary_type.realm.dart b/packages/realm_generator/test/good_test_data/binary_type.realm.dart
@@ -0,0 +1,2 @@
+// MOCK FILE!
+part of 'binary_type.dart';