diff options
author | Sebastian Schmidt <mrschmidt@google.com> | 2018-04-09 14:21:00 -0700 |
---|---|---|
committer | Sebastian Schmidt <mrschmidt@google.com> | 2018-04-09 14:41:54 -0700 |
commit | 2dd40e3abba3d3a5a949aa4980f741ae412147ba (patch) | |
tree | 05628f8f8805fc22e5f54d0ed90a68c29680e1a6 /Example | |
parent | 42bc113754d2f9e2f0f6cf552916ae76149e717d (diff) |
Removing FirebaseStorage.downloadURL
Diffstat (limited to 'Example')
-rw-r--r-- | Example/Storage/Tests/Integration/FIRStorageIntegrationTests.m | 18 | ||||
-rw-r--r-- | Example/Storage/Tests/Unit/FIRStorageMetadataTests.m | 59 |
2 files changed, 27 insertions, 50 deletions
diff --git a/Example/Storage/Tests/Integration/FIRStorageIntegrationTests.m b/Example/Storage/Tests/Integration/FIRStorageIntegrationTests.m index 8e826c9..2e765f6 100644 --- a/Example/Storage/Tests/Integration/FIRStorageIntegrationTests.m +++ b/Example/Storage/Tests/Integration/FIRStorageIntegrationTests.m @@ -381,7 +381,7 @@ NSTimeInterval kFIRStorageIntegrationTestTimeout = 30; /// Only allow 1kB size, which is smaller than our file [ref dataWithMaxSize:1 * 1024 completion:^(NSData *data, NSError *error) { - XCTAssertEqual(data, nil); + XCTAssertNil(nil); XCTAssertEqual(error.code, FIRStorageErrorCodeDownloadSizeExceeded); [expectation fulfill]; }]; @@ -389,6 +389,22 @@ NSTimeInterval kFIRStorageIntegrationTestTimeout = 30; [self waitForExpectations]; } +- (void)testUnauthenticatedSimpleGetDownloadURL { + XCTestExpectation *expectation = + [self expectationWithDescription:@"testUnauthenticatedSimpleGetDownloadURL"]; + + FIRStorageReference *ref = [self.storage referenceWithPath:@"ios/public/1mb"]; + + [ref downloadURLWithCompletion:^(NSURL *downloadURL, NSError *error) { + XCTAssertNil(error); + XCTAssertTrue( + [[downloadURL absoluteString] hasPrefix:@"https://firebasestorage.googleapis.com/"]); + [expectation fulfill]; + }]; + + [self waitForExpectations]; +} + - (void)testUnauthenticatedSimpleGetFile { XCTestExpectation *expectation = [self expectationWithDescription:@"testUnauthenticatedSimpleGetData"]; diff --git a/Example/Storage/Tests/Unit/FIRStorageMetadataTests.m b/Example/Storage/Tests/Unit/FIRStorageMetadataTests.m index 84b5271..8e873be 100644 --- a/Example/Storage/Tests/Unit/FIRStorageMetadataTests.m +++ b/Example/Storage/Tests/Unit/FIRStorageMetadataTests.m @@ -15,6 +15,7 @@ #import <FirebaseStorage/FIRStorageMetadata.h> #import <XCTest/XCTest.h> +#import "FIRStorageGetDownloadURLTask.h" #import "FIRStorageMetadata.h" #import "FIRStorageMetadata_Private.h" #import "FIRStorageUtils.h" @@ -39,7 +40,6 @@ kFIRStorageMetadataContentLanguage : @"en-us", kFIRStorageMetadataContentType : @"application/octet-stream", kFIRStorageMetadataCustomMetadata : @{@"foo" : @{@"bar" : @"baz"}}, - kFIRStorageMetadataDownloadTokens : @"1234567890", kFIRStorageMetadataGeneration : @"12345", kFIRStorageMetadataMetageneration : @"67890", kFIRStorageMetadataName : @"path/to/object", @@ -58,12 +58,6 @@ XCTAssertEqualObjects(metadata.contentType, metaDict[kFIRStorageMetadataContentType]); XCTAssertEqualObjects(metadata.customMetadata, metaDict[kFIRStorageMetadataCustomMetadata]); XCTAssertEqualObjects(metadata.md5Hash, metaDict[kFIRStorageMetadataMd5Hash]); - NSString *URLFormat = @"https://firebasestorage.googleapis.com/v0/b/%@/o/%@?alt=media&token=%@"; - NSString *URLString = [NSString - stringWithFormat:URLFormat, metaDict[kFIRStorageMetadataBucket], - [FIRStorageUtils GCSEscapedString:metaDict[kFIRStorageMetadataName]], - metaDict[kFIRStorageMetadataDownloadTokens]]; - XCTAssertEqualObjects([metadata.downloadURL description], URLString); NSString *generation = [NSString stringWithFormat:@"%lld", metadata.generation]; XCTAssertEqualObjects(generation, metaDict[kFIRStorageMetadataGeneration]); NSString *metageneration = [NSString stringWithFormat:@"%lld", metadata.metageneration]; @@ -86,7 +80,6 @@ kFIRStorageMetadataContentLanguage : @"en-us", kFIRStorageMetadataContentType : @"application/octet-stream", kFIRStorageMetadataCustomMetadata : @{@"foo" : @{@"bar" : @"baz"}}, - kFIRStorageMetadataDownloadTokens : @"1234567890", kFIRStorageMetadataGeneration : @"12345", kFIRStorageMetadataMetageneration : @"67890", kFIRStorageMetadataName : @"path/to/object", @@ -97,7 +90,7 @@ }; FIRStorageMetadata *metadata = [[FIRStorageMetadata alloc] initWithDictionary:metaDict]; NSDictionary *dictRepresentation = [metadata dictionaryRepresentation]; - XCTAssertNotEqual(dictRepresentation, nil); + XCTAssertNotNil(dictRepresentation, ); XCTAssertEqualObjects(dictRepresentation[kFIRStorageMetadataBucket], metaDict[kFIRStorageMetadataBucket]); XCTAssertEqualObjects(dictRepresentation[kFIRStorageMetadataCacheControl], @@ -130,60 +123,28 @@ metaDict[kFIRStorageMetadataMd5Hash]); } -- (void)testInitialzeNoDownloadTokensGetToken { - NSDictionary *metaDict = @{ - kFIRStorageMetadataBucket : @"bucket", - kFIRStorageMetadataName : @"path/to/object", - }; - FIRStorageMetadata *metadata = [[FIRStorageMetadata alloc] initWithDictionary:metaDict]; - XCTAssertNotNil(metadata); - XCTAssertEqual(metadata.downloadURL, nil); - XCTAssertEqual(metadata.downloadURLs, nil); -} - -- (void)testInitialzeMultipleDownloadTokensGetToken { +- (void)testInitializeEmptyDownloadURL { NSDictionary *metaDict = @{ kFIRStorageMetadataBucket : @"bucket", - kFIRStorageMetadataDownloadTokens : @"12345,67890", kFIRStorageMetadataName : @"path/to/object", }; - FIRStorageMetadata *metadata = [[FIRStorageMetadata alloc] initWithDictionary:metaDict]; - XCTAssertNotNil(metadata); - NSString *URLformat = @"https://firebasestorage.googleapis.com/v0/b/%@/o/%@?alt=media&token=%@"; - NSString *URLString0 = [NSString - stringWithFormat:URLformat, metaDict[kFIRStorageMetadataBucket], - [FIRStorageUtils GCSEscapedString:metaDict[kFIRStorageMetadataName]], - @"12345"]; - NSString *URLString1 = [NSString - stringWithFormat:URLformat, metaDict[kFIRStorageMetadataBucket], - [FIRStorageUtils GCSEscapedString:metaDict[kFIRStorageMetadataName]], - @"67890"]; - XCTAssertEqualObjects([metadata.downloadURL absoluteString], URLString0); - XCTAssertEqualObjects([metadata.downloadURLs[0] absoluteString], URLString0); - XCTAssertEqualObjects([metadata.downloadURLs[1] absoluteString], URLString1); + NSURL *actualURL = [FIRStorageGetDownloadURLTask downloadURLFromMetadataDictionary:metaDict]; + XCTAssertNil(actualURL); } -- (void)testMultipleDownloadURLsGetToken { +- (void)testInitializeDownloadURLFromToken { NSDictionary *metaDict = @{ kFIRStorageMetadataBucket : @"bucket", + kFIRStorageMetadataDownloadTokens : @"12345,ignored", kFIRStorageMetadataName : @"path/to/object", }; - FIRStorageMetadata *metadata = [[FIRStorageMetadata alloc] initWithDictionary:metaDict]; NSString *URLformat = @"https://firebasestorage.googleapis.com/v0/b/%@/o/%@?alt=media&token=%@"; - NSString *URLString0 = [NSString + NSString *expectedURL = [NSString stringWithFormat:URLformat, metaDict[kFIRStorageMetadataBucket], [FIRStorageUtils GCSEscapedString:metaDict[kFIRStorageMetadataName]], @"12345"]; - NSString *URLString1 = [NSString - stringWithFormat:URLformat, metaDict[kFIRStorageMetadataBucket], - [FIRStorageUtils GCSEscapedString:metaDict[kFIRStorageMetadataName]], - @"67890"]; - NSURL *URL0 = [NSURL URLWithString:URLString0]; - NSURL *URL1 = [NSURL URLWithString:URLString1]; - NSArray *downloadURLs = @[ URL0, URL1 ]; - [metadata setValue:downloadURLs forKey:@"downloadURLs"]; - NSDictionary *newMetaDict = metadata.dictionaryRepresentation; - XCTAssertEqualObjects(newMetaDict[kFIRStorageMetadataDownloadTokens], @"12345,67890"); + NSURL *actualURL = [FIRStorageGetDownloadURLTask downloadURLFromMetadataDictionary:metaDict]; + XCTAssertEqualObjects([actualURL absoluteString], expectedURL); } - (void)testInitialzeMetadataWithFile { |