fix: fix nit

amplitude · Aug 6, 2024 · 101b34a · 101b34a
1 parent fc67118
commit 101b34a
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 60 deletions.
diff --git a/Sources/Amplitude/Configuration.swift b/Sources/Amplitude/Configuration.swift
@@ -38,7 +38,7 @@ public class Configuration {
     }() {
         didSet {
             defaultTracking.delegate = self
-            autocapture = defaultTracking.toAutocaptureOptions
+            autocapture = defaultTracking.autocaptureOptions
         }
     }
     public internal(set) var autocapture: AutocaptureOptions
@@ -97,7 +97,7 @@ public class Configuration {
             enableCoppaControl: enableCoppaControl,
             flushEventsOnClose: flushEventsOnClose,
             minTimeBetweenSessionsMillis: minTimeBetweenSessionsMillis,
-            autocapture: defaultTracking.toAutocaptureOptions,
+            autocapture: defaultTracking.autocaptureOptions,
             identifyBatchIntervalMillis: identifyBatchIntervalMillis,
             migrateLegacyData: migrateLegacyData,
             offline: offline)
@@ -182,3 +182,10 @@ public class Configuration {
         return Configuration.getNormalizeInstanceName(self.instanceName)
     }
 }
+
+extension Configuration: DefaultTrackingOptionsDelegate {
+    @available(*, deprecated)
+    func didChangeOptions(options: DefaultTrackingOptions) {
+        autocapture = options.autocaptureOptions
+    }
+}
diff --git a/Sources/Amplitude/DefaultTrackingOptions.swift b/Sources/Amplitude/DefaultTrackingOptions.swift
@@ -1,5 +1,10 @@
 import Foundation
 
+protocol DefaultTrackingOptionsDelegate: AnyObject {
+    @available(*, deprecated)
+    func didChangeOptions(options: DefaultTrackingOptions)
+}
+
 @available(*, deprecated, renamed: "AutocaptureOptions", message: "Please use `AutocaptureOptions` instead")
 public class DefaultTrackingOptions {
     public static var ALL: DefaultTrackingOptions {
@@ -29,7 +34,7 @@ public class DefaultTrackingOptions {
 
     weak var delegate: DefaultTrackingOptionsDelegate?
 
-    var toAutocaptureOptions: AutocaptureOptions {
+    var autocaptureOptions: AutocaptureOptions {
         return [
             sessions ? .sessions : [],
             appLifecycles ? .appLifecycles : [],
@@ -52,15 +57,3 @@ public class DefaultTrackingOptions {
         self.delegate = delegate
     }
 }
-
-protocol DefaultTrackingOptionsDelegate: AnyObject {
-    @available(*, deprecated)
-    func didChangeOptions(options: DefaultTrackingOptions)
-}
-
-extension Configuration: DefaultTrackingOptionsDelegate {
-    @available(*, deprecated)
-    func didChangeOptions(options: DefaultTrackingOptions) {
-        autocapture = options.toAutocaptureOptions
-    }
-}
diff --git a/Tests/AmplitudeTests/AutocaptureOptionsTests.swift b/Tests/AmplitudeTests/AutocaptureOptionsTests.swift
@@ -18,4 +18,49 @@ final class AutocaptureOptionsTests: XCTestCase {
         XCTAssertFalse(options.contains(.sessions))
         XCTAssertTrue(options.contains(.elementInteractions))
     }
+
+    func testDefaultTrackingOptionChangesReflectInAutocapture() {
+        let configuration = Configuration(
+            apiKey: "test-api-key"
+        )
+
+        XCTAssertTrue(configuration.autocapture.contains(.sessions))
+
+        (configuration as DeprecationWarningDiscardable).setDefaultTrackingOptions(sessions: false, appLifecycles: true, screenViews: true)
+
+        XCTAssertFalse(configuration.autocapture.contains(.sessions))
+        XCTAssertTrue(configuration.autocapture.contains(.appLifecycles))
+        XCTAssertTrue(configuration.autocapture.contains(.screenViews))
+    }
+
+    func testDefaultTrackingInstanceChangeReflectInAutocapture() {
+        let configuration = Configuration(
+            apiKey: "test-api-key"
+        )
+
+        (configuration as DeprecationWarningDiscardable).setDefaultTracking(sessions: false, appLifecycles: true, screenViews: true)
+
+        XCTAssertFalse(configuration.autocapture.contains(.sessions))
+        XCTAssertTrue(configuration.autocapture.contains(.appLifecycles))
+        XCTAssertTrue(configuration.autocapture.contains(.screenViews))
+    }
+}
+
+private protocol DeprecationWarningDiscardable {
+    func setDefaultTracking(sessions: Bool, appLifecycles: Bool, screenViews: Bool)
+    func setDefaultTrackingOptions(sessions: Bool, appLifecycles: Bool, screenViews: Bool)
+}
+
+extension Configuration: DeprecationWarningDiscardable {
+    @available(*, deprecated)
+    func setDefaultTracking(sessions: Bool, appLifecycles: Bool, screenViews: Bool) {
+        defaultTracking = DefaultTrackingOptions(sessions: sessions, appLifecycles: appLifecycles, screenViews: screenViews)
+    }
+
+    @available(*, deprecated)
+    func setDefaultTrackingOptions(sessions: Bool, appLifecycles: Bool, screenViews: Bool) {
+        defaultTracking.sessions = sessions
+        defaultTracking.appLifecycles = appLifecycles
+        defaultTracking.screenViews = screenViews
+    }
 }
diff --git a/Tests/AmplitudeTests/ConfigurationTests.swift b/Tests/AmplitudeTests/ConfigurationTests.swift
@@ -88,49 +88,4 @@ final class ConfigurationTests: XCTestCase {
         XCTAssertTrue(eventStorageUrl?.contains(expectedStoragePostfix) ?? false)
         XCTAssertTrue(identifyStorageUrl?.contains(expectedStoragePostfix) ?? false)
     }
-
-    func testDefaultTrackingOptionChangesReflectInAutocapture() {
-        let configuration = Configuration(
-            apiKey: "test-api-key"
-        )
-
-        XCTAssertTrue(configuration.autocapture.contains(.sessions))
-
-        (configuration as DeprecationWarningDiscardable).setDefaulTrackingOptions(sessions: false, appLifecycles: true, screenViews: true)
-
-        XCTAssertFalse(configuration.autocapture.contains(.sessions))
-        XCTAssertTrue(configuration.autocapture.contains(.appLifecycles))
-        XCTAssertTrue(configuration.autocapture.contains(.screenViews))
-    }
-
-    func testDefaultTrackingInstanceChangeReflectInAutocapture() {
-        let configuration = Configuration(
-            apiKey: "test-api-key"
-        )
-
-        (configuration as DeprecationWarningDiscardable).setDefaulTracking(sessions: false, appLifecycles: true, screenViews: true)
-
-        XCTAssertFalse(configuration.autocapture.contains(.sessions))
-        XCTAssertTrue(configuration.autocapture.contains(.appLifecycles))
-        XCTAssertTrue(configuration.autocapture.contains(.screenViews))
-    }
-}
-
-private protocol DeprecationWarningDiscardable {
-    func setDefaulTracking(sessions: Bool, appLifecycles: Bool, screenViews: Bool)
-    func setDefaulTrackingOptions(sessions: Bool, appLifecycles: Bool, screenViews: Bool)
-}
-
-extension Configuration: DeprecationWarningDiscardable {
-    @available(*, deprecated)
-    func setDefaulTracking(sessions: Bool, appLifecycles: Bool, screenViews: Bool) {
-        defaultTracking = DefaultTrackingOptions(sessions: sessions, appLifecycles: appLifecycles, screenViews: screenViews)
-    }
-
-    @available(*, deprecated)
-    func setDefaulTrackingOptions(sessions: Bool, appLifecycles: Bool, screenViews: Bool) {
-        defaultTracking.sessions = sessions
-        defaultTracking.appLifecycles = appLifecycles
-        defaultTracking.screenViews = screenViews
-    }
 }