Move test data classes to their own files

Author: bidetofevil

embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/features/ActivityFeatureTest.kt

@@ -6,7 +6,7 @@ import io.embrace.android.embracesdk.assertions.findSpanOfType
 import io.embrace.android.embracesdk.internal.arch.schema.EmbType
 import io.embrace.android.embracesdk.internal.clock.nanosToMillis
 import io.embrace.android.embracesdk.testframework.SdkIntegrationTestRule
-import io.embrace.android.embracesdk.testframework.actions.EmbraceActionInterface
+import io.embrace.android.embracesdk.testframework.actions.SessionTimestamps
 import io.embrace.android.embracesdk.testframework.assertions.assertMatches
 import org.junit.Assert.assertEquals
 import org.junit.Rule
@@ -24,7 +24,7 @@ internal class ActivityFeatureTest {
 
     @Test
     fun `automatically capture activities`() {
-        var timestamps: EmbraceActionInterface.SessionTimestamps? = null
+        var timestamps: SessionTimestamps? = null
 
         testRule.runTest(
             testCaseAction = {

embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/features/SpanAutoTerminationTest.kt

@@ -10,7 +10,7 @@ import io.embrace.android.embracesdk.internal.payload.SessionPayload
 import io.embrace.android.embracesdk.spans.AutoTerminationMode
 import io.embrace.android.embracesdk.spans.EmbraceSpan
 import io.embrace.android.embracesdk.testframework.SdkIntegrationTestRule
-import io.embrace.android.embracesdk.testframework.actions.EmbraceActionInterface
+import io.embrace.android.embracesdk.testframework.actions.SessionTimestamps
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
@@ -42,8 +42,8 @@ internal class SpanAutoTerminationTest {
 
     @Test
     fun `auto termination feature`() {
-        var firstSessionTimestamps: EmbraceActionInterface.SessionTimestamps? = null
-        var secondSessionTimestamps: EmbraceActionInterface.SessionTimestamps? = null
+        var firstSessionTimestamps: SessionTimestamps? = null
+        var secondSessionTimestamps: SessionTimestamps? = null
         testRule.runTest(
             instrumentedConfig = FakeInstrumentedConfig(
                 enabledFeatures = FakeEnabledFeatureConfig(
@@ -123,7 +123,7 @@ internal class SpanAutoTerminationTest {
         )
     }
 
-    private fun EmbraceActionInterface.SessionTimestamps.assertFirstSpans(
+    private fun SessionTimestamps.assertFirstSpans(
         first: Envelope<SessionPayload>,
     ) {
         // startSpan() with children
@@ -167,7 +167,7 @@ internal class SpanAutoTerminationTest {
         assertNull(hangingSpan.endTimeNanos)
     }
 
-    private fun EmbraceActionInterface.SessionTimestamps.assertSecondSpans(
+    private fun SessionTimestamps.assertSecondSpans(
         second: Envelope<SessionPayload>,
     ) {
         val roota = second.findSpanByName(ROOT_HANGING_SPAN)

embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testframework/actions/AppExecutionTimestamps.kt

@@ -0,0 +1,33 @@
+package io.embrace.android.embracesdk.testframework.actions
+
+/**
+ * Timestamps for various events during the simulated execution of an app when we record a session during the integration tests
+ */
+internal data class AppExecutionTimestamps(
+    /**
+     * The time the simulated app execution started.
+     */
+    var executionStartTimeMs: Long = 0L,
+
+    /**
+     * The first time the app was foregrounded during the simulated execution.
+     *
+     * It should correspond to the start of the first session.
+     */
+    var firstForegroundTimeMs: Long = 0L,
+
+    /**
+     * The time just before the action within the session is executed for the first session in the execution
+     *
+     * This differs from the session creation time (aka foreground time) because some amount of time is ticked off as the app
+     * goes through the activity lifecycle stages.
+     */
+    var firstActionTimeMs: Long = 0L,
+
+    /**
+     * The last time the app was backgrounded during the execution simulation.
+     *
+     * It should correspond to the end of the last session.
+     */
+    var lastBackgroundTimeMs: Long = 0L,
+)

embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testframework/actions/EmbraceActionInterface.kt

@@ -198,64 +198,6 @@ internal class EmbraceActionInterface(
         dataSource.handleThermalStateChange(thermalState)
     }
 
-    /**
-     * Timestamps for various events during the simulated execution of an app when we record a session during the integration tests
-     */
-    data class SessionTimestamps(
-        /**
-         * The time when the session begins
-         */
-        val startTimeMs: Long,
-
-        /**
-         * Time when the session foregrounds. This could differ from [startTimeMs] if the session corresponds to the first session
-         * of the app instance when background activity is disabled, as the time in the background will be included in the session time.
-         */
-        val foregroundTimeMs: Long,
-
-        /**
-         * The time when the action in the session is invoked
-         */
-        val actionTimeMs: Long,
-
-        /**
-         * The time when the session ended
-         */
-        val endTimeMs: Long,
-    )
-
-    /**
-     * Timestamps for various events during the simulated execution of an app when we record a session during the integration tests
-     */
-    data class AppExecutionTimestamps(
-        /**
-         * The time the simulated app execution started.
-         */
-        var executionStartTimeMs: Long = 0L,
-
-        /**
-         * The first time the app was foregrounded during the simulated execution.
-         *
-         * It should correspond to the start of the first session.
-         */
-        var firstForegroundTimeMs: Long = 0L,
-
-        /**
-         * The time just before the action within the session is executed for the first session in the execution
-         *
-         * This differs from the session creation time (aka foreground time) because some amount of time is ticked off as the app
-         * goes through the activity lifecycle stages.
-         */
-        var firstActionTimeMs: Long = 0L,
-
-        /**
-         * The last time the app was backgrounded during the execution simulation.
-         *
-         * It should correspond to the end of the last session.
-         */
-        var lastBackgroundTimeMs: Long = 0L,
-    )
-
     companion object {
         const val LIFECYCLE_EVENT_GAP: Long = 10L
         const val ACTIVITY_GAP: Long = 100L

embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testframework/actions/SessionTimestamps.kt

@@ -0,0 +1,27 @@
+package io.embrace.android.embracesdk.testframework.actions
+
+/**
+ * Timestamps for various events during the simulated execution of an app when we record a session during the integration tests
+ */
+internal data class SessionTimestamps(
+    /**
+     * The time when the session begins
+     */
+    val startTimeMs: Long,
+
+    /**
+     * Time when the session foregrounds. This could differ from [startTimeMs] if the session corresponds to the first session
+     * of the app instance when background activity is disabled, as the time in the background will be included in the session time.
+     */
+    val foregroundTimeMs: Long,
+
+    /**
+     * The time when the action in the session is invoked
+     */
+    val actionTimeMs: Long,
+
+    /**
+     * The time when the session ended
+     */
+    val endTimeMs: Long,
+)