chore(datastore): enable cloud sync in integration tests

- Add reusable util for testing cloud sync opeartion - Make integration tests configurable with - `--device-id` or `-d` to specify running device ID - `--enable-cloud-sync` or `-ec` to enable cloud sync in tests
aws-amplify · Mar 25, 2022 · 65f5b0f · 65f5b0f
1 parent bb46993
commit 65f5b0f
Show file tree

Hide file tree

Showing 39 changed files with 2,169 additions and 1,330 deletions.
diff --git a/build-support/integ_test_android.sh b/build-support/integ_test_android.sh
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+if [ ! -d android ]; then
+    echo "No Android project to test" >&2
+    exit
+fi
+
+DEFAULT_DEVICE_ID="sdk"
+DEFAULT_ENABLE_CLOUD_SYNC="true"
+
+while [ $# -gt 0 ]; do
+    case "$1" in
+        -d|--device-id)
+            deviceId="$2"
+            ;;
+        -ec|--enable-cloud-sync)
+            case "$2" in
+                true|false)
+                    enableCloudSync="$2"
+                ;;
+                *)
+                    echo "Invalid value for $1"
+                    exit 1
+            esac
+            ;;
+        *)
+            echo "Invalid arguments"
+            exit 1
+    esac
+    shift
+    shift
+done
+
+deviceId=${deviceId:-$DEFAULT_DEVICE_ID}
+enableCloudSync=${enableCloudSync:-$DEFAULT_ENABLE_CLOUD_SYNC}
+
+declare -a testsList
+declare -a resultsList
+
+TARGET=integration_test/main_test.dart
+if [ ! -e $TARGET ]; then
+    echo "$TARGET file not found" >&2
+    exit
+fi
+
+testsList+=("$TARGET")
+if flutter test \
+    --no-pub \
+    -d $deviceId \
+    $TARGET; then
+    resultsList+=(0)
+else
+    resultsList+=(1)
+fi
+
+TEST_ENTRIES="integration_test/separate_integration_tests/*.dart"
+for ENTRY in $TEST_ENTRIES; do
+    if [ ! -f "${ENTRY}" ]; then
+        continue
+    fi
+    testsList+=("$ENTRY")
+    if [ $enableCloudSync == "true" ]; then
+        echo "Run $ENTRY WITH API Sync"
+    else
+        echo "Run $ENTRY WITHOUT API Sync"
+    fi
+
+    if flutter test \
+        --no-pub \
+        --dart-define ENABLE_CLOUD_SYNC=$enableCloudSync \
+        -d $deviceId \
+        $ENTRY; then
+        resultsList+=(0)
+    else
+        resultsList+=(1)
+    fi
+done
+
+testFailure=0
+for i in "${!testsList[@]}"; do
+    if [ "${resultsList[i]}" == 0 ]; then
+        echo "✅ ${testsList[i]}"
+    else
+        testFailure=1
+        echo "❌ ${testsList[i]}"
+    fi
+done
+
+exit $testFailure
diff --git a/build-support/integ_test_ios.sh b/build-support/integ_test_ios.sh
@@ -7,25 +7,99 @@ if [ ! -d ios ]; then
     exit
 fi
 
+DEFAULT_DEVICE_ID="iPhone"
+DEFAULT_ENABLE_CLOUD_SYNC="true"
+
+while [ $# -gt 0 ]; do
+    case "$1" in
+        -d|--device-id)
+            deviceId="$2"
+            ;;
+        -ec|--enable-cloud-sync)
+            case "$2" in
+                true|false)
+                    enableCloudSync="$2"
+                ;;
+                *)
+                    echo "Invalid value for $1"
+                    exit 1
+            esac
+            ;;
+        *)
+            echo "Invalid arguments"
+            exit 1
+    esac
+    shift
+    shift
+done
+
+deviceId=${deviceId:-$DEFAULT_DEVICE_ID}
+enableCloudSync=${enableCloudSync:-$DEFAULT_ENABLE_CLOUD_SYNC}
+
+declare -a testsList
+declare -a resultsList
+
 TARGET=integration_test/main_test.dart
 if [ ! -e $TARGET ]; then
     echo "$TARGET file not found" >&2
     exit
 fi
 
+
+
 # Use xcodebuild if 'RunnerTests' scheme exists, else `flutter test`
 if xcodebuild -workspace ios/Runner.xcworkspace -list -json | jq -e '.workspace.schemes | index("RunnerTests")' >/dev/null; then
     # Build app for testing
     flutter build ios --no-pub --config-only --simulator --target=$TARGET
-    
+
     xcodebuild \
         -workspace ios/Runner.xcworkspace \
         -scheme RunnerTests \
         -destination "platform=iOS Simulator,name=iPhone 12 Pro Max" \
         test
 else
-    flutter test \
+    testsList+=("$TARGET")
+    if flutter test \
         --no-pub \
-        -d iPhone \
-        $TARGET
+        -d $deviceId \
+        $TARGET; then
+        resultsList+=(0)
+    else
+        resultsList+=(1)
+    fi
 fi
+
+TEST_ENTRIES="integration_test/separate_integration_tests/*.dart"
+for ENTRY in $TEST_ENTRIES; do
+    if [ ! -f "${ENTRY}" ]; then
+        continue
+    fi
+    testsList+=("$ENTRY")
+    if [ $enableCloudSync == "true" ]; then
+        echo "Run $ENTRY WITH API Sync"
+    else
+        echo "Run $ENTRY WITHOUT API Sync"
+    fi
+
+    if flutter test \
+        --no-pub \
+        --dart-define ENABLE_CLOUD_SYNC=$enableCloudSync \
+        -d $deviceId \
+        $ENTRY; then
+        resultsList+=(0)
+    else
+        resultsList+=(1)
+    fi
+done
+
+testFailure=0
+for i in "${!testsList[@]}"; do
+    if [ "${resultsList[i]}" == 0 ]; then
+        echo "✅ ${testsList[i]}"
+    else
+        testFailure=1
+        echo "❌ ${testsList[i]}"
+    fi
+done
+
+exit $testFailure
diff --git a/melos.yaml b/melos.yaml
@@ -228,7 +228,7 @@ scripts:
       - Requires running Android and iOS simulators.
 
   test:integration:android:
-    run: melos exec -c 1 "flutter test --no-pub integration_test/main_test.dart -d sdk"
+    run: melos exec -c 1 -- "$MELOS_ROOT_PATH/build-support/integ_test_android.sh" $@
     description:
       Run integration tests for a single package on an Android emulator.
       - Run with `--no-select` to run for all applicable packages.
@@ -239,7 +239,7 @@ scripts:
       scope: "*example*"
 
   test:integration:ios:
-    run: melos exec -c 1 -- "$MELOS_ROOT_PATH/build-support/integ_test_ios.sh"
+    run: melos exec -c 1 -- "$MELOS_ROOT_PATH/build-support/integ_test_ios.sh" $@
     description: Run integration tests for a single package on an iOS simulator.
       - Run with `--no-select` to run for all applicable packages.
       - Requires launching an iOS simulator prior to execution.

diff --git a/packages/amplify_datastore/example/.gitignore b/packages/amplify_datastore/example/.gitignore
@@ -43,3 +43,24 @@ app.*.map.json
 
 # Exceptions to above rules.
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+
+#amplify-do-not-edit-begin
+amplify/\#current-cloud-backend
+amplify/.config/local-*
+amplify/logs
+amplify/mock-data
+amplify/backend/amplify-meta.json
+amplify/backend/.temp
+build/
+dist/
+node_modules/
+aws-exports.js
+awsconfiguration.json
+amplifyconfiguration.json
+amplifyconfiguration.dart
+amplify-build-config.json
+amplify-gradle-config.json
+amplifytools.xcconfig
+.secret-*
+**.sample
+#amplify-do-not-edit-end
diff --git a/packages/amplify_datastore/example/integration_test/main_test.dart b/packages/amplify_datastore/example/integration_test/main_test.dart
@@ -16,10 +16,8 @@
 import 'package:integration_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import 'save_test.dart' as save_tests;
 import 'query_test/query_test.dart' as query_test;
 import 'model_type_test.dart' as model_type_tests;
-import 'relationship_type_test.dart' as relationship_type_tests;
 import 'observe_test.dart' as observe_tests;
 import 'observe_query_test.dart' as observe_query_tests;
 import 'clear_test.dart' as clear_tests;
@@ -34,10 +32,8 @@ void main() async {
       await configureDataStore();
     });
 
-    save_tests.main();
     query_test.main();
     model_type_tests.main();
-    relationship_type_tests.main();
     observe_tests.main();
     observe_query_tests.main();
     clear_tests.main();

diff --git a/packages/amplify_datastore/example/integration_test/query_test/pagination_test.dart b/packages/amplify_datastore/example/integration_test/query_test/pagination_test.dart
@@ -13,8 +13,6 @@
  * permissions and limitations under the License.
  */
 
-import 'package:amplify_datastore/amplify_datastore.dart';
-
 import 'package:amplify_datastore_example/models/ModelProvider.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';

diff --git a/...ample/integration_test/query_test/query_predicate_test/aws_date_query_predicate_test.dart b/...ample/integration_test/query_test/query_predicate_test/aws_date_query_predicate_test.dart
@@ -13,7 +13,6 @@
  * permissions and limitations under the License.
  */
 
-import 'package:amplify_datastore/amplify_datastore.dart';
 import 'package:amplify_datastore_example/models/ModelProvider.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';

diff --git a/.../integration_test/query_test/query_predicate_test/aws_date_time_query_predicate_test.dart b/.../integration_test/query_test/query_predicate_test/aws_date_time_query_predicate_test.dart
@@ -13,7 +13,6 @@
  * permissions and limitations under the License.
  */
 
-import 'package:amplify_datastore/amplify_datastore.dart';
 import 'package:amplify_datastore_example/models/ModelProvider.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';

diff --git a/...ample/integration_test/query_test/query_predicate_test/aws_time_query_predicate_test.dart b/...ample/integration_test/query_test/query_predicate_test/aws_time_query_predicate_test.dart
@@ -13,7 +13,6 @@
  * permissions and limitations under the License.
  */
 
-import 'package:amplify_datastore/amplify_datastore.dart';
 import 'package:amplify_datastore_example/models/ModelProvider.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';

diff --git a/.../integration_test/query_test/query_predicate_test/aws_timestamp_query_predicate_test.dart b/.../integration_test/query_test/query_predicate_test/aws_timestamp_query_predicate_test.dart
@@ -13,7 +13,6 @@
  * permissions and limitations under the License.
  */
 
-import 'package:amplify_datastore/amplify_datastore.dart';
 import 'package:amplify_datastore_example/models/ModelProvider.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';

diff --git a/packages/amplify_datastore/example/integration_test/query_test/sort_order_test.dart b/packages/amplify_datastore/example/integration_test/query_test/sort_order_test.dart
@@ -15,7 +15,6 @@
 
 import 'dart:math';
 
-import 'package:amplify_datastore/amplify_datastore.dart';
 import 'package:amplify_datastore_example/models/ModelProvider.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';

diff --git a/...amplify_datastore/example/integration_test/query_test/standard_query_operations_test.dart b/...amplify_datastore/example/integration_test/query_test/standard_query_operations_test.dart
@@ -13,8 +13,6 @@
  * permissions and limitations under the License.
  */
 
-import 'package:amplify_datastore/amplify_datastore.dart';
-
 import 'package:amplify_datastore_example/models/ModelProvider.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';