(fix): fix registry lookup and add a unit test for optimizely change notifi… (#191)

* fix registery lookup and add a unit test for optimizely change notifications

* cleanup some tests

* remove all registered services in teardown.

Author: thomaszurkan-optimizely

OptimizelySDK/Customization/DefaultEventDispatcher.swift

@@ -175,7 +175,7 @@ open class DefaultEventDispatcher : BackgroundingCallbacks, OPTEventDispatcher {
                             }
                         }
                         else {
-                            // batch worked
+                            // batch had batchSize items
                         }
                     }
                     // our send is done.

OptimizelySDK/OptimizelyTests/OptimizelyTests-Common/DatafileHandlerTests.swift

@@ -19,6 +19,8 @@ import XCTest
 class DatafileHandlerTests: XCTestCase {
 
     override func setUp() {
+        
+        HandlerRegistryService.shared.binders.removeAll()
         // Put setup code here. This method is called before the invocation of each test method in the class.
         if let url = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first {
             if (!FileManager.default.fileExists(atPath: url.path)) {
@@ -36,6 +38,7 @@ class DatafileHandlerTests: XCTestCase {
 
     override func tearDown() {
         // Put teardown code here. This method is called after the invocation of each test method in the class.
+        HandlerRegistryService.shared.binders.removeAll()
     }
 
     func testDatafileHandler() {
@@ -102,6 +105,39 @@ class DatafileHandlerTests: XCTestCase {
 
 
     }
+    
+    func testPeriodicDownloadWithOptimizlyClient() {
+        class FakeDatafileHandler : DefaultDatafileHandler {
+            let data = OTUtils.loadJSONDatafile("typed_audience_datafile")
+            override func downloadDatafile(sdkKey: String, resourceTimeoutInterval: Double?, completionHandler: @escaping DatafileDownloadCompletionHandler) {
+                completionHandler(.success(data))
+            }
+        }
+        let expection = XCTestExpectation(description: "Expect 10 periodic downloads")
+        let handler = FakeDatafileHandler()
+
+        HandlerRegistryService.shared.registerBinding(binder: Binder(service: OPTDatafileHandler.self).sdkKey(key: "notrealkey123").using(instance: handler).to(factory: FakeDatafileHandler.init).reInitializeStrategy(strategy: .reUse).singetlon())
+        
+        let optimizely = OptimizelyClient(sdkKey: "notrealkey123", periodicDownloadInterval:1)
+
+        var count = 0
+        
+        let _ = optimizely.notificationCenter.addDatafileChangeNotificationListener { (data) in
+            count += 1
+            if count == 9 {
+                optimizely.datafileHandler.stopPeriodicUpdates()
+                expection.fulfill()
+            }
+        }
+        optimizely.start() { (result) in
+            XCTAssert(true)
+        }
+        wait(for: [expection], timeout: 10)
+        
+        XCTAssert(count == 9)
+        
+    }
+
 
     func testPerformanceExample() {
         // This is an example of a performance test case.

OptimizelySDK/OptimizelyTests/OptimizelyTests-Common/DecisionServiceTests.swift

@@ -46,11 +46,4 @@ class DecisionServiceTests: XCTestCase {
 
     }
 
-    func testPerformanceExample() {
-        // This is an example of a performance test case.
-        self.measure {
-            // Put the code you want to measure the time of here.
-        }
-    }
-
 }

OptimizelySDK/OptimizelyTests/OptimizelyTests-Common/EventDispatcherTests.swift

@@ -48,9 +48,8 @@ class EventDispatcherTests: XCTestCase {
     }
 
     func testDefaultDispatcher() {
-        eventDispatcher = DefaultEventDispatcher()
+        eventDispatcher = DefaultEventDispatcher(timerInterval:1)
         let pEventD:OPTEventDispatcher = eventDispatcher!
-        eventDispatcher?.timerInterval = 1
 
         pEventD.flushEvents()
 
@@ -297,13 +296,5 @@ class EventDispatcherTests: XCTestCase {
         let _ = queue.removeLastItem()
 
         XCTAssert(queue.count == 0)
-    }
-    
-    func testPerformanceExample() {
-        // This is an example of a performance test case.
-        self.measure {
-            // Put the code you want to measure the time of here.
-        }
-    }
-
+    }    
 }

OptimizelySDK/Utils/HandlerRegistryService.swift

@@ -66,7 +66,7 @@ class HandlerRegistryService {
 
     func lookupComponents(sdkKey:String)->[Any?]? {
 
-        let value = self.binders.keys.filter({$0.sdkKey == sdkKey}).map({self.injectComponent(service: self.binders[$0]!.service)!})
+        let value = self.binders.keys.filter({$0.sdkKey == sdkKey}).map({self.injectComponent(service: self.binders[$0]!.service, sdkKey: sdkKey)!})
 
         return value
     }