Fixes for improving code coverage keeping coveralls coverage report in mind. (#217)

* Test-cases implemented to increase coverage.

Author: yasirfolio3

OptimizelySDK/Customization/DefaultEventDispatcher.swift

@@ -28,17 +28,17 @@ open class DefaultEventDispatcher: BackgroundingCallbacks, OPTEventDispatcher {
     static let MAX_FAILURE_COUNT = 3
 
     // default timerInterval
-    var timerInterval:TimeInterval // every minute
+    var timerInterval: TimeInterval // every minute
     // default batchSize.
     // attempt to send events in batches with batchSize number of events combined
-    var batchSize:Int
+    var batchSize: Int
     // start trimming the front of the queue when we get to over maxQueueSize
     // TODO: implement
     var maxQueueSize: Int = 30000
 
     lazy var logger = OPTLoggerFactory.getLogger()
-    var backingStore:DataStoreType
-    var backingStoreName:String
+    var backingStore: DataStoreType
+    var backingStoreName: String
 
     // for dispatching events
     let dispatcher = DispatchQueue(label: "DefaultEventDispatcherQueue")
@@ -47,7 +47,7 @@ open class DefaultEventDispatcher: BackgroundingCallbacks, OPTEventDispatcher {
     // timer as a atomic property.
     var timer: AtomicProperty<Timer> = AtomicProperty<Timer>()
 
-    public init(batchSize:Int = 10, backingStore:DataStoreType = .file, dataStoreName:String = "OPTEventQueue", timerInterval:TimeInterval = 60*1 ) {
+    public init(batchSize: Int = 10, backingStore: DataStoreType = .file, dataStoreName: String = "OPTEventQueue", timerInterval: TimeInterval = 60*1 ) {
         self.batchSize = batchSize > 0 ? batchSize : 1
         self.backingStore = backingStore
         self.backingStoreName = dataStoreName
@@ -240,12 +240,11 @@ open class DefaultEventDispatcher: BackgroundingCallbacks, OPTEventDispatcher {
             self.timer.property = Timer.scheduledTimer(withTimeInterval: self.timerInterval, repeats: true) { (timer) in
                 self.dispatcher.async {
                     if self.dataStore.count == 0 {
-                        self.timer.performAtomic() { (timer) in
+                        self.timer.performAtomic {(timer) in
                             timer.invalidate()
                         }
                         self.timer.property = nil
-                    }
-                    else {
+                    } else {
                         self.flushEvents()
                     }
                 }

OptimizelySDK/Extensions/Array+Extension.swift

@@ -67,11 +67,13 @@ extension Array where Element == ThrowableCondition {
             throw OptimizelyError.conditionInvalidFormat("NOT with empty items")
         }
 
+        var error: OptimizelyError!
         do {
             let result = try eval()
             return !result
-        } catch let error as OptimizelyError {
-            throw OptimizelyError.conditionInvalidFormat("NOT with invalid items [\(error.reason)]")
+        } catch let err as OptimizelyError {
+            error = OptimizelyError.conditionInvalidFormat("NOT with invalid items [\(err.reason)]")
         }
+        throw error
     }
 }

OptimizelySDK/Extensions/ArrayEventForDispatch+Extension.swift

@@ -18,11 +18,7 @@ import Foundation
 
 extension Array where Element == EventForDispatch {
     func batch() -> EventForDispatch? {
-        if count == 0 {
-            return nil
-        }
-        
-        if count == 1 {
+        if count < 2 {
             return first
         }
 
@@ -31,27 +27,19 @@ extension Array where Element == EventForDispatch {
         var projectId: String?
 
         let checkUrl = { (event: EventForDispatch) -> Bool in
-            if let url = url {
-                if url != event.url {
-                    return false
-                }
-            } else {
+            if url == nil {
                 url = event.url
+                return true
             }
-            
-            return true
+            return url == event.url
         }
 
         let checkProjectId = { (batchEvent: BatchEvent) -> Bool in
-            if let projectId = projectId {
-                if projectId != batchEvent.projectID {
-                    return false
-                }
-            } else {
+            if projectId == nil {
                 projectId = batchEvent.projectID
+                return true
             }
-            
-            return true
+            return projectId == batchEvent.projectID
         }
 
         var firstBatchEvent: BatchEvent?
@@ -69,19 +57,21 @@ extension Array where Element == EventForDispatch {
             }
         }
 
-        if let first = firstBatchEvent {
-            let batchEvent = BatchEvent(revision: first.revision,
-                                        accountID: first.accountID,
-                                        clientVersion: first.clientVersion,
-                                        visitors: visitors,
-                                        projectID: first.projectID,
-                                        clientName: first.clientName,
-                                        anonymizeIP: first.anonymizeIP,
-                                        enrichDecisions: true)
-            
-            if let data = try? JSONEncoder().encode(batchEvent), let url = url {
-                return EventForDispatch(url: url, body: data)
-            }
+        guard let first = firstBatchEvent, let tmpUrl = url else {
+            return nil
+        }
+        
+        let batchEvent = BatchEvent(revision: first.revision,
+                                    accountID: first.accountID,
+                                    clientVersion: first.clientVersion,
+                                    visitors: visitors,
+                                    projectID: first.projectID,
+                                    clientName: first.clientName,
+                                    anonymizeIP: first.anonymizeIP,
+                                    enrichDecisions: true)
+        
+        if let data = try? JSONEncoder().encode(batchEvent) {
+            return EventForDispatch(url: tmpUrl, body: data)
         }
         return nil
     }

OptimizelySDK/Implementation/Datastore/DataStoreFile.swift

@@ -18,7 +18,7 @@ import Foundation
 
 /// Implementation of OPTDataStore as a generic for per type storeage in a flat file.
 /// This class should be used as a singleton per storeName and type (T)
-public class DataStoreFile<T> : OPTDataStore where T: Codable {
+public class DataStoreFile<T>: OPTDataStore where T: Codable {
     let dataStoreName: String
     let lock: DispatchQueue
     let url: URL

OptimizelySDK/Implementation/Datastore/DataStoreMemory.swift

@@ -20,7 +20,7 @@ import UIKit
 /// Implementation of OPTDataStore as a generic for per type storeage in memory. On background and foreground
 /// the file is saved.
 /// This class should be used as a singleton per storeName and type (T)
-public class DataStoreMemory<T> : BackgroundingCallbacks, OPTDataStore where T: Codable {
+public class DataStoreMemory<T>: BackgroundingCallbacks, OPTDataStore where T: Codable {
     let dataStoreName: String
     let lock: DispatchQueue
     let url: URL
@@ -79,7 +79,7 @@ public class DataStoreMemory<T> : BackgroundingCallbacks, OPTDataStore where T:
         }
     }
 
-    private func save(forKey: String, value: Any) {
+    func save(forKey: String, value: Any) {
         lock.async {
             do {
                 if let value = value as? T {

OptimizelySDK/Implementation/Datastore/DataStoreQueueStackImpl.swift

@@ -17,7 +17,7 @@
 import Foundation
 
 /// Implementation of DataStoreQueueStack that takes a DataStore as a instance variable allowing for different datastore imlementations.  It is a generic and will work with any data type that supports Codable.  Keep in mind that whichever data store you use, this class stores it as Array<Data>.  Instances of DataStoreQueueStackImpl should be singletons per queueStackName (which usually corrolates to the data type as well depending on producer/consumer).
-public class DataStoreQueueStackImpl<T> : DataStoreQueueStack where T: Codable {
+public class DataStoreQueueStackImpl<T>: DataStoreQueueStack where T: Codable {
     let queueStackName: String
     let lock: DispatchQueue
     let dataStore: OPTDataStore