fix tests for datafile and events format compat

Author: jaeopt

Tests/OptimizelyTests-Common/DatafileHandlerTests.swift

@@ -525,18 +525,19 @@ class DatafileHandlerTests: XCTestCase {
 
         #if os(tvOS)
         var url = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!
-        url = url.appendingPathComponent(testSDKKey, isDirectory: false)
-        try! datafileData.write(to: url, options: .atomic)
         #else
         var url = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
+        #endif
         url = url.appendingPathComponent(testSDKKey, isDirectory: false)
         try! datafileData.write(to: url, options: .atomic)
-        #endif
 
         // verify that a new datafileHandler can read an existing datafile cache
 
         let datafileFromCache = DefaultDatafileHandler().loadSavedDatafile(sdkKey: testSDKKey)
         XCTAssert(datafileFromCache == datafileData, "failed to support old datafile cached data format")
+        
+        let projectConfig = try! ProjectConfig(datafile: datafileFromCache!)
+        XCTAssert(projectConfig.project.revision == "241")
     }
 
 }

Tests/OptimizelyTests-Common/EventDispatcherTests.swift

@@ -299,21 +299,17 @@ class EventDispatcherTests: XCTestCase {
         let saveFormat = try! JSONEncoder().encode(events)
 
         #if os(tvOS)
-        let dispatcher = MockEventDispatcher(backingStore: .memory)
-        let memoryStore: DataStoreMemory<[Data]> = dispatcher.dataStore.dataStore as! DataStoreMemory
         var url = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!
-        url = url.appendingPathComponent(queueName, isDirectory: false)
-        try! saveFormat.write(to: url, options: .atomic)
-        memoryStore.load(forKey: queueName)
         #else
-        let dispatcher = MockEventDispatcher()
         var url = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
+        #endif
         url = url.appendingPathComponent(queueName, isDirectory: false)
         try! saveFormat.write(to: url, options: .atomic)
-        #endif
 
         // verify that a new dataStore can read an existing queue items
 
+        let dispatcher = MockEventDispatcher()
+        
         XCTAssert(dispatcher.dataStore.count == 2)
         dispatcher.flushEvents()
         dispatcher.dispatcher.sync {}