Merge pull request #1743 from DataDog/xgouchet/flaky/wireframe

RUM-2259 Fix flaky test in WireframeUtils
DataDog · Nov 30, 2023 · f22729c · f22729c
2 parents be90fc0 + c1b0d1b
commit f22729c
Showing 1 changed file with 9 additions and 15 deletions.
diff --git a/...rc/test/kotlin/com/datadog/android/sessionreplay/internal/processor/WireframeUtilsTest.kt b/...rc/test/kotlin/com/datadog/android/sessionreplay/internal/processor/WireframeUtilsTest.kt
@@ -71,11 +71,11 @@ internal class WireframeUtilsTest {
             forge.getForgery<MobileSegment.Wireframe>().apply {
                 whenever(mockBoundsUtils.resolveBounds(this)).thenReturn(fakeParentBounds)
             }
-        val fakExpectedClip = MobileSegment.WireframeClip(
-            top = fakeExpectedClipTop.longOrNull(),
-            bottom = fakeExpectedClipBottom.longOrNull(),
-            right = fakeExpectedClipRight.longOrNull(),
-            left = fakeExpectedClipLeft.longOrNull()
+        val fakeExpectedClip = MobileSegment.WireframeClip(
+            top = fakeExpectedClipTop,
+            bottom = fakeExpectedClipBottom,
+            right = fakeExpectedClipRight,
+            left = fakeExpectedClipLeft
         )
 
         val fakeRandomParents: List<MobileSegment.Wireframe> = forge.aList {
@@ -88,9 +88,11 @@ internal class WireframeUtilsTest {
             add(randomIndex, fakeParentWireframe)
         }
 
+        // When
+        val resultClip = testedWireframeUtils.resolveWireframeClip(fakeWireframe, fakeParents)
+
         // Then
-        assertThat(testedWireframeUtils.resolveWireframeClip(fakeWireframe, fakeParents))
-            .isEqualTo(fakExpectedClip)
+        assertThat(resultClip).isEqualTo(fakeExpectedClip)
     }
 
     @Test
@@ -659,14 +661,6 @@ internal class WireframeUtilsTest {
         )
     }
 
-    private fun Long.longOrNull(): Long? {
-        return if (this == 0L) {
-            null
-        } else {
-            this
-        }
-    }
-
     private fun Long?.toLong(): Long {
         return this ?: 0L
     }