Skip to content

Commit 3eceb1d

Browse files
alda-optimizelyalda-optimizely
committed
Added tests for 304 response check. Cleaned up some other datafile manager tests.
1 parent 7ed4abe commit 3eceb1d

File tree

10 files changed

+146
-98
lines changed

10 files changed

+146
-98
lines changed

‎OptimizelySDKCore/OptimizelySDKCore.xcodeproj/xcshareddata/xcschemes/OptimizelySDKCoreiOS.xcscheme

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@
3838
ReferencedContainer = "container:OptimizelySDKCore.xcodeproj">
3939
</BuildableReference>
4040
</TestableReference>
41+
<TestableReference
42+
skipped = "NO">
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "EA52470A1DC7192200AF6685"
46+
BuildableName = "OptimizelySDKSharediOSTests.xctest"
47+
BlueprintName = "OptimizelySDKSharediOSTests"
48+
ReferencedContainer = "container:../OptimizelySDKShared/OptimizelySDKShared.xcodeproj">
49+
</BuildableReference>
50+
</TestableReference>
4151
</Testables>
4252
<MacroExpansion>
4353
<BuildableReference

‎OptimizelySDKCore/OptimizelySDKCore/OPTLYDatafileManager.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ @implementation OPTLYDatafileManagerNoOp
3434

3535
- (void)downloadDatafile:(nonnull NSString *)projectId
3636
completionHandler:(nullable void (^)(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error))completion {
37-
completion(nil, nil, nil);
37+
if (completion) {
38+
completion(nil, nil, nil);
39+
}
3840
return;
3941
}
4042

‎OptimizelySDKDatafileManager/OptimizelySDKDatafileManager.xcodeproj/project.pbxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@
3232
7C30D664EDAC58887076AE8E /* Pods_OptimizelySDKDatafileManageriOSTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F11A4F80C7960C4907845910 /* Pods_OptimizelySDKDatafileManageriOSTests.framework */; };
3333
8160880F9C1EE3663169C1F5 /* Pods_OptimizelySDKDatafileManageriOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E531AA1D0D78410E6B99080 /* Pods_OptimizelySDKDatafileManageriOS.framework */; };
3434
EA2C24231DE68FBE0063ADA0 /* OPTLYDatafileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = EA52494A1DC72FF200AF6685 /* OPTLYDatafileManager.m */; };
35-
EA2C24241DE68FBE0063ADA0 /* OPTLYDatafileManagerBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DB3D1831DC8187900ECF72E /* OPTLYDatafileManagerBuilder.m */; };
3635
EA2C24251DE68FCC0063ADA0 /* OPTLYDatafileManager.h in Headers */ = {isa = PBXBuildFile; fileRef = EA5249491DC72FF200AF6685 /* OPTLYDatafileManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
37-
EA2C24261DE68FCC0063ADA0 /* OPTLYDatafileManagerBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DB3D1821DC8187900ECF72E /* OPTLYDatafileManagerBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; };
3836
EA2C24271DE68FE50063ADA0 /* OPTLYDatafileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = EA52494A1DC72FF200AF6685 /* OPTLYDatafileManager.m */; };
39-
EA2C24281DE68FE50063ADA0 /* OPTLYDatafileManagerBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 2DB3D1831DC8187900ECF72E /* OPTLYDatafileManagerBuilder.m */; };
4037
EA2C24291DE68FF00063ADA0 /* OPTLYDatafileManager.h in Headers */ = {isa = PBXBuildFile; fileRef = EA5249491DC72FF200AF6685 /* OPTLYDatafileManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
41-
EA2C242A1DE68FF00063ADA0 /* OPTLYDatafileManagerBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 2DB3D1821DC8187900ECF72E /* OPTLYDatafileManagerBuilder.h */; settings = {ATTRIBUTES = (Public, ); }; };
4238
EA52480D1DC72AB000AF6685 /* OptimizelySDKDatafileManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA5248041DC72AAF00AF6685 /* OptimizelySDKDatafileManager.framework */; };
4339
EA52482D1DC72ABD00AF6685 /* OptimizelySDKDatafileManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA5248241DC72ABD00AF6685 /* OptimizelySDKDatafileManager.framework */; };
4440
EA52499B1DC7D8ED00AF6685 /* OptimizelySDKDatafileManager.h in Headers */ = {isa = PBXBuildFile; fileRef = EA3C68BE1DC1E75900C578CA /* OptimizelySDKDatafileManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
4541
EA5249DF1DC7E3C300AF6685 /* OptimizelySDKShared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA5248921DC72C5300AF6685 /* OptimizelySDKShared.framework */; };
4642
EA5249E01DC7E3CF00AF6685 /* OptimizelySDKShared.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA5248961DC72C5300AF6685 /* OptimizelySDKShared.framework */; };
4743
EA524A3D1DC846CE00AF6685 /* OptimizelySDKDatafileManager.h in Headers */ = {isa = PBXBuildFile; fileRef = EA3C68BE1DC1E75900C578CA /* OptimizelySDKDatafileManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
44+
EA8FD10D1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = EA8FD10B1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.h */; };
45+
EA8FD10E1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = EA8FD10B1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.h */; };
46+
EA8FD10F1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = EA8FD10C1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.m */; };
47+
EA8FD1101DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = EA8FD10C1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.m */; };
4848
/* End PBXBuildFile section */
4949

5050
/* Begin PBXContainerItemProxy section */
@@ -110,8 +110,6 @@
110110
00E229D537533B61E486FD74 /* Pods-OptimizelySDKDatafileManageriOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OptimizelySDKDatafileManageriOS.release.xcconfig"; path = "../Pods/Target Support Files/Pods-OptimizelySDKDatafileManageriOS/Pods-OptimizelySDKDatafileManageriOS.release.xcconfig"; sourceTree = "<group>"; };
111111
014E0B036FDB9D48F093B283 /* Pods-OptimizelySDKDatafileManagerTVOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OptimizelySDKDatafileManagerTVOS.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-OptimizelySDKDatafileManagerTVOS/Pods-OptimizelySDKDatafileManagerTVOS.debug.xcconfig"; sourceTree = "<group>"; };
112112
165C7E15B0446C33509E7A9E /* Pods-OptimizelySDKDatafileManageriOSTests.beta.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OptimizelySDKDatafileManageriOSTests.beta.xcconfig"; path = "../Pods/Target Support Files/Pods-OptimizelySDKDatafileManageriOSTests/Pods-OptimizelySDKDatafileManageriOSTests.beta.xcconfig"; sourceTree = "<group>"; };
113-
2DB3D1821DC8187900ECF72E /* OPTLYDatafileManagerBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OPTLYDatafileManagerBuilder.h; sourceTree = "<group>"; };
114-
2DB3D1831DC8187900ECF72E /* OPTLYDatafileManagerBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPTLYDatafileManagerBuilder.m; sourceTree = "<group>"; };
115113
2DB3D1861DC818D500ECF72E /* OPTLYDatafileManagerBuilderTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPTLYDatafileManagerBuilderTest.m; sourceTree = "<group>"; };
116114
2DCC50D21DDA7D81006C9815 /* OPTLYDatafileManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPTLYDatafileManagerTest.m; sourceTree = "<group>"; };
117115
2DCC50EB1DDBD183006C9815 /* OPTLYTestHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OPTLYTestHelper.h; sourceTree = "<group>"; };
@@ -150,6 +148,8 @@
150148
EA52488A1DC72C5300AF6685 /* OptimizelySDKShared.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OptimizelySDKShared.xcodeproj; path = ../OptimizelySDKShared/OptimizelySDKShared.xcodeproj; sourceTree = "<group>"; };
151149
EA5249491DC72FF200AF6685 /* OPTLYDatafileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OPTLYDatafileManager.h; sourceTree = "<group>"; };
152150
EA52494A1DC72FF200AF6685 /* OPTLYDatafileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPTLYDatafileManager.m; sourceTree = "<group>"; };
151+
EA8FD10B1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OPTLYDatafileManagerBuilder.h; sourceTree = "<group>"; };
152+
EA8FD10C1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OPTLYDatafileManagerBuilder.m; sourceTree = "<group>"; };
153153
F11A4F80C7960C4907845910 /* Pods_OptimizelySDKDatafileManageriOSTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OptimizelySDKDatafileManageriOSTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
154154
/* End PBXFileReference section */
155155

@@ -259,8 +259,8 @@
259259
EA3C68C01DC1E75900C578CA /* OptimizelySDKDatafileManager-Info.plist */,
260260
EA5249491DC72FF200AF6685 /* OPTLYDatafileManager.h */,
261261
EA52494A1DC72FF200AF6685 /* OPTLYDatafileManager.m */,
262-
2DB3D1821DC8187900ECF72E /* OPTLYDatafileManagerBuilder.h */,
263-
2DB3D1831DC8187900ECF72E /* OPTLYDatafileManagerBuilder.m */,
262+
EA8FD10B1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.h */,
263+
EA8FD10C1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.m */,
264264
);
265265
path = OptimizelySDKDatafileManager;
266266
sourceTree = "<group>";
@@ -311,7 +311,7 @@
311311
files = (
312312
EA52499B1DC7D8ED00AF6685 /* OptimizelySDKDatafileManager.h in Headers */,
313313
EA2C24251DE68FCC0063ADA0 /* OPTLYDatafileManager.h in Headers */,
314-
EA2C24261DE68FCC0063ADA0 /* OPTLYDatafileManagerBuilder.h in Headers */,
314+
EA8FD10D1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.h in Headers */,
315315
);
316316
runOnlyForDeploymentPostprocessing = 0;
317317
};
@@ -321,7 +321,7 @@
321321
files = (
322322
EA524A3D1DC846CE00AF6685 /* OptimizelySDKDatafileManager.h in Headers */,
323323
EA2C24291DE68FF00063ADA0 /* OPTLYDatafileManager.h in Headers */,
324-
EA2C242A1DE68FF00063ADA0 /* OPTLYDatafileManagerBuilder.h in Headers */,
324+
EA8FD10E1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.h in Headers */,
325325
);
326326
runOnlyForDeploymentPostprocessing = 0;
327327
};
@@ -697,8 +697,8 @@
697697
isa = PBXSourcesBuildPhase;
698698
buildActionMask = 2147483647;
699699
files = (
700+
EA8FD10F1DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.m in Sources */,
700701
EA2C24231DE68FBE0063ADA0 /* OPTLYDatafileManager.m in Sources */,
701-
EA2C24241DE68FBE0063ADA0 /* OPTLYDatafileManagerBuilder.m in Sources */,
702702
);
703703
runOnlyForDeploymentPostprocessing = 0;
704704
};
@@ -717,8 +717,8 @@
717717
isa = PBXSourcesBuildPhase;
718718
buildActionMask = 2147483647;
719719
files = (
720+
EA8FD1101DED2B9D00D950AD /* OPTLYDatafileManagerBuilder.m in Sources */,
720721
EA2C24271DE68FE50063ADA0 /* OPTLYDatafileManager.m in Sources */,
721-
EA2C24281DE68FE50063ADA0 /* OPTLYDatafileManagerBuilder.m in Sources */,
722722
);
723723
runOnlyForDeploymentPostprocessing = 0;
724724
};

‎OptimizelySDKDatafileManager/OptimizelySDKDatafileManager/OPTLYDatafileManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#import <Foundation/Foundation.h>
1818
#import <OptimizelySDKCore/OPTLYDatafileManager.h>
19-
#import "OPTLYDatafileManagerBuilder.h"
19+
#import <OptimizelySDKCore/OPTLYDatafileManagerBuilder.h>
2020

2121
@protocol OPTLYDatafileManager, OPTLYErrorHandler, OPTLYLogger;
2222

‎OptimizelySDKDatafileManager/OptimizelySDKDatafileManager/OPTLYDatafileManager.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#import <OptimizelySDKShared/OPTLYNetworkService.h>
2323
#import "OPTLYDatafileManager.h"
2424

25-
static NSString *const kCDNAddressFormat = @"https://cdn.optimizely.com/json/%@.json";
2625
NSTimeInterval const kDefaultDatafileFetchInterval = 0;
2726

2827
@interface OPTLYDatafileManager ()
@@ -82,7 +81,6 @@ - (void)downloadDatafile:(NSString *)projectId completionHandler:(OPTLYHTTPReque
8281
[self saveDatafile:data];
8382

8483
// save the last modified date
85-
8684
NSDictionary *dictionary = [httpResponse allHeaderFields];
8785
NSString *lastModifiedDate = [dictionary valueForKey:@"Last-Modified"];
8886
[self saveLastModifiedDate:lastModifiedDate project:projectId];

‎OptimizelySDKDatafileManager/OptimizelySDKDatafileManager/OPTLYDatafileManagerBuilder.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
***************************************************************************/
1616

1717
#import <Foundation/Foundation.h>
18+
#import <OptimizelySDKCore/OPTLYDatafileManager.h>
1819

1920
@class OPTLYDatafileManagerBuilder;
2021
@protocol OPTLYErrorHandler, OPTLYLogger;

0 commit comments

Comments
 (0)