fixup! RUMM-2335 Add Session Replay hooks into the application lifecycle

DataDog · Jul 25, 2022 · b7158ed · b7158ed
1 parent 808031a
commit b7158ed
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 23 deletions.
diff --git a/...ndroid/src/main/kotlin/com/datadog/android/sessionreplay/internal/SessionReplayFeature.kt b/...ndroid/src/main/kotlin/com/datadog/android/sessionreplay/internal/SessionReplayFeature.kt
@@ -23,8 +23,7 @@ internal class SessionReplayFeature(
     coreFeature: CoreFeature,
     private val sessionReplayCallback:
         SessionReplayLifecycleCallback
-) :
-    SdkFeature<Any, Configuration.Feature.SessionReplay>(coreFeature) {
+) : SdkFeature<Any, Configuration.Feature.SessionReplay>(coreFeature) {
 
     internal lateinit var appContext: Context
     private var isRecording = AtomicBoolean(false)

diff --git a/...id/src/test/kotlin/com/datadog/android/sessionreplay/internal/SessionReplayFeatureTest.kt b/...id/src/test/kotlin/com/datadog/android/sessionreplay/internal/SessionReplayFeatureTest.kt
@@ -15,6 +15,7 @@ import com.datadog.tools.unit.extensions.TestConfigurationExtension
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.times
 import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
 import com.nhaarman.mockitokotlin2.verifyZeroInteractions
 import fr.xgouchet.elmyr.Forge
 import fr.xgouchet.elmyr.junit5.ForgeConfiguration
@@ -98,7 +99,7 @@ internal class SessionReplayFeatureTest : SdkFeatureTest<Any, Configuration.Feat
 
         // Then
         verify(mockSessionReplayLifecycleCallback)
-            .register(appContext.mockInstance)
+            .unregisterAndStopRecorders(appContext.mockInstance)
     }
 
     @Test
@@ -119,6 +120,9 @@ internal class SessionReplayFeatureTest : SdkFeatureTest<Any, Configuration.Feat
         countDownLatch.await(5, TimeUnit.SECONDS)
         verify(mockSessionReplayLifecycleCallback)
             .register(appContext.mockInstance)
+        verify(mockSessionReplayLifecycleCallback)
+            .unregisterAndStopRecorders(appContext.mockInstance)
+        verifyNoMoreInteractions(mockSessionReplayLifecycleCallback)
     }
 
     @Test
@@ -133,6 +137,9 @@ internal class SessionReplayFeatureTest : SdkFeatureTest<Any, Configuration.Feat
         // Then
         verify(mockSessionReplayLifecycleCallback)
             .register(appContext.mockInstance)
+        verify(mockSessionReplayLifecycleCallback)
+            .unregisterAndStopRecorders(appContext.mockInstance)
+        verifyNoMoreInteractions(mockSessionReplayLifecycleCallback)
     }
 
     @Test
@@ -170,15 +177,15 @@ internal class SessionReplayFeatureTest : SdkFeatureTest<Any, Configuration.Feat
         // When
         repeat(3) {
             Thread {
-                testedFeature.stopRecording()
+                testedFeature.startRecording()
                 countDownLatch.countDown()
             }.run()
         }
 
         // Then
         countDownLatch.await(5, TimeUnit.SECONDS)
-        verify(mockSessionReplayLifecycleCallback)
-            .register(appContext.mockInstance)
+        verify(mockSessionReplayLifecycleCallback).register(appContext.mockInstance)
+        verifyNoMoreInteractions(mockSessionReplayLifecycleCallback)
     }
 
     @Test

diff --git a/detekt.yml b/detekt.yml
@@ -972,7 +972,6 @@ datadog:
       - "java.util.WeakHashMap.clear()"
       - "java.util.WeakHashMap.remove(android.app.Activity)"
       - "java.util.WeakHashMap.remove(kotlin.Any)"
-      -
       # endregion
       # region Kotlin Collections
       - "kotlin.Array.all(kotlin.Function1)"

diff --git a/...d-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/processor/Processor.kt b/...d-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/processor/Processor.kt
@@ -12,5 +12,5 @@ import com.datadog.android.sessionreplay.recorder.OrientationChanged
 internal interface Processor {
     fun process(node: Node)
 
-    fun process(orientationChanged: OrientationChanged)
+    fun process(event: OrientationChanged)
 }
diff --git a/...n-replay/src/main/kotlin/com/datadog/android/sessionreplay/processor/SnapshotProcessor.kt b/...n-replay/src/main/kotlin/com/datadog/android/sessionreplay/processor/SnapshotProcessor.kt
@@ -14,7 +14,7 @@ internal class SnapshotProcessor : Processor {
         // TODO RUMM-2271
     }
 
-    override fun process(orientationChanged: OrientationChanged) {
+    override fun process(event: OrientationChanged) {
         // TODO RUMM-2271
     }
 }
diff --git a/...oid-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/recorder/Producer.kt b/...oid-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/recorder/Producer.kt
diff --git a/...play/src/main/kotlin/com/datadog/android/sessionreplay/recorder/RecorderOnDrawListener.kt b/...play/src/main/kotlin/com/datadog/android/sessionreplay/recorder/RecorderOnDrawListener.kt
@@ -21,8 +21,7 @@ internal class RecorderOnDrawListener(
     private val processor: Processor,
     private val snapshotProducer: SnapshotProducer = SnapshotProducer(),
     private val handler: Handler = Handler(Looper.getMainLooper())
-) : ViewTreeObserver
-    .OnDrawListener {
+) : ViewTreeObserver.OnDrawListener {
     private var currentOrientation = Configuration.ORIENTATION_UNDEFINED
     private val trackedActivity: WeakReference<Activity> = WeakReference(activity)
 

diff --git a/...y/src/test/kotlin/com/datadog/android/sessionreplay/SessionReplayLifecycleCallbackTest.kt b/...y/src/test/kotlin/com/datadog/android/sessionreplay/SessionReplayLifecycleCallbackTest.kt
@@ -103,7 +103,7 @@ class SessionReplayLifecycleCallbackTest {
     }
 
     @Test
-    fun `M stop recording all resumed activities W W unregisterAndStopRecorders()`() {
+    fun `M stop recording all resumed activities W unregisterAndStopRecorders()`() {
         // Given
         val mockApplication: Application = mock()
         val mockActivity1: Activity = mock()

diff --git a/.../src/test/kotlin/com/datadog/android/sessionreplay/recorder/RecorderOnDrawListenerTest.kt b/.../src/test/kotlin/com/datadog/android/sessionreplay/recorder/RecorderOnDrawListenerTest.kt
@@ -48,7 +48,10 @@ internal class RecorderOnDrawListenerTest {
 
     lateinit var testedListener: RecorderOnDrawListener
 
+    @Mock
     lateinit var mockActivity: Activity
+
+    @Mock
     lateinit var mockDecorView: View
     lateinit var mockWindow: Window
     lateinit var mockResources: Resources
@@ -75,7 +78,6 @@ internal class RecorderOnDrawListenerTest {
 
     @BeforeEach
     fun `set up`(forge: Forge) {
-        mockDecorView = mock()
         whenever(mockDecorView.width).thenReturn(fakeDecorWidth)
         whenever(mockDecorView.height).thenReturn(fakeDecorHeight)
         mockWindow = mock {
@@ -91,7 +93,6 @@ internal class RecorderOnDrawListenerTest {
         mockResources = mock {
             whenever(it.configuration).thenReturn(configuration)
         }
-        mockActivity = mock()
         whenever(mockActivity.window).thenReturn(mockWindow)
         whenever(mockActivity.resources).thenReturn(mockResources)
         testedListener = RecorderOnDrawListener(