Changed property names and removed unused variables.

alda-optimizely · alda-optimizely · commit c22ab947a9e6 · 2016-11-23T17:16:15.000-08:00
diff --git a/OptimizelySDKEventDispatcher/OptimizelySDKEventDispatcher/OPTLYEventDispatcher.m b/OptimizelySDKEventDispatcher/OptimizelySDKEventDispatcher/OPTLYEventDispatcher.m
@@ -17,8 +17,8 @@
 #import "OPTLYEventDispatcher.h"
 
 // --- Event URLs ----
-NSString * const OPTLYEventDispatcherImpressionEventURL   = @"https://logx.optimizely.com/log/decision"; // @"https://p13nlog.dz.optimizely.com/log/decision";
-NSString * const OPTLYEventDispatcherConversionEventURL   = @"https://logx.optimizely.com/log/event";    // @"https://p13nlog.dz.optimizely.com/log/event";
+NSString * const OPTLYEventDispatcherImpressionEventURL   = @"https://logx.optimizely.com/log/decision";
+NSString * const OPTLYEventDispatcherConversionEventURL   = @"https://logx.optimizely.com/log/event";
 
 // Default interval and timeout values (in ms) if not set by users
 NSInteger const OPTLYEventDispatcherDefaultDispatchIntervalTime_ms = 1000;
@@ -27,8 +27,8 @@
 @interface OPTLYEventDispatcher()
 @property (nonatomic, strong) OPTLYDataStore *dataStore;
 @property (nonatomic, strong) NSTimer *timer;
-@property (nonatomic, assign) uint64_t dispatchEventBackoffRetries;
-@property (nonatomic, assign) uint64_t dispatchEventCall;
+@property (nonatomic, assign) uint64_t flushEventBackoffRetries;
+@property (nonatomic, assign) uint64_t flushEventCall;
 @property (nonatomic, assign) uint64_t maxDispatchBackoffRetries;
 @end
 
@@ -45,8 +45,8 @@ - (instancetype)init {
 - (instancetype)initWithBuilder:(OPTLYEventDispatcherBuilder *)builder {
     self = [super init];
     if (self != nil) {
-        _dispatchEventBackoffRetries = 0;
-        _dispatchEventCall = 0;
+        _flushEventBackoffRetries = 0;
+        _flushEventCall = 0;
         _timer = nil;
         _eventHandlerDispatchInterval = OPTLYEventDispatcherDefaultDispatchIntervalTime_ms;
         _eventHandlerDispatchTimeout = OPTLYEventDispatcherDefaultDispatchTimeout_ms;
@@ -203,8 +203,8 @@ - (void)dispatchEvent:(nonnull NSDictionary *)event
             [strongSelf.logger logMessage:logMessage withLevel:OptimizelyLogLevelDebug];
             
             if (![strongSelf isTimerEnabled]) {
-                strongSelf.dispatchEventBackoffRetries = 0;
-                strongSelf.dispatchEventCall = 0;
+                strongSelf.flushEventBackoffRetries = 0;
+                strongSelf.flushEventCall = 0;
                 [strongSelf setupNetworkTimer:^{
                     if (callback) {
                         callback(data, response, error);
@@ -263,18 +263,18 @@ - (void)flushEvents:(void(^)())callback
         
         // setup the network timer if needed and reset all the counters
         if (![strongSelf isTimerEnabled]) {
-            strongSelf.dispatchEventBackoffRetries = 0;
-            strongSelf.dispatchEventCall = 0;
+            strongSelf.flushEventBackoffRetries = 0;
+            strongSelf.flushEventCall = 0;
             [strongSelf setupNetworkTimer:nil];
         }
         
-        strongSelf.dispatchEventCall++;
-        OPTLYLogDebug(@"Dispatch event call - %ld", strongSelf.dispatchEventCall);
+        strongSelf.flushEventCall++;
+        OPTLYLogDebug(@"Dispatch event call - %ld", strongSelf.flushEventCall);
         
         //exponential backoff: only dispatch at a power of two interval; o/w return
-        if (![strongSelf isPowerOf2:strongSelf.dispatchEventCall]) {
+        if (![strongSelf isPowerOf2:strongSelf.flushEventCall]) {
 
-            NSString *logMessage =  [NSString stringWithFormat:OPTLYLoggerMessagesEventDispatcherFlushEventsBackoffSkipRetry, strongSelf.dispatchEventCall];
+            NSString *logMessage =  [NSString stringWithFormat:OPTLYLoggerMessagesEventDispatcherFlushEventsBackoffSkipRetry, strongSelf.flushEventCall];
             [strongSelf.logger logMessage:logMessage withLevel:OptimizelyLogLevelDebug];
     
             if (callback) {
@@ -284,9 +284,9 @@ - (void)flushEvents:(void(^)())callback
         }
         
         // stop trying to flush if max retries have been exceeded
-        if (strongSelf.dispatchEventBackoffRetries > strongSelf.maxDispatchBackoffRetries) {
+        if (strongSelf.flushEventBackoffRetries > strongSelf.maxDispatchBackoffRetries) {
         
-            NSString *logMessage =  [NSString stringWithFormat:OPTLYLoggerMessagesEventDispatcherFlushEventsBackoffMaxRetries, strongSelf.dispatchEventBackoffRetries];
+            NSString *logMessage =  [NSString stringWithFormat:OPTLYLoggerMessagesEventDispatcherFlushEventsBackoffMaxRetries, strongSelf.flushEventBackoffRetries];
             [strongSelf.logger logMessage:logMessage withLevel:OptimizelyLogLevelDebug];
             
             [self disableNetworkTimer:^{
@@ -297,8 +297,8 @@ - (void)flushEvents:(void(^)())callback
             return;
         }
 
-        strongSelf.dispatchEventBackoffRetries++;
-        OPTLYLogDebug(@"Backoff retry - %ld.", strongSelf.dispatchEventBackoffRetries);
+        strongSelf.flushEventBackoffRetries++;
+        OPTLYLogDebug(@"Backoff retry - %ld.", strongSelf.flushEventBackoffRetries);
         
         [strongSelf flushSavedEvents:OPTLYDataStoreEventTypeImpression cachedData:YES];
         [strongSelf flushSavedEvents:OPTLYDataStoreEventTypeConversion cachedData:YES];
@@ -328,11 +328,7 @@ - (void)flushSavedEvent:(NSDictionary *)event
         [self.logger logMessage:logMessage withLevel:OptimizelyLogLevelDebug];
         
         if (callback) {
-            NSDictionary *errorMessage = [NSDictionary dictionaryWithObject:logMessage forKey:NSLocalizedDescriptionKey];
-            NSError *error = [NSError errorWithDomain:OPTLYErrorHandlerMessagesDomain
-                                                 code:OPTLYErrorTypesEventDispatch
-                                             userInfo:errorMessage];
-            callback(nil, nil, error);
+            callback(nil, nil, nil);
         }
         return;
     }
diff --git a/OptimizelySDKEventDispatcher/OptimizelySDKEventDispatcherTests/OPTLYEventDispatcherTest.m b/OptimizelySDKEventDispatcher/OptimizelySDKEventDispatcherTests/OPTLYEventDispatcherTest.m
@@ -30,8 +30,8 @@ @interface OPTLYEventDispatcher(test)
 @property (nonatomic, strong) OPTLYDataStore *dataStore;
 @property (nonatomic, strong) NSTimer *timer;
 @property (nonatomic, assign) NSInteger maxDispatchBackoffRetries;
-@property (nonatomic, assign) uint32_t dispatchEventBackoffRetries;
-@property (nonatomic, assign) uint32_t dispatchEventCall;
+@property (nonatomic, assign) uint32_t flushEventBackoffRetries;
+@property (nonatomic, assign) uint32_t flushEventCall;
 - (void)flushSavedEvent:(NSDictionary *)event
               eventType:(OPTLYDataStoreEventType)eventType
              cachedData:(BOOL)cachedData
@@ -63,7 +63,7 @@ - (void)setUp {
     self.testURL = [NSURL URLWithString:kTestURLString];
     self.parameters = @{@"testKey1" : @"testValue2", @"testKey2" : @"testValue2"};
     self.eventDispatcher = [OPTLYEventDispatcher new];
-    self.eventDispatcher.dispatchEventBackoffRetries = 0;
+    self.eventDispatcher.flushEventBackoffRetries = 0;
 }
 
 - (void)tearDown {
@@ -198,12 +198,6 @@ - (void)eventDispatchFailureCheck:(OPTLYDataStoreEventType)eventType {
 // test dispatch attempt does not exceed the max retries
 // also check that the dispatch attempt is only made at power of 2 attempt count
 - (void)testMaxDispatchBackoffRetriesAndPowerOf2 {
-    
-    BOOL usedCachedData = NO;
-#if TARGET_OS_TV
-    usedCachedData = YES;
-#endif
-    
     [self stubFailureResponse];
     
     OPTLYEventDispatcher *eventDispatcher = [OPTLYEventDispatcher initWithBuilderBlock:^(OPTLYEventDispatcherBuilder *builder) {
@@ -223,25 +217,25 @@ - (void)testMaxDispatchBackoffRetriesAndPowerOf2 {
     }
     __weak typeof(self) weakSelf = self;
     for (NSInteger i = 1; i < numberOfRetries; ++i) {
-        //NSLog(@"Dispatch attempt - %ld. Dispatch event call - %u", i, eventDispatcher.dispatchEventCall);
+        //NSLog(@"Dispatch attempt - %ld. Dispatch event call - %u", i, eventDispatcher.flushEventCall);
         [eventDispatcher flushEvents:^{
-            NSLog(@"************ i - %ld, backoff retry - %u, dispatch call - %u", i, eventDispatcher.dispatchEventBackoffRetries, eventDispatcher.dispatchEventCall);
+            NSLog(@"************ i - %ld, backoff retry - %u, dispatch call - %u", i, eventDispatcher.flushEventBackoffRetries, eventDispatcher.flushEventCall);
             // check that the dispatch attempt is only made at power of 2 attempt count
             NSInteger backoffRetryExpected = log2(i)+1;
-            XCTAssert(eventDispatcher.dispatchEventBackoffRetries == backoffRetryExpected, @"Invalid value for the backoff retry count - %ld, %u, %ld", i, eventDispatcher.dispatchEventBackoffRetries, backoffRetryExpected);
+            XCTAssert(eventDispatcher.flushEventBackoffRetries == backoffRetryExpected, @"Invalid value for the backoff retry count - %ld, %u, %ld", i, eventDispatcher.flushEventBackoffRetries, backoffRetryExpected);
             
-            XCTAssert(eventDispatcher.dispatchEventBackoffRetries <= eventDispatcher.maxDispatchBackoffRetries + 1, @"dispatch retries exceeded max - %u", eventDispatcher.dispatchEventBackoffRetries);
+            XCTAssert(eventDispatcher.flushEventBackoffRetries <= eventDispatcher.maxDispatchBackoffRetries + 1, @"dispatch retries exceeded max - %u", eventDispatcher.flushEventBackoffRetries);
             
-            NSLog(@"dispatchEventCall - %u", eventDispatcher.dispatchEventCall);
-            if (eventDispatcher.dispatchEventCall == numberOfRetries - 1) {
+            NSLog(@"flushEventCall - %u", eventDispatcher.flushEventCall);
+            if (eventDispatcher.flushEventCall == numberOfRetries - 1) {
                 [weakSelf checkNetworkTimerIsEnabled:eventDispatcher
                                         timeInterval:kEventHandlerDispatchInterval];
                 [expectation fulfill];
             }
         }];
     }
 
-    [self waitForExpectationsWithTimeout:20.0 handler:^(NSError *error) {
+    [self waitForExpectationsWithTimeout:5.0 handler:^(NSError *error) {
         if (error) {
             NSLog(@"Timeout error for dispatchConversionEvent: %@", error);
         }
@@ -250,11 +244,6 @@ - (void)testMaxDispatchBackoffRetriesAndPowerOf2 {
 
 - (void)testflushEventsSuccessSavedEvents {
     
-    BOOL usedCachedData = NO;
-#if TARGET_OS_TV
-    usedCachedData = YES;
-#endif
-    
     [self stubSuccessResponse];
     
     XCTestExpectation *expectation = [self expectationWithDescription:@"Wait for dispatchConversionEvent failure."];
@@ -282,11 +271,6 @@ - (void)testflushEventsSuccessSavedEvents {
 
 - (void)testflushEventsSuccessNoSavedEvents {
     
-    BOOL usedCachedData = NO;
-#if TARGET_OS_TV
-    usedCachedData = YES;
-#endif
-    
     [self stubSuccessResponse];
     
     XCTestExpectation *expectation = [self expectationWithDescription:@"Wait for dispatchConversionEvent failure."];
@@ -308,11 +292,6 @@ - (void)testflushEventsSuccessNoSavedEvents {
 
 - (void)testflushEventsFailureSavedEvents {
     
-    BOOL usedCachedData = NO;
-#if TARGET_OS_TV
-    usedCachedData = YES;
-#endif
-    
     [self stubSuccessResponse];
     
     XCTestExpectation *expectation = [self expectationWithDescription:@"Wait for dispatchConversionEvent failure."];
