From 1c00269e5d5e3e13bbd0888e41f3c247eb570881 Mon Sep 17 00:00:00 2001 From: Elijah Quartey Date: Tue, 16 Jul 2024 14:07:23 -0500 Subject: [PATCH] small refactor to configure method --- .../graphql/api_key_test.dart | 8 ++---- .../integration_test/graphql/iam_test.dart | 9 ++----- .../graphql/user_pools_test.dart | 9 +++---- .../example/integration_test/main_test.dart | 22 ++++++++++------ .../example/integration_test/rest_test.dart | 2 +- .../example/integration_test/util.dart | 26 +++++-------------- 6 files changed, 29 insertions(+), 47 deletions(-) diff --git a/packages/api/amplify_api/example/integration_test/graphql/api_key_test.dart b/packages/api/amplify_api/example/integration_test/graphql/api_key_test.dart index 9e6181b40f..4bc0cdb532 100644 --- a/packages/api/amplify_api/example/integration_test/graphql/api_key_test.dart +++ b/packages/api/amplify_api/example/integration_test/graphql/api_key_test.dart @@ -10,18 +10,14 @@ import 'package:integration_test/integration_test.dart'; import '../util.dart'; -void main({bool useExistingTestUser = false, bool useGen2 = false}) { +void main({bool useExistingTestUser = false, bool useGen1 = false}) { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); group( 'GraphQL API key', () { setUpAll(() async { - if (useGen2) { - await configureAmplifyGen2(); - } else { - await configureAmplify(); - } + await configureAmplify(useGen1: useGen1); await signOutTestUser(); }); diff --git a/packages/api/amplify_api/example/integration_test/graphql/iam_test.dart b/packages/api/amplify_api/example/integration_test/graphql/iam_test.dart index 40cb58766d..55918568cb 100644 --- a/packages/api/amplify_api/example/integration_test/graphql/iam_test.dart +++ b/packages/api/amplify_api/example/integration_test/graphql/iam_test.dart @@ -23,16 +23,12 @@ const _limit = 10000; const _max = 10000; -void main({bool useExistingTestUser = false, bool useGen2 = false}) { +void main({bool useExistingTestUser = false, bool useGen1 = false}) { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); group('GraphQL IAM', () { setUpAll(() async { - if (useGen2) { - await configureAmplifyGen2(); - } else { - await configureAmplify(); - } + await configureAmplify(useGen1: useGen1); if (!useExistingTestUser) { await signUpTestUser(); @@ -361,7 +357,6 @@ void main({bool useExistingTestUser = false, bool useGen2 = false}) { testWidgets( 'should GET a child and include parent with complex identifier and custom primary key', (WidgetTester tester) async { - // TODO(equartey): remove when test is reliably skipped const name = 'Integration Test CpkParent to fetch w child'; const explicitChildName = 'Explicit child name fetch test'; const implicitChildName = 'Implicit child name fetch test'; diff --git a/packages/api/amplify_api/example/integration_test/graphql/user_pools_test.dart b/packages/api/amplify_api/example/integration_test/graphql/user_pools_test.dart index c0ce762c0c..83d2a95b8c 100644 --- a/packages/api/amplify_api/example/integration_test/graphql/user_pools_test.dart +++ b/packages/api/amplify_api/example/integration_test/graphql/user_pools_test.dart @@ -9,16 +9,13 @@ import 'package:integration_test/integration_test.dart'; import '../util.dart'; -void main({bool useExistingTestUser = false, bool useGen2 = false}) { +void main({bool useExistingTestUser = false, bool useGen1 = false}) { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); group('GraphQL Cognito User Pools', () { setUpAll(() async { - if (useGen2) { - await configureAmplifyGen2(); - } else { - await configureAmplify(); - } + await configureAmplify(useGen1: useGen1); + if (!useExistingTestUser) { await signUpTestUser(); } diff --git a/packages/api/amplify_api/example/integration_test/main_test.dart b/packages/api/amplify_api/example/integration_test/main_test.dart index 17c98ac2cc..41975a1999 100644 --- a/packages/api/amplify_api/example/integration_test/main_test.dart +++ b/packages/api/amplify_api/example/integration_test/main_test.dart @@ -16,7 +16,7 @@ void main() async { group('amplify_api gen 1 config', () { setUpAll(() async { - await configureAmplify(); + await configureAmplify(useGen1: true); await signUpTestUser(); await signInTestUser(); }); @@ -26,14 +26,23 @@ void main() async { await Amplify.reset(); }); - graph_api_key_test.main(useExistingTestUser: true); - graph_iam_test.main(useExistingTestUser: true); - graph_user_pools_test.main(useExistingTestUser: true); + graph_api_key_test.main( + useExistingTestUser: true, + useGen1: true, + ); + graph_iam_test.main( + useExistingTestUser: true, + useGen1: true, + ); + graph_user_pools_test.main( + useExistingTestUser: true, + useGen1: true, + ); }); group('amplify_api gen 2 config', () { setUpAll(() async { - await configureAmplifyGen2(); + await configureAmplify(); await signUpTestUser(); await signInTestUser(); }); @@ -45,15 +54,12 @@ void main() async { graph_api_key_test.main( useExistingTestUser: true, - useGen2: true, ); graph_iam_test.main( useExistingTestUser: true, - useGen2: true, ); graph_user_pools_test.main( useExistingTestUser: true, - useGen2: true, ); rest_test.main(useExistingTestUser: true); diff --git a/packages/api/amplify_api/example/integration_test/rest_test.dart b/packages/api/amplify_api/example/integration_test/rest_test.dart index 293abd2a8c..fd9295734e 100644 --- a/packages/api/amplify_api/example/integration_test/rest_test.dart +++ b/packages/api/amplify_api/example/integration_test/rest_test.dart @@ -21,7 +21,7 @@ void main({bool useExistingTestUser = false}) { group('REST', () { setUpAll(() async { - await configureAmplifyGen2(); + await configureAmplify(); if (!useExistingTestUser) { await signUpTestUser(); diff --git a/packages/api/amplify_api/example/integration_test/util.dart b/packages/api/amplify_api/example/integration_test/util.dart index 9fef083465..6690dabcf9 100644 --- a/packages/api/amplify_api/example/integration_test/util.dart +++ b/packages/api/amplify_api/example/integration_test/util.dart @@ -75,23 +75,7 @@ class TestUser { } } -Future configureAmplify() async { - if (!Amplify.isConfigured) { - await Amplify.addPlugins([ - AmplifyAuthCognito( - secureStorageFactory: AmplifySecureStorage.factoryFrom( - macOSOptions: MacOSSecureStorageOptions(useDataProtection: false), - ), - ), - AmplifyAPI( - options: APIPluginOptions(modelProvider: ModelProvider.instance), - ), - ]); - await Amplify.configure(gen1.amplifyConfig); - } -} - -Future configureAmplifyGen2() async { +Future configureAmplify({bool useGen1 = false}) async { if (!Amplify.isConfigured) { await Amplify.addPlugins([ AmplifyAuthCognito( @@ -105,8 +89,12 @@ Future configureAmplifyGen2() async { ), ), ]); - final config = _addRestConfig(gen2.amplifyConfig); - await Amplify.configure(config); + if (useGen1) { + await Amplify.configure(gen1.amplifyConfig); + } else { + final config = _addRestConfig(gen2.amplifyConfig); + await Amplify.configure(config); + } } }