revert all test changes

Author: jaredmixpanel

MixpanelDemo/MixpanelDemoMacTests/MixpanelBaseTests.swift

@@ -104,19 +104,19 @@ class MixpanelBaseTests: XCTestCase, MixpanelDelegate {
     }
 
     func eventQueue(token: String) -> Queue {
-        return MixpanelPersistence.init(instanceName: token).loadEntitiesInBatch(type: .events)
+        return MixpanelPersistence.init(token: token).loadEntitiesInBatch(type: .events)
     }
 
     func peopleQueue(token: String) -> Queue {
-        return MixpanelPersistence.init(instanceName: token).loadEntitiesInBatch(type: .people)
+        return MixpanelPersistence.init(token: token).loadEntitiesInBatch(type: .people)
     }
 
     func unIdentifiedPeopleQueue(token: String) -> Queue {
-        return MixpanelPersistence.init(instanceName: token).loadEntitiesInBatch(type: .people, flag: PersistenceConstant.unIdentifiedFlag)
+        return MixpanelPersistence.init(token: token).loadEntitiesInBatch(type: .people, flag: PersistenceConstant.unIdentifiedFlag)
     }
 
     func groupQueue(token: String) -> Queue {
-        return MixpanelPersistence.init(instanceName: token).loadEntitiesInBatch(type: .groups)
+        return MixpanelPersistence.init(token: token).loadEntitiesInBatch(type: .groups)
     }
 
     func flushAndWaitForTrackingQueue(_ mixpanel: MixpanelInstance) {

MixpanelDemo/MixpanelDemoTests/MixpanelAutomaticEventsTests.swift

@@ -30,7 +30,7 @@ class MixpanelAutomaticEventsTests: MixpanelBaseTests {
         XCTAssertNotNil(event, "Should have an event")
         XCTAssertEqual(event?["event"] as? String, "$ae_session", "should be app session event")
         XCTAssertNotNil((event?["properties"] as? [String: Any])?["$ae_session_length"], "should have session length")
-        removeDBFileForInstance(testMixpanel)
+        removeDBfile(testMixpanel.apiToken)
     }
 
     func testKeepAutomaticEventsIfNetworkNotAvailable() {
@@ -43,7 +43,7 @@ class MixpanelAutomaticEventsTests: MixpanelBaseTests {
         let event = eventQueue(token: testMixpanel.apiToken).last
         XCTAssertTrue(eventQueue(token: testMixpanel.apiToken).count == 2, "automatic events should be accumulated if device is offline")
         XCTAssertEqual(event?["event"] as? String, "$ae_session", "should be app session event")
-        removeDBFileForInstance(testMixpanel)
+        removeDBfile(testMixpanel.apiToken)
     }
 
     func testDiscardAutomaticEventsIftrackAutomaticEventsEnabledIsFalse() {
@@ -53,7 +53,7 @@ class MixpanelAutomaticEventsTests: MixpanelBaseTests {
                                               with: Notification(name: Notification.Name(rawValue: "test")))
         waitForTrackingQueue(testMixpanel)
         XCTAssertTrue(eventQueue(token: testMixpanel.apiToken).count == 0, "automatic events should not be tracked")
-        removeDBFileForInstance(testMixpanel)
+        removeDBfile(testMixpanel.apiToken)
     }
 
     func testFlushAutomaticEventsIftrackAutomaticEventsEnabledIsTrue() {
@@ -66,7 +66,7 @@ class MixpanelAutomaticEventsTests: MixpanelBaseTests {
 
         flushAndWaitForTrackingQueue(testMixpanel)
         XCTAssertTrue(eventQueue(token: testMixpanel.apiToken).count == 0, "automatic events should be flushed")
-        removeDBFileForInstance(testMixpanel)
+        removeDBfile(testMixpanel.apiToken)
     }
 
     func testUpdated() {
@@ -89,7 +89,6 @@ class MixpanelAutomaticEventsTests: MixpanelBaseTests {
         mp2.minimumSessionDuration = 0;
         waitForTrackingQueue(mp2)
         XCTAssertEqual(eventQueue(token: mp2.apiToken).count, 0, "First app open should not be tracked again")
-        removeDBFileForInstance(mp)
     }
 
     func testAutomaticEventsInMultipleInstances() {
@@ -125,7 +124,7 @@ class MixpanelAutomaticEventsTests: MixpanelBaseTests {
         let otherAppSessionEvent = eventQueue(token: mp2.apiToken).last
         XCTAssertEqual(otherAppSessionEvent?["event"] as? String, "$ae_session", "should be app session event")
         XCTAssertNotNil((otherAppSessionEvent?["properties"] as? [String: Any])?["$ae_session_length"], "should have session length")
-        removeDBFileForInstance(mp)
-        removeDBFileForInstance(mp2)
+        removeDBfile(mp.apiToken)
+        removeDBfile(mp2.apiToken)
     }
 }

MixpanelDemo/MixpanelDemoTests/MixpanelBaseTests.swift

@@ -29,7 +29,7 @@ class MixpanelBaseTests: XCTestCase, MixpanelDelegate {
         super.tearDown()
     }
 
-    func removeDBFileForToken(_ token: String? = nil) {
+    func removeDBfile(_ token: String? = nil) {
         do {
              let fileManager = FileManager.default
 
@@ -47,12 +47,6 @@ class MixpanelBaseTests: XCTestCase, MixpanelDelegate {
         }
     }
 
-    func removeDBFileForInstance(_ instance: MixpanelInstance? = nil) {
-        instance?.mixpanelPersistence.mpdb.close()
-        let token = instance?.name
-        removeDBFileForToken(token)
-    }
-    
     func dbFilePath(_ token: String? = nil) -> String {
         let manager = FileManager.default
         #if os(iOS)
@@ -64,7 +58,7 @@ class MixpanelBaseTests: XCTestCase, MixpanelDelegate {
             return ""
         }
 
-        guard let urlUnwrapped = url?.appendingPathComponent("\(apiToken)_MPDB.sqlite").path else {
+        guard let urlUnwrapped = url?.appendingPathComponent("\(token ?? apiToken)_MPDB.sqlite").path else {
             return ""
         }
         return urlUnwrapped