Revert "Temporarily disable testPutFileLimitedChunk"

This reverts commit 380323b.
firebase · Jan 23, 2024 · 88da99e · 88da99e
1 parent d7ee4cb
commit 88da99e
Showing 1 changed file with 48 additions and 49 deletions.
diff --git a/FirebaseStorage/Tests/Integration/StorageIntegration.swift b/FirebaseStorage/Tests/Integration/StorageIntegration.swift
@@ -265,55 +265,54 @@ class StorageResultTests: StorageIntegrationCommon {
     waitForExpectations()
   }
 
-  // TODO: Re-enable test before merging
-  //  func testPutFileLimitedChunk() throws {
-  //    defer {
-  //      // Reset since tests share storage instance.
-  //      storage.uploadChunkSizeBytes = Int64.max
-  //    }
-  //    let expectation = self.expectation(description: #function)
-  //    let putFileExpectation = self.expectation(description: "putFile")
-  //    let ref = storage.reference(withPath: "ios/public/testPutFilePauseResume")
-  //    let bundle = Bundle(for: StorageIntegrationCommon.self)
-  //    let filePath = try XCTUnwrap(bundle.path(forResource: "1mb", ofType: "dat"),
-  //                                 "Failed to get filePath")
-  //    let data = try XCTUnwrap(Data(contentsOf: URL(fileURLWithPath: filePath)),
-  //                             "Failed to load file")
-  //    let tmpDirURL = URL(fileURLWithPath: NSTemporaryDirectory())
-  //    let fileURL = tmpDirURL.appendingPathComponent("LargePutFile.txt")
-  //    var progressCount = 0
-  //
-  //    try data.write(to: fileURL, options: .atomicWrite)
-  //
-  //    // Limit the upload chunk size
-  //    storage.uploadChunkSizeBytes = 256_000
-  //
-  //    let task = ref.putFile(from: fileURL) { result in
-  //      XCTAssertGreaterThanOrEqual(progressCount, 4)
-  //      self.assertResultSuccess(result)
-  //      putFileExpectation.fulfill()
-  //    }
-  //
-  //    task.observe(StorageTaskStatus.success) { snapshot in
-  //      XCTAssertEqual(snapshot.description, "<State: Success>")
-  //      expectation.fulfill()
-  //    }
-  //
-  //    var uploadedBytes: Int64 = -1
-  //
-  //    task.observe(StorageTaskStatus.progress) { snapshot in
-  //      XCTAssertTrue(snapshot.description.starts(with: "<State: Progress") ||
-  //        snapshot.description.starts(with: "<State: Resume"))
-  //      guard let progress = snapshot.progress else {
-  //        XCTFail("Failed to get snapshot.progress")
-  //        return
-  //      }
-  //      progressCount = progressCount + 1
-  //      XCTAssertGreaterThanOrEqual(progress.completedUnitCount, uploadedBytes)
-  //      uploadedBytes = progress.completedUnitCount
-  //    }
-  //    waitForExpectations()
-  //  }
+  func testPutFileLimitedChunk() throws {
+    defer {
+      // Reset since tests share storage instance.
+      storage.uploadChunkSizeBytes = Int64.max
+    }
+    let expectation = self.expectation(description: #function)
+    let putFileExpectation = self.expectation(description: "putFile")
+    let ref = storage.reference(withPath: "ios/public/testPutFilePauseResume")
+    let bundle = Bundle(for: StorageIntegrationCommon.self)
+    let filePath = try XCTUnwrap(bundle.path(forResource: "1mb", ofType: "dat"),
+                                 "Failed to get filePath")
+    let data = try XCTUnwrap(Data(contentsOf: URL(fileURLWithPath: filePath)),
+                             "Failed to load file")
+    let tmpDirURL = URL(fileURLWithPath: NSTemporaryDirectory())
+    let fileURL = tmpDirURL.appendingPathComponent("LargePutFile.txt")
+    var progressCount = 0
+
+    try data.write(to: fileURL, options: .atomicWrite)
+
+    // Limit the upload chunk size
+    storage.uploadChunkSizeBytes = 256_000
+
+    let task = ref.putFile(from: fileURL) { result in
+      XCTAssertGreaterThanOrEqual(progressCount, 4)
+      self.assertResultSuccess(result)
+      putFileExpectation.fulfill()
+    }
+
+    task.observe(StorageTaskStatus.success) { snapshot in
+      XCTAssertEqual(snapshot.description, "<State: Success>")
+      expectation.fulfill()
+    }
+
+    var uploadedBytes: Int64 = -1
+
+    task.observe(StorageTaskStatus.progress) { snapshot in
+      XCTAssertTrue(snapshot.description.starts(with: "<State: Progress") ||
+        snapshot.description.starts(with: "<State: Resume"))
+      guard let progress = snapshot.progress else {
+        XCTFail("Failed to get snapshot.progress")
+        return
+      }
+      progressCount = progressCount + 1
+      XCTAssertGreaterThanOrEqual(progress.completedUnitCount, uploadedBytes)
+      uploadedBytes = progress.completedUnitCount
+    }
+    waitForExpectations()
+  }
 
   func testPutFileTinyChunk() throws {
     defer {