Fixed tvOS test failures.

Author: alda-optimizely

OptimizelySDKCore/OptimizelySDKCore/OPTLYQueue.m

@@ -89,15 +89,15 @@ - (NSArray *)dequeueNItems:(NSInteger)numberOfItems {
 }
 
 - (NSInteger)size {
-    return [self.queue count];
+    return [self.mutableQueue count];
 }
 
 - (bool)isFull {
-    return ([self.queue count] >= self.maxQueueSize);
+    return ([self.mutableQueue count] >= self.maxQueueSize);
 }
 
 - (bool)isEmpty {
-    return [self.queue count] == 0;
+    return [self.mutableQueue count] == 0;
 }
 
 - (NSArray *)queue {

OptimizelySDKEventDispatcher/OptimizelySDKEventDispatcherTests/OPTLYEventDispatcherTest.m

@@ -256,7 +256,14 @@ - (void)testFlushEventsSuccessSavedEvents {
 
     __weak typeof(self) weakSelf = self;
     [self.eventDispatcher flushEvents:^{
-        [weakSelf checkNetworkTimerIsEnabled:weakSelf.eventDispatcher timeInterval:OPTLYEventDispatcherDefaultDispatchIntervalTime_ms];
+        NSArray *savedEvents = [self.eventDispatcher.dataStore getAllEvents:OPTLYDataStoreEventTypeConversion
+                                                                 cachedData:NO
+                                                                      error:nil];
+        NSArray *cachedEvents = [self.eventDispatcher.dataStore getAllEvents:OPTLYDataStoreEventTypeConversion
+                                                                  cachedData:YES
+                                                                       error:nil];
+        XCTAssert([savedEvents count] == 0, @"Saved events should have been removed.");
+        XCTAssert([cachedEvents count] == 0, @"Cached events should have been removed.");
         [expectation fulfill];
 
     }];
@@ -279,7 +286,6 @@ - (void)testFlushEventsSuccessNoSavedEvents {
     [self.eventDispatcher flushEvents:^{
         [weakSelf checkNetworkTimerIsDisabled:weakSelf.eventDispatcher];
         [expectation fulfill];
-        
     }];
 
     [self waitForExpectationsWithTimeout:10.0 handler:^(NSError *error) {
@@ -310,6 +316,41 @@ - (void)testFlushEventsFailureSavedEvents {
     }];
 }
 
+// if there are some saved events, then a successful flushSaveEvent should keep the timer enabled
+- (void)testFlushSavedEventSuccessWithSavedEvents
+{
+    BOOL usedCachedData = NO;
+#if TARGET_OS_TV
+    usedCachedData = YES;
+#endif
+    [self stubSuccessResponse];
+    [self.eventDispatcher setupNetworkTimer:nil];
+    
+    for (NSInteger i = 0; i < 3; ++i) {
+        [self.eventDispatcher saveEvent:self.parameters
+                              eventType:OPTLYDataStoreEventTypeConversion
+                                  error:nil];
+    }
+    
+    __block XCTestExpectation *expectation = [self expectationWithDescription:@"Wait for dispatchConversionEvent failure."];
+    __weak typeof(self) weakSelf = self;
+    [self.eventDispatcher flushSavedEvent:self.parameters eventType:OPTLYDataStoreEventTypeConversion cachedData:usedCachedData callback:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
+        NSArray *events = [self.eventDispatcher.dataStore getAllEvents:OPTLYDataStoreEventTypeConversion
+                                                            cachedData:usedCachedData
+                                                                 error:nil];
+        XCTAssert([events count] == 2, @"Event should have been removed.");
+        [weakSelf checkNetworkTimerIsEnabled:weakSelf.eventDispatcher timeInterval:OPTLYEventDispatcherDefaultDispatchIntervalTime_ms];
+        
+        [expectation fulfill];
+    }];
+    
+    [self waitForExpectationsWithTimeout:10.0 handler:^(NSError *error) {
+        if (error) {
+            NSLog(@"Timeout error for dispatchConversionEvent: %@", error);
+        }
+    }];
+}
+
 - (void)testFlushSavedEventSuccess
 {
     BOOL usedCachedData = NO;