fixing up tests

aws-amplify · Oct 28, 2024 · 530140a · 530140a
1 parent ee0bac0
commit 530140a
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 19 deletions.
diff --git a/packages/storage/amplify_storage_s3/example/integration_test/download_data_test.dart b/packages/storage/amplify_storage_s3/example/integration_test/download_data_test.dart
@@ -136,18 +136,39 @@ void main() {
         testWidgets('multi bucket', (_) async {
           final mainBucket =
               StorageBucket.fromOutputs('Storage Integ Test main bucket');
+          final secondaryBucket = StorageBucket.fromOutputs(
+            'Storage Integ Test secondary bucket',
+          );
+          await Amplify.Storage.uploadData(
+            path: StoragePath.fromString(publicPath),
+            data: StorageDataPayload.bytes(bytesData),
+            bucket: secondaryBucket,
+          ).result;
 
-          // TODO(equartey): Add download check for secondary bucket when upload supports multibucket
           final downloadResult = await Amplify.Storage.downloadData(
-            path: StoragePath.fromIdentityId(
-              (identityId) => 'private/$identityId/$identityName',
-            ),
+            path: StoragePath.fromString(publicPath),
             options: StorageDownloadDataOptions(bucket: mainBucket),
           ).result;
-          expect(downloadResult.bytes, identityData);
+          expect(
+            downloadResult.bytes,
+            bytesData,
+          );
           expect(
             downloadResult.downloadedItem.path,
-            'private/$userIdentityId/$identityName',
+            publicPath,
+          );
+
+          final downloadSecondaryResult = await Amplify.Storage.downloadData(
+            path: StoragePath.fromString(publicPath),
+            options: StorageDownloadDataOptions(bucket: secondaryBucket),
+          ).result;
+          expect(
+            downloadSecondaryResult.bytes,
+            bytesData,
+          );
+          expect(
+            downloadSecondaryResult.downloadedItem.path,
+            publicPath,
           );
         });
       });

diff --git a/packages/storage/amplify_storage_s3/example/integration_test/upload_file_test.dart b/packages/storage/amplify_storage_s3/example/integration_test/upload_file_test.dart
@@ -230,19 +230,19 @@ void main() {
 
         testWidgets('uploads to multiple buckets', (_) async {
           final fileId = uuid();
-          final path =
-              StoragePath.fromString('public/multi-bucket-upload-file-$fileId');
+          final path = 'public/multi-bucket-upload-file-$fileId';
+          final storagePath = StoragePath.fromString(path);
           const content = 'upload file';
           final data = content.codeUnits;
           final filePath = await createFile(path: fileId, content: content);
           addTearDownMultiBucket(
-            path,
+            storagePath,
             [mainBucket, secondaryBucket],
           );
           //  main bucket
           final mainResult = await Amplify.Storage.uploadFile(
             localFile: AWSFile.fromPath(filePath),
-            path: path,
+            path: storagePath,
             options: StorageUploadFileOptions(
               pluginOptions: const S3UploadFilePluginOptions(
                 useAccelerateEndpoint: true,
@@ -253,7 +253,7 @@ void main() {
           expect(mainResult.uploadedItem.path, path);
 
           final downloadMainResult = await Amplify.Storage.downloadData(
-            path: path,
+            path: storagePath,
             options: StorageDownloadDataOptions(
               bucket: mainBucket,
             ),
@@ -263,7 +263,7 @@ void main() {
           // secondary bucket
           final secondaryResult = await Amplify.Storage.uploadFile(
             localFile: AWSFile.fromPath(filePath),
-            path: path,
+            path: storagePath,
             options: StorageUploadFileOptions(
               pluginOptions: const S3UploadFilePluginOptions(
                 useAccelerateEndpoint: true,
@@ -274,17 +274,24 @@ void main() {
           expect(secondaryResult.uploadedItem.path, path);
 
           final downloadSecondaryResult = await Amplify.Storage.downloadData(
-            path: path,
+            path: storagePath,
             options: StorageDownloadDataOptions(
               bucket: secondaryBucket,
             ),
           ).result;
           expect(downloadSecondaryResult.bytes, data);
 
           expect(
-            await objectExistsInBuckets(
-              path,
-              [mainBucket, secondaryBucket],
+            await objectExists(
+              storagePath,
+              bucket: mainBucket,
+            ),
+            true,
+          );
+          expect(
+            await objectExists(
+              storagePath,
+              bucket: secondaryBucket,
             ),
             true,
           );

diff --git a/packages/storage/amplify_storage_s3/example/integration_test/utils/tear_down.dart b/packages/storage/amplify_storage_s3/example/integration_test/utils/tear_down.dart
@@ -7,11 +7,14 @@ import 'package:flutter_test/flutter_test.dart';
 final _logger = AmplifyLogger().createChild('StorageTests');
 
 /// Adds a tear down to remove the object at [path].
-void addTearDownPath(StoragePath path) {
+void addTearDownPath(StoragePath path, {StorageBucket? bucket}) {
   addTearDown(
     () {
       try {
-        return Amplify.Storage.remove(path: path).result;
+        return Amplify.Storage.remove(
+          path: path,
+          options: StorageRemoveOptions(bucket: bucket),
+        ).result;
       } on Exception catch (e) {
         _logger.warn('Failed to remove file after test', e);
         rethrow;

diff --git a/packages/storage/amplify_storage_s3_dart/test/amplify_storage_s3_dart_test.dart b/packages/storage/amplify_storage_s3_dart/test/amplify_storage_s3_dart_test.dart
@@ -415,6 +415,9 @@ void main() {
           () async {
         const defaultOptions = StorageDownloadDataOptions(
           pluginOptions: S3DownloadDataPluginOptions(),
+          bucket: StorageBucket.fromBucketInfo(
+            BucketInfo(bucketName: 'unit-test-bucket', region: 'us-east-2'),
+          ),
         );
 
         when(
@@ -432,6 +435,7 @@ void main() {
 
         downloadDataOperation = storageS3Plugin.downloadData(
           path: const StoragePath.fromString('public/$testKey'),
+          options: defaultOptions,
         );
 
         final capturedOptions = verify(
@@ -766,6 +770,9 @@ void main() {
           () async {
         const defaultOptions = StorageUploadFileOptions(
           pluginOptions: S3UploadFilePluginOptions(),
+          bucket: StorageBucket.fromBucketInfo(
+            BucketInfo(bucketName: 'unit-test-bucket', region: 'us-east-2'),
+          ),
         );
 
         when(
@@ -784,6 +791,7 @@ void main() {
         uploadFileOperation = storageS3Plugin.uploadFile(
           path: testPath,
           localFile: testLocalFile,
+          options: defaultOptions,
         );
 
         final capturedParams = verify(
@@ -1009,6 +1017,9 @@ void main() {
           () async {
         const defaultOptions = StorageRemoveOptions(
           pluginOptions: S3RemovePluginOptions(),
+          bucket: StorageBucket.fromBucketInfo(
+            BucketInfo(bucketName: 'unit-test-bucket', region: 'us-east-2'),
+          ),
         );
         when(
           () => storageS3Service.remove(
@@ -1017,7 +1028,10 @@ void main() {
           ),
         ).thenAnswer((_) async => testResult);
 
-        final removeOperation = storageS3Plugin.remove(path: testPath);
+        final removeOperation = storageS3Plugin.remove(
+          path: testPath,
+          options: defaultOptions,
+        );
 
         final capturedOptions = verify(
           () => storageS3Service.remove(