chore: Adding more AWSS3StoragePlugin tests

aws-amplify · Oct 12, 2023 · e2bc2ec · e2bc2ec
1 parent 78f95fc
commit e2bc2ec
Show file tree

Hide file tree

Showing 12 changed files with 2,655 additions and 20 deletions.
diff --git a/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Dependency/AWSS3Adapter.swift b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Dependency/AWSS3Adapter.swift
@@ -18,10 +18,10 @@ import AWSClientRuntime
 /// and allows for mocking in unit tests. The methods contain no other logic other than calling the
 /// same method using the AWSS3 instance.
 class AWSS3Adapter: AWSS3Behavior {
-    let awsS3: S3Client
+    let awsS3: S3ClientProtocol
     let config: S3Client.S3ClientConfiguration
 
-    init(_ awsS3: S3Client, config: S3Client.S3ClientConfiguration) {
+    init(_ awsS3: S3ClientProtocol, config: S3Client.S3ClientConfiguration) {
         self.awsS3 = awsS3
         self.config = config
     }
@@ -161,7 +161,7 @@ class AWSS3Adapter: AWSS3Behavior {
 
     /// Instance of S3 service.
     /// - Returns: S3 service instance.
-    func getS3() -> S3Client {
+    func getS3() -> S3ClientProtocol {
         return awsS3
     }
 }
diff --git a/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Dependency/AWSS3Behavior.swift b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Dependency/AWSS3Behavior.swift
@@ -35,7 +35,7 @@ protocol AWSS3Behavior {
     func abortMultipartUpload(_ request: AWSS3AbortMultipartUploadRequest, completion: @escaping (Result<Void, StorageError>) -> Void)
 
     // Gets a client for AWS S3 Service.
-    func getS3() -> S3Client
+    func getS3() -> S3ClientProtocol
 
 }
 

diff --git a/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService.swift b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService.swift
@@ -54,6 +54,7 @@ class AWSS3StorageService: AWSS3StorageServiceBehavior, StorageServiceProxy {
                      httpClientEngineProxy: HttpClientEngineProxy? = nil,
                      storageConfiguration: StorageConfiguration = .default,
                      storageTransferDatabase: StorageTransferDatabase = .default,
+                     fileSystem: FileSystem = .default,
                      sessionConfiguration: URLSessionConfiguration? = nil,
                      delegateQueue: OperationQueue? = nil,
                      logger: Logger = storageLogger) throws {
@@ -97,7 +98,9 @@ class AWSS3StorageService: AWSS3StorageServiceBehavior, StorageServiceProxy {
         self.init(authService: authService,
                   storageConfiguration: storageConfiguration,
                   storageTransferDatabase: storageTransferDatabase,
+                  fileSystem: fileSystem,
                   sessionConfiguration: _sessionConfiguration,
+                  logger: logger,
                   s3Client: s3Client,
                   preSignedURLBuilder: preSignedURLBuilder,
                   awsS3: awsS3,

diff --git a/...s/Storage/Sources/AWSS3StoragePlugin/Support/Internal/StorageMultipartUploadSession.swift b/...s/Storage/Sources/AWSS3StoragePlugin/Support/Internal/StorageMultipartUploadSession.swift
@@ -44,14 +44,6 @@ class StorageMultipartUploadSession {
 
     private let transferTask: StorageTransferTask
 
-    private var contentType: String? {
-        transferTask.contentType
-    }
-
-    private var requestHeaders: RequestHeaders? {
-        transferTask.requestHeaders
-    }
-
     init(client: StorageMultipartUploadClient,
          bucket: String,
          key: String,

diff --git a/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Support/Internal/StorageTransferTask.swift b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Support/Internal/StorageTransferTask.swift
@@ -173,10 +173,6 @@ class StorageTransferTask {
         }
     }
 
-    private var cancelled: Bool {
-        status == .cancelled
-    }
-
     var isFailed: Bool {
         status == .error
     }
@@ -324,7 +320,7 @@ class StorageTransferTask {
                 logger.warn("Unable to complete after cancelled")
                 return
             }
-            guard _status == .completed else {
+            guard _status != .completed else {
                 logger.warn("Task is already completed")
                 return
             }