Don't use MainActivity for screenshot tests (#1046)

Skyscanner · May 24, 2022 · 2960305 · 2960305
1 parent ffdb7a5
commit 2960305
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 12 deletions.
diff --git a/...fault/calendar2.BpkCalendarTest_screenshotTestCalendarWithSingleDaySelected.png b/...fault/calendar2.BpkCalendarTest_screenshotTestCalendarWithSingleDaySelected.png
diff --git a/...calendar2.BpkCalendarTest_screenshotTestCalendarWithStartAndEndDateSelected.png b/...calendar2.BpkCalendarTest_screenshotTestCalendarWithStartAndEndDateSelected.png
diff --git a/...r2.BpkCalendarTest_screenshotTestColoredCalendarWithStartAndEndDateSelected.png b/...r2.BpkCalendarTest_screenshotTestColoredCalendarWithStartAndEndDateSelected.png
diff --git a/...ts/dm/calendar2.BpkCalendarTest_screenshotTestCalendarWithSingleDaySelected.png b/...ts/dm/calendar2.BpkCalendarTest_screenshotTestCalendarWithSingleDaySelected.png
diff --git a/...calendar2.BpkCalendarTest_screenshotTestCalendarWithStartAndEndDateSelected.png b/...calendar2.BpkCalendarTest_screenshotTestCalendarWithStartAndEndDateSelected.png
diff --git a/...r2.BpkCalendarTest_screenshotTestColoredCalendarWithStartAndEndDateSelected.png b/...r2.BpkCalendarTest_screenshotTestColoredCalendarWithStartAndEndDateSelected.png
diff --git a/...s/rtl/calendar2.BpkCalendarTest_screenshotTestCalendarWithSingleDaySelected.png b/...s/rtl/calendar2.BpkCalendarTest_screenshotTestCalendarWithSingleDaySelected.png
diff --git a/...calendar2.BpkCalendarTest_screenshotTestCalendarWithStartAndEndDateSelected.png b/...calendar2.BpkCalendarTest_screenshotTestCalendarWithStartAndEndDateSelected.png
diff --git a/...r2.BpkCalendarTest_screenshotTestColoredCalendarWithStartAndEndDateSelected.png b/...r2.BpkCalendarTest_screenshotTestColoredCalendarWithStartAndEndDateSelected.png
diff --git a/...hemed/calendar2.BpkCalendarTest_screenshotTestCalendarWithSingleDaySelected.png b/...hemed/calendar2.BpkCalendarTest_screenshotTestCalendarWithSingleDaySelected.png
diff --git a/...calendar2.BpkCalendarTest_screenshotTestCalendarWithStartAndEndDateSelected.png b/...calendar2.BpkCalendarTest_screenshotTestCalendarWithStartAndEndDateSelected.png
diff --git a/...r2.BpkCalendarTest_screenshotTestColoredCalendarWithStartAndEndDateSelected.png b/...r2.BpkCalendarTest_screenshotTestColoredCalendarWithStartAndEndDateSelected.png
diff --git a/...s/themed/snackbar.BpkSnackbarTests_screenshotTestSnackbar_DefaultWithAction.png b/...s/themed/snackbar.BpkSnackbarTests_screenshotTestSnackbar_DefaultWithAction.png
diff --git a/...creenshots/themed/snackbar.BpkSnackbarTests_screenshotTestSnackbar_withIcon.png b/...creenshots/themed/snackbar.BpkSnackbarTests_screenshotTestSnackbar_withIcon.png
diff --git a/...reenshots/themed/snackbar.BpkSnackbarTests_screenshotTestSnackbar_withTitle.png b/...reenshots/themed/snackbar.BpkSnackbarTests_screenshotTestSnackbar_withTitle.png
diff --git a/...ts/themed/snackbar.BpkSnackbarTests_screenshotTestSnackbar_withTitleAndIcon.png b/...ts/themed/snackbar.BpkSnackbarTests_screenshotTestSnackbar_withTitleAndIcon.png
diff --git a/app/src/androidTest/java/net/skyscanner/backpack/BpkSnapshotTest.kt b/app/src/androidTest/java/net/skyscanner/backpack/BpkSnapshotTest.kt
@@ -27,19 +27,20 @@ import androidx.activity.compose.setContent
 import androidx.annotation.ColorRes
 import androidx.annotation.Dimension
 import androidx.annotation.Dimension.DP
+import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ProvidedValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
 import androidx.test.core.app.ActivityScenario
 import androidx.test.platform.app.InstrumentationRegistry
 import com.facebook.testing.screenshot.Screenshot
 import com.facebook.testing.screenshot.ViewHelpers
 import com.facebook.testing.screenshot.internal.TestNameDetector
-import net.skyscanner.backpack.demo.MainActivity
 import net.skyscanner.backpack.demo.compose.BackpackPreview
 import org.hamcrest.Matchers
 import org.junit.Assume
@@ -109,7 +110,7 @@ open class BpkSnapshotTest {
       tags.joinToString(separator = "_", prefix = getScreenshotName() + ".") { it.toString() }
     }
 
-    ActivityScenario.launch(MainActivity::class.java).use { scenario ->
+    ActivityScenario.launch(AppCompatActivity::class.java).use { scenario ->
       scenario.onActivity { activity ->
         with(activity) {
           setContent {
@@ -121,7 +122,7 @@ open class BpkSnapshotTest {
             )
           }
 
-          val view = (window.decorView as ViewGroup).getChildAt(0)
+          val view = window.decorView.findComposeView()
 
           ViewHelpers.setupView(view)
             .setExactWidthDp(size.width)
@@ -136,6 +137,22 @@ open class BpkSnapshotTest {
     }
   }
 
+  private fun View.findComposeView(): ComposeView? {
+    if (this !is ViewGroup) return null
+    for (i in 0..childCount) {
+      val child = getChildAt(i)
+      if (child is ComposeView) {
+        return child
+      } else if (child is ViewGroup) {
+        val view = child.findComposeView()
+        if (view != null) {
+          return view
+        }
+      }
+    }
+    return null
+  }
+
   inner class AsyncSnapshot(private val testClass: String, private val testName: String) {
     fun record(view: View) {
       Screenshot.snap(wrapMeasuredViewWithBackground(view))

diff --git a/app/src/androidTest/java/net/skyscanner/backpack/calendar/BpkCalendarTest.kt b/app/src/androidTest/java/net/skyscanner/backpack/calendar/BpkCalendarTest.kt
@@ -38,7 +38,6 @@ import net.skyscanner.backpack.calendar.presenter.CurrentDateProvider
 import net.skyscanner.backpack.calendar.presenter.HighlightedDaysAdapter
 import net.skyscanner.backpack.calendar.presenter.MonthFooterAdapter
 import net.skyscanner.backpack.calendar.presenter.SelectionType
-import net.skyscanner.backpack.demo.MainActivity
 import net.skyscanner.backpack.demo.data.multiColoredExampleCalendarColoring
 import org.hamcrest.CoreMatchers
 import org.junit.Before
@@ -85,8 +84,8 @@ class BpkCalendarTest : BpkSnapshotTest() {
   private lateinit var activity: AppCompatActivity
 
   @get:Rule
-  var activityRule: ActivityTestRule<MainActivity> =
-    ActivityTestRule(MainActivity::class.java)
+  var activityRule: ActivityTestRule<AppCompatActivity> =
+    ActivityTestRule(AppCompatActivity::class.java)
 
   @Before
   fun setup() {

diff --git a/app/src/androidTest/java/net/skyscanner/backpack/calendar2/BpkCalendarTest.kt b/app/src/androidTest/java/net/skyscanner/backpack/calendar2/BpkCalendarTest.kt
@@ -34,7 +34,6 @@ import kotlinx.coroutines.test.TestCoroutineDispatcher
 import net.skyscanner.backpack.BpkSnapshotTest
 import net.skyscanner.backpack.calendar2.data.CalendarDispatchers
 import net.skyscanner.backpack.calendar2.extension.toIterable
-import net.skyscanner.backpack.demo.MainActivity
 import net.skyscanner.backpack.demo.R
 import net.skyscanner.backpack.util.InternalBackpackApi
 import org.junit.Before
@@ -56,8 +55,8 @@ class BpkCalendarTest : BpkSnapshotTest() {
   private lateinit var activity: AppCompatActivity
 
   @get:Rule
-  var activityRule: ActivityTestRule<MainActivity> =
-    ActivityTestRule(MainActivity::class.java)
+  var activityRule: ActivityTestRule<AppCompatActivity> =
+    ActivityTestRule(AppCompatActivity::class.java)
 
   @OptIn(InternalBackpackApi::class, ExperimentalCoroutinesApi::class)
   @Before

diff --git a/app/src/androidTest/java/net/skyscanner/backpack/snackbar/BpkSnackbarTests.kt b/app/src/androidTest/java/net/skyscanner/backpack/snackbar/BpkSnackbarTests.kt
@@ -30,7 +30,6 @@ import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
 import net.skyscanner.backpack.BpkSnapshotTest
-import net.skyscanner.backpack.demo.MainActivity
 import net.skyscanner.backpack.demo.R
 import net.skyscanner.backpack.util.unsafeLazy
 import org.hamcrest.Matcher
@@ -45,8 +44,8 @@ class BpkSnackbarTests : BpkSnapshotTest() {
   private lateinit var activity: AppCompatActivity
 
   @get:Rule
-  var activityRule: ActivityTestRule<MainActivity> =
-    ActivityTestRule(MainActivity::class.java)
+  var activityRule: ActivityTestRule<AppCompatActivity> =
+    ActivityTestRule(AppCompatActivity::class.java)
 
   @Before
   fun setUp() {