Sfoglia il codice sorgente

Empty test file should be empty (#10472)

Paul Beusterien 3 anni fa
parent
commit
17fe7adaa7

+ 5 - 12
FirebaseStorage/Tests/Integration/StorageIntegration.swift

@@ -416,22 +416,15 @@ class StorageResultTests: StorageIntegrationCommon {
 
     // Download URL format is
     // "https://firebasestorage.googleapis.com:443/v0/b/{bucket}/o/{path}?alt=media&token={token}"
-    let downloadURLPattern =
-      "^https:\\/\\/firebasestorage.googleapis.com:443\\/v0\\/b\\/[^\\/]*\\/o\\/" +
-      "ios%2Fpublic%2F1mb\\?alt=media&token=[a-z0-9-]*$"
+    let downloadURLPrefix =
+      "https://firebasestorage.googleapis.com:443/v0/b/ios-opensource-samples" +
+      ".appspot.com/o/ios%2Fpublic%2F1mb?alt=media&token"
 
     ref.downloadURL { result in
       switch result {
       case let .success(downloadURL):
-        do {
-          let testRegex = try NSRegularExpression(pattern: downloadURLPattern)
-          let urlString = downloadURL.absoluteString
-          XCTAssertEqual(testRegex.numberOfMatches(in: urlString,
-                                                   range: NSRange(location: 0,
-                                                                  length: urlString.count)), 1)
-        } catch {
-          XCTFail("Throw in downloadURL completion block")
-        }
+        let urlString = downloadURL.absoluteString
+        XCTAssertTrue(urlString.hasPrefix(downloadURLPrefix))
       case let .failure(error):
         XCTFail("Unexpected error \(error) from downloadURL")
       }

+ 1 - 1
FirebaseStorage/Tests/Integration/StorageIntegrationCommon.swift

@@ -67,7 +67,7 @@ class StorageIntegrationCommon: XCTestCase {
         }
         for emptyFile in emptyFiles {
           let ref = storage.reference().child(emptyFile)
-          ref.putData(data) { result in
+          ref.putData(Data()) { result in
             self.assertResultSuccess(result)
             setupExpectation.fulfill()
           }