Merge pull request #132 from spotify/ext

test resources: add file extensions
spotify · Aug 9, 2022 · 94c3244 · 94c3244
2 parents 130c231 + aa56de2
commit 94c3244
Show file tree

Hide file tree

Showing 20 changed files with 74 additions and 73 deletions.
diff --git a/SPTPersistentCache.xcodeproj/project.pbxproj b/SPTPersistentCache.xcodeproj/project.pbxproj
diff --git a/.../aad0e75ab0a6828d0a9b37a68198cc9d70d84850 → ...0e75ab0a6828d0a9b37a68198cc9d70d84850.dat b/.../aad0e75ab0a6828d0a9b37a68198cc9d70d84850 → ...0e75ab0a6828d0a9b37a68198cc9d70d84850.dat
diff --git a/.../ab3d97d4d7b3df5417490aa726c5a49b9ee98038 → ...d97d4d7b3df5417490aa726c5a49b9ee98038.dat b/.../ab3d97d4d7b3df5417490aa726c5a49b9ee98038 → ...d97d4d7b3df5417490aa726c5a49b9ee98038.dat
diff --git a/.../b02c1be08c00bac5f4f1a62c6f353a24487bb024 → ...c1be08c00bac5f4f1a62c6f353a24487bb024.dat b/.../b02c1be08c00bac5f4f1a62c6f353a24487bb024 → ...c1be08c00bac5f4f1a62c6f353a24487bb024.dat
diff --git a/.../b3e04bf446b486412a13659af71e3a333c6152f4 → ...04bf446b486412a13659af71e3a333c6152f4.dat b/.../b3e04bf446b486412a13659af71e3a333c6152f4 → ...04bf446b486412a13659af71e3a333c6152f4.dat
diff --git a/.../b53aed36cdc67dd43b496db74843ac32fe1f64bb → ...aed36cdc67dd43b496db74843ac32fe1f64bb.dat b/.../b53aed36cdc67dd43b496db74843ac32fe1f64bb → ...aed36cdc67dd43b496db74843ac32fe1f64bb.dat
diff --git a/.../b91998ae68b9639cee6243df0886d69bdeb75854 → ...998ae68b9639cee6243df0886d69bdeb75854.dat b/.../b91998ae68b9639cee6243df0886d69bdeb75854 → ...998ae68b9639cee6243df0886d69bdeb75854.dat
diff --git a/.../c3b19963fc076930dd36ce3968757704bbc97357 → ...19963fc076930dd36ce3968757704bbc97357.dat b/.../c3b19963fc076930dd36ce3968757704bbc97357 → ...19963fc076930dd36ce3968757704bbc97357.dat
diff --git a/.../c5aec3eef2478bfe47aef16787a6b4df31eb45f2 → ...ec3eef2478bfe47aef16787a6b4df31eb45f2.dat b/.../c5aec3eef2478bfe47aef16787a6b4df31eb45f2 → ...ec3eef2478bfe47aef16787a6b4df31eb45f2.dat
diff --git a/.../e5a1921f8f75d42412e08aff4da33e1132f7ee8a → ...1921f8f75d42412e08aff4da33e1132f7ee8a.dat b/.../e5a1921f8f75d42412e08aff4da33e1132f7ee8a → ...1921f8f75d42412e08aff4da33e1132f7ee8a.dat
diff --git a/.../e5b8abdc091921d49e86687e28b74abb3139df70 → ...8abdc091921d49e86687e28b74abb3139df70.dat b/.../e5b8abdc091921d49e86687e28b74abb3139df70 → ...8abdc091921d49e86687e28b74abb3139df70.dat
diff --git a/.../ee678d23b8dba2997c52741e88fa7a1fdeaf2863 → ...78d23b8dba2997c52741e88fa7a1fdeaf2863.dat b/.../ee678d23b8dba2997c52741e88fa7a1fdeaf2863 → ...78d23b8dba2997c52741e88fa7a1fdeaf2863.dat
diff --git a/.../ee6b44ab07fa3937a6d37f449355b64c09677295 → ...b44ab07fa3937a6d37f449355b64c09677295.dat b/.../ee6b44ab07fa3937a6d37f449355b64c09677295 → ...b44ab07fa3937a6d37f449355b64c09677295.dat
diff --git a/.../eee9747e967c4440eb90bb812d148aa3d0056700 → ...9747e967c4440eb90bb812d148aa3d0056700.dat b/.../eee9747e967c4440eb90bb812d148aa3d0056700 → ...9747e967c4440eb90bb812d148aa3d0056700.dat
diff --git a/.../f1eeb834607dcc2b01909bd740d4356f2abb4cd1 → ...eb834607dcc2b01909bd740d4356f2abb4cd1.dat b/.../f1eeb834607dcc2b01909bd740d4356f2abb4cd1 → ...eb834607dcc2b01909bd740d4356f2abb4cd1.dat
diff --git a/.../f50512901688b79a7852999d384d097a71fad788 → ...512901688b79a7852999d384d097a71fad788.dat b/.../f50512901688b79a7852999d384d097a71fad788 → ...512901688b79a7852999d384d097a71fad788.dat
diff --git a/.../f7501f27f70162a9a7da196c5d2ece3151a2d80a → ...01f27f70162a9a7da196c5d2ece3151a2d80a.dat b/.../f7501f27f70162a9a7da196c5d2ece3151a2d80a → ...01f27f70162a9a7da196c5d2ece3151a2d80a.dat
diff --git a/.../fc22d4f65c1ba875f6bb5ba7d35a7fd12851ed5c → ...2d4f65c1ba875f6bb5ba7d35a7fd12851ed5c.dat b/.../fc22d4f65c1ba875f6bb5ba7d35a7fd12851ed5c → ...2d4f65c1ba875f6bb5ba7d35a7fd12851ed5c.dat
diff --git a/Tests/SPTPersistentCachePerformanceTests.m b/Tests/SPTPersistentCachePerformanceTests.m
@@ -100,7 +100,7 @@ - (void)setUp
 
     NSBundle *bundle = [NSBundle bundleForClass:[self class]];
     for (NSString *fileName in fileNames) {
-        NSString *filePath = [bundle pathForResource:fileName ofType:nil];
+        NSString *filePath = [bundle pathForResource:fileName ofType:@"dat"];
         NSData *fileData = [NSData dataWithContentsOfFile:filePath];
         if (!fileData) {
             fileData = [NSData data];

diff --git a/Tests/SPTPersistentCacheTests.m b/Tests/SPTPersistentCacheTests.m
@@ -231,7 +231,7 @@ - (void)setUp
 
     for (NSUInteger i = 0; i < count; ++i) {
         XCTAssert(kParams[i].last != YES, @"Last param element reached");
-        NSString *fileName = [self.thisBundle pathForResource:self.imageNames[i] ofType:nil];
+        NSString *fileName = [self.thisBundle pathForResource:self.imageNames[i] ofType:@"dat"];
         __weak XCTestExpectation *expectation = [self expectationWithDescription:fileName];
         [self putFile:fileName inCache:self.cache withKey:self.imageNames[i] ttl:kParams[i].ttl locked:kParams[i].locked expectation:expectation];
         NSData *data = [NSData dataWithContentsOfFile:fileName];
@@ -824,7 +824,7 @@ - (void)testLockedSize
 
         if (kParams[i].locked) {
 
-            NSString *fileName = [self.thisBundle pathForResource:self.imageNames[i] ofType:nil];
+            NSString *fileName = [self.thisBundle pathForResource:self.imageNames[i] ofType:@"dat"];
             NSData *data = [NSData dataWithContentsOfFile:fileName];
             XCTAssertNotNil(data, @"Data must be valid");
             expectedSize += ([data length] + (NSUInteger)SPTPersistentCacheRecordHeaderSize);
@@ -1218,7 +1218,7 @@ - (void)testSerialStoreWithLockDoesntIncrementRefCount
     // Index of file to put. It should be file without any problems.
     const NSUInteger putIndex = 2;
     NSString *key = self.imageNames[putIndex];
-    NSString *fileName = [self.thisBundle pathForResource:key ofType:nil];
+    NSString *fileName = [self.thisBundle pathForResource:key ofType:@"dat"];
     NSString *path = [fileManager pathForKey:key];
 
     // Check that image is valid just in case
@@ -1397,6 +1397,7 @@ - (void)testCurrentDataTimeInterval
     SPTPersistentCache *cache = [self createCacheWithTimeCallback:nil expirationTime:0];
 
     NSTimeInterval firstTimeInterval = [cache currentDateTimeInterval];
+    [NSThread sleepForTimeInterval:0.1]; // sleep a beat
     NSTimeInterval secondTimeInterval = [cache currentDateTimeInterval];
 
     XCTAssertGreaterThan(secondTimeInterval, firstTimeInterval);
@@ -2008,7 +2009,7 @@ - (void)checkUpdateTimeForFileAtPath:(NSString *)path validate:(BOOL)validate re
 
 - (NSUInteger)dataSizeForItem:(NSString *)item
 {
-    NSString *fileName = [self.thisBundle pathForResource:item ofType:nil];
+    NSString *fileName = [self.thisBundle pathForResource:item ofType:@"dat"];
     NSData *data = [NSData dataWithContentsOfFile:fileName];
     XCTAssertNotNil(data, @"Data must be valid");
     return [data length];