[FME-6995] - Pausing - E2E Test 3

Split/Storage/RuleBasedSegments/RuleBasedSegmentsStorage.swift

@@ -33,6 +33,7 @@ class DefaultRuleBasedSegmentsStorage: RuleBasedSegmentsStorage {
     }
 
     func loadLocal() {
+        segmentsInUse = persistentStorage.getSegmentsInUse()
         let snapshot = persistentStorage.getSnapshot()
         let active = snapshot.segments.filter { $0.status == .active }
         let archived = snapshot.segments.filter { $0.status == .archived }

Split/Storage/Splits/PersistentSplitsStorage.swift

@@ -17,7 +17,7 @@ protocol PersistentSplitsStorage {
     func getSplitsSnapshot() -> SplitsSnapshot
     func getChangeNumber() -> Int64
     func getUpdateTimestamp() -> Int64
-    func getSegmentsInUse() -> Int64
+    func getSegmentsInUse() -> Int64?
     func getAll() -> [Split]
     func delete(splitNames: [String])
     func clear()
@@ -64,8 +64,8 @@ class DefaultPersistentSplitsStorage: PersistentSplitsStorage {
         return generalInfoDao.stringValue(info: .flagsSpec) ?? ""
     }
 
-    func getSegmentsInUse() -> Int64 {
-        generalInfoDao.longValue(info: .segmentsInUse) ?? 0
+    func getSegmentsInUse() -> Int64? {
+        generalInfoDao.longValue(info: .segmentsInUse)
     }
 
     func update(bySetsFilter filter: SplitFilter?) {

Split/Storage/Splits/SplitsStorage.swift

@@ -51,7 +51,7 @@ class DefaultSplitsStorage: SplitsStorage {
     func loadLocal() {
 
         // Ensure count of Flags with Segments (for optimization feature)
-        segmentsInUse = persistentStorage.getSegmentsInUse()
+        segmentsInUse = persistentStorage.getSegmentsInUse() ?? 0
         defer { persistentStorage.update(segmentsInUse: segmentsInUse) }
 
         let snapshot = persistentStorage.getSplitsSnapshot()
@@ -98,7 +98,7 @@ class DefaultSplitsStorage: SplitsStorage {
     func update(splitChange: ProcessedSplitChange) -> Bool {
 
         // Ensure count of Flags with Segments (for optimization feature)
-        segmentsInUse = persistentStorage.getSegmentsInUse()
+        segmentsInUse = persistentStorage.getSegmentsInUse() ?? 0
         defer { persistentStorage.update(segmentsInUse: segmentsInUse) }
 
         // Process
@@ -145,6 +145,7 @@ class DefaultSplitsStorage: SplitsStorage {
         var splitsRemoved = false
 
         for split in splits {
+
             guard let splitName = split.name?.lowercased()  else {
                 Logger.e("Invalid feature flag name received while updating feature flags")
                 continue

SplitTests/Fake/Storage/PersistentSplitsStorageStub.swift

@@ -93,7 +93,7 @@ class PersistentSplitsStorageStub: PersistentSplitsStorage {
         self.segmentsInUse = segmentsInUse
     }
 
-    func getSegmentsInUse() -> Int64 {
+    func getSegmentsInUse() -> Int64? {
         getSegmentsInUseCalled = true
         return segmentsInUse
     }

SplitTests/Helpers/SplitTestHelper.swift

@@ -177,7 +177,6 @@ class SplitTestHelper {
     }
 
     static func newSplit(name: String, trafficType: String) -> Split {
-
         let splitJSONExample = """
               {
               "trafficTypeName":"\(trafficType)",