Skip to content

Commit

Permalink
more tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@paulb777
paulb777 committed Jun 27, 2021
1 parent a9a4a4a commit 4007610
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 72 deletions.
20 changes: 18 additions & 2 deletions FirebaseStorageSwift/Sources/AsyncAwait.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,24 @@ import FirebaseStorage
// TODO: Use task to handle progress and cancellation.
_ = self.putData(uploadData, metadata: metadata) { result in
switch result {
case let .success(data):
continuation.resume(returning: data)
case let .success(metadata):
continuation.resume(returning: metadata)
case let .failure(error):
continuation.resume(throwing: error)
}
}
}
}

func putFileAwait(from url: URL,
metadata: StorageMetadata? = nil) async throws -> StorageMetadata {
typealias MetadataContinuation = CheckedContinuation<StorageMetadata, Error>
return try await withCheckedThrowingContinuation { (continuation: MetadataContinuation) in
// TODO: Use task to handle progress and cancellation.
_ = self.putFile(from: url, metadata: metadata) { result in
switch result {
case let .success(metadata):
continuation.resume(returning: metadata)
case let .failure(error):
continuation.resume(throwing: error)
}
Expand Down
105 changes: 35 additions & 70 deletions FirebaseStorageSwift/Tests/Integration/StorageAsyncAwait.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,95 +51,55 @@ import XCTest
_ = try await ref.delete()
}

func testDeleteWithNilCompletion() throws {
let expectation = self.expectation(description: #function)
func testDeleteWithNilCompletion() async throws {
let ref = storage.reference(withPath: "ios/public/fileToDelete")
let data = try XCTUnwrap("Hello Swift World".data(using: .utf8), "Data construction failed")
ref.putData(data) { result in
self.assertResultSuccess(result)
ref.delete(completion: nil)
expectation.fulfill()
}
waitForExpectations()
let result = try await ref.putDataAwait(data)
XCTAssertNotNil(result)
}

func testSimplePutData() throws {
let expectation = self.expectation(description: #function)
func testSimplePutData() async throws {
let ref = storage.reference(withPath: "ios/public/testBytesUpload")
let data = try XCTUnwrap("Hello Swift World".data(using: .utf8), "Data construction failed")
ref.putData(data) { result in
self.assertResultSuccess(result)
expectation.fulfill()
}
waitForExpectations()
let result = try await ref.putDataAwait(data)
XCTAssertNotNil(result)
}

func testSimplePutSpecialCharacter() throws {
let expectation = self.expectation(description: #function)
let ref = storage.reference(withPath: "ios/public/-._~!$'()*,=:@&+;")
func testSimplePutSpecialCharacter() async throws { let ref = storage.reference(withPath: "ios/public/-._~!$'()*,=:@&+;")
let data = try XCTUnwrap("Hello Swift World".data(using: .utf8), "Data construction failed")
ref.putData(data) { result in
self.assertResultSuccess(result)
expectation.fulfill()
}
waitForExpectations()
let result = try await ref.putDataAwait(data)
XCTAssertNotNil(result)
}

func testSimplePutDataInBackgroundQueue() throws {
let expectation = self.expectation(description: #function)
let ref = storage.reference(withPath: "ios/public/testBytesUpload")
let data = try XCTUnwrap("Hello Swift World".data(using: .utf8), "Data construction failed")
DispatchQueue.global(qos: .background).async {
ref.putData(data) { result in
self.assertResultSuccess(result)
expectation.fulfill()
func testSimplePutDataInBackgroundQueue() async throws {
actor MyBackground {
func doit(_ ref: StorageReference) async throws -> StorageMetadata {
let data = try XCTUnwrap("Hello Swift World".data(using: .utf8), "Data construction failed")
XCTAssertFalse(Thread.isMainThread)
return try await ref.putDataAwait(data)
}
}
waitForExpectations()
let ref = storage.reference(withPath: "ios/public/testBytesUpload")
let result = try await MyBackground().doit(ref)
XCTAssertNotNil(result)
}

func testSimplePutEmptyData() {
let expectation = self.expectation(description: #function)
func testSimplePutEmptyData() async throws {
let ref = storage.reference(withPath: "ios/public/testSimplePutEmptyData")
let data = Data()
ref.putData(data) { result in
self.assertResultSuccess(result)
expectation.fulfill()
}
waitForExpectations()
}

func testSimplePutDataUnauthorized() throws {
let expectation = self.expectation(description: #function)
let ref = storage.reference(withPath: "ios/private/secretfile.txt")
let data = try XCTUnwrap("Hello Swift World".data(using: .utf8), "Data construction failed")
ref.putData(data) { result in
switch result {
case .success:
XCTFail("Unexpected success from unauthorized putData")
case let .failure(error as NSError):
XCTAssertEqual(error.code, StorageErrorCode.unauthorized.rawValue)
expectation.fulfill()
}
}
waitForExpectations()
let result = try await ref.putDataAwait(data)
XCTAssertNotNil(result)
}

func testSimplePutDataUnauthorizedThrow() throws {
let expectation = self.expectation(description: #function)
func testSimplePutDataUnauthorized() async throws {
let ref = storage.reference(withPath: "ios/private/secretfile.txt")
let data = try XCTUnwrap("Hello Swift World".data(using: .utf8), "Data construction failed")
ref.putData(data) { result in
do {
try _ = result.get() // .failure will throw
} catch {
expectation.fulfill()
return
}
do {
_ = try await ref.putDataAwait(data)
XCTFail("Unexpected success from unauthorized putData")
expectation.fulfill()
} catch {
XCTAssertEqual((error as NSError).code, StorageErrorCode.unauthorized.rawValue)
}
waitForExpectations()
}

func testSimplePutFile() throws {
Expand Down Expand Up @@ -175,15 +135,20 @@ import XCTest
waitForExpectations()
}

func testAttemptToUploadDirectoryShouldFail() throws {
func testAttemptToUploadDirectoryShouldFail() async throws {
// This `.numbers` file is actually a directory.
let fileName = "HomeImprovement.numbers"
let bundle = Bundle(for: StorageIntegrationCommon.self)
let fileURL = try XCTUnwrap(bundle.url(forResource: fileName, withExtension: ""),
"Failed to get filePath")
let ref = storage.reference(withPath: "ios/public/" + fileName)
ref.putFile(from: fileURL) { result in
self.assertResultFailure(result)
do {
let _ = try await ref.putFileAwait(from: fileURL)
XCTFail("Unexpected success from putFile of a directory")
} catch {
// TODO: Investigate generating a more descriptive error code than unknown.
let e = error as NSError
XCTAssertEqual(e.code, StorageErrorCode.unknown.rawValue)
}
}

Expand Down Expand Up @@ -287,7 +252,7 @@ import XCTest
let data = try XCTUnwrap("Hello Swift World".data(using: .utf8), "Data construction failed")

async {
try await ref.putDataAwait(data)
_ = try await ref.putDataAwait(data)
let task = ref.write(toFile: fileURL)

// TODO: Update to use Swift Tasks
Expand Down

0 comments on commit 4007610

Please sign in to comment.