Fix images not shown in screenshots (DEV)

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/eventregistration/organizer/TraceLocationCreateFragmentTest.kt

@@ -1,5 +1,6 @@
 package de.rki.coronawarnapp.ui.eventregistration.organizer
 
+import androidx.fragment.app.testing.launchFragmentInContainer
 import androidx.navigation.Navigation
 import androidx.navigation.testing.TestNavHostController
 import androidx.test.core.app.ApplicationProvider
@@ -30,7 +31,6 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import testhelpers.BaseUITest
 import testhelpers.TestDispatcherProvider
-import testhelpers.launchFragmentInContainer2
 import java.util.TimeZone
 
 @RunWith(AndroidJUnit4::class)
@@ -71,7 +71,8 @@ class TraceLocationCreateFragmentTest : BaseUITest() {
 
     @Test
     fun duplicateEventWithSameDatesTest() {
-        launchFragmentInContainer2<TraceLocationCreateFragment>(
+        launchFragmentInContainer<TraceLocationCreateFragment>(
+            themeResId = R.style.AppTheme_Main,
             fragmentArgs = TraceLocationCreateFragmentArgs(
                 category = TraceLocationData.categoryEvent,
                 originalItem = TraceLocationData.traceLocationSameDate
@@ -90,7 +91,8 @@ class TraceLocationCreateFragmentTest : BaseUITest() {
 
     @Test
     fun duplicateEventWithDifferentDatesTest() {
-        launchFragmentInContainer2<TraceLocationCreateFragment>(
+        launchFragmentInContainer<TraceLocationCreateFragment>(
+            themeResId = R.style.AppTheme_Main,
             fragmentArgs = TraceLocationCreateFragmentArgs(
                 category = TraceLocationData.categoryEvent,
                 originalItem = TraceLocationData.traceLocationDifferentDate

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/onboarding/OnboardingAnalyticsFragmentTest.kt

@@ -23,8 +23,9 @@ import org.junit.runner.RunWith
 import testhelpers.BaseUITest
 import testhelpers.Screenshot
 import testhelpers.TestDispatcherProvider
-import testhelpers.captureScreenshot
 import testhelpers.launchFragment2
+import testhelpers.launchFragmentInContainer2
+import testhelpers.takeScreenshot
 
 @RunWith(AndroidJUnit4::class)
 class OnboardingAnalyticsFragmentTest : BaseUITest() {
@@ -83,7 +84,8 @@ class OnboardingAnalyticsFragmentTest : BaseUITest() {
     @Screenshot
     @Test
     fun capture_screenshot() {
-        captureScreenshot<OnboardingAnalyticsFragment>()
+        launchFragmentInContainer2<OnboardingAnalyticsFragment>()
+        takeScreenshot<OnboardingAnalyticsFragment>()
     }
 }
 

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/statistics/StatisticsExplanationFragmentTest.kt

@@ -8,15 +8,17 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import testhelpers.BaseUITest
 import testhelpers.Screenshot
-import testhelpers.captureScreenshot
+import testhelpers.launchFragmentInContainer2
+import testhelpers.takeScreenshot
 
 @RunWith(AndroidJUnit4::class)
 class StatisticsExplanationFragmentTest : BaseUITest() {
 
     @Screenshot
     @Test
     fun capture_screenshot() {
-        captureScreenshot<StatisticsExplanationFragment>()
+        launchFragmentInContainer2<StatisticsExplanationFragment>()
+        takeScreenshot<StatisticsExplanationFragment>()
     }
 }
 

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionConsentFragmentTest.kt

@@ -22,7 +22,8 @@ import org.junit.runner.RunWith
 import testhelpers.BaseUITest
 import testhelpers.Screenshot
 import testhelpers.TestDispatcherProvider
-import testhelpers.captureScreenshot
+import testhelpers.launchFragmentInContainer2
+import testhelpers.takeScreenshot
 
 @RunWith(AndroidJUnit4::class)
 class SubmissionConsentFragmentTest : BaseUITest() {
@@ -66,9 +67,8 @@ class SubmissionConsentFragmentTest : BaseUITest() {
     @Test
     @Screenshot
     fun capture_fragment_results() {
-        captureScreenshot<SubmissionConsentFragment>(
-            fragmentArgs = fragmentArgs
-        )
+        launchFragmentInContainer2<SubmissionConsentFragment>(fragmentArgs = fragmentArgs)
+        takeScreenshot<SubmissionConsentFragment>()
     }
 }
 

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionContactFragmentTest.kt

@@ -1,5 +1,6 @@
 package de.rki.coronawarnapp.ui.submission
 
+import androidx.fragment.app.testing.launchFragmentInContainer
 import androidx.navigation.Navigation
 import androidx.navigation.testing.TestNavHostController
 import androidx.test.core.app.ApplicationProvider
@@ -20,9 +21,9 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import testhelpers.BaseUITest
 import testhelpers.Screenshot
-import testhelpers.captureScreenshot
 import testhelpers.launchFragment2
 import testhelpers.launchFragmentInContainer2
+import testhelpers.takeScreenshot
 
 @RunWith(AndroidJUnit4::class)
 class SubmissionContactFragmentTest : BaseUITest() {
@@ -53,9 +54,10 @@ class SubmissionContactFragmentTest : BaseUITest() {
     fun testContactEnterTanClicked() {
         val navController = TestNavHostController(ApplicationProvider.getApplicationContext())
         runOnUiThread { navController.setGraph(R.navigation.nav_graph) }
-        launchFragmentInContainer2<SubmissionContactFragment>().onFragment { fragment ->
-            Navigation.setViewNavController(fragment.requireView(), navController)
-        }
+        launchFragmentInContainer<SubmissionContactFragment>(themeResId = R.style.AppTheme_Main)
+            .onFragment { fragment ->
+                Navigation.setViewNavController(fragment.requireView(), navController)
+            }
 
         onView(withId(R.id.submission_contact_button_enter))
             .perform(click())
@@ -64,7 +66,8 @@ class SubmissionContactFragmentTest : BaseUITest() {
     @Test
     @Screenshot
     fun capture_fragment() {
-        captureScreenshot<SubmissionContactFragment>()
+        launchFragmentInContainer2<SubmissionContactFragment>()
+        takeScreenshot<SubmissionContactFragment>()
     }
 }
 

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionDispatcherFragmentTest.kt

@@ -1,5 +1,6 @@
 package de.rki.coronawarnapp.ui.submission
 
+import androidx.fragment.app.testing.launchFragmentInContainer
 import androidx.navigation.Navigation
 import androidx.navigation.testing.TestNavHostController
 import androidx.test.core.app.ApplicationProvider
@@ -25,7 +26,6 @@ import org.junit.runner.RunWith
 import testhelpers.BaseUITest
 import testhelpers.Screenshot
 import testhelpers.TestDispatcherProvider
-import testhelpers.captureScreenshot
 import testhelpers.launchFragment2
 import testhelpers.launchFragmentInContainer2
 import testhelpers.preferences.mockFlowPreference
@@ -70,29 +70,32 @@ class SubmissionDispatcherFragmentTest : BaseUITest() {
 
     @Test
     fun testEventQRClicked() {
-        launchFragmentInContainer2<SubmissionDispatcherFragment>().onFragment {
-            Navigation.setViewNavController(it.requireView(), navController)
-        }
+        launchFragmentInContainer<SubmissionDispatcherFragment>(themeResId = R.style.AppTheme_Main)
+            .onFragment {
+                Navigation.setViewNavController(it.requireView(), navController)
+            }
         onView(withId(R.id.submission_dispatcher_qr))
             .perform(scrollTo())
             .perform(click())
     }
 
     @Test
     fun testEventTeleClicked() {
-        launchFragmentInContainer2<SubmissionDispatcherFragment>().onFragment {
-            Navigation.setViewNavController(it.requireView(), navController)
-        }
+        launchFragmentInContainer<SubmissionDispatcherFragment>(themeResId = R.style.AppTheme_Main)
+            .onFragment {
+                Navigation.setViewNavController(it.requireView(), navController)
+            }
         onView(withId(R.id.submission_dispatcher_tan_tele))
             .perform(scrollTo())
             .perform(click())
     }
 
     @Test
     fun testEventTanClicked() {
-        launchFragmentInContainer2<SubmissionDispatcherFragment>().onFragment {
-            Navigation.setViewNavController(it.requireView(), navController)
-        }
+        launchFragmentInContainer<SubmissionDispatcherFragment>(themeResId = R.style.AppTheme_Main)
+            .onFragment {
+                Navigation.setViewNavController(it.requireView(), navController)
+            }
         onView(withId(R.id.submission_dispatcher_tan_code))
             .perform(scrollTo())
             .perform(click())
@@ -101,7 +104,9 @@ class SubmissionDispatcherFragmentTest : BaseUITest() {
     @Test
     @Screenshot
     fun capture_fragment() {
-        captureScreenshot<SubmissionDispatcherFragment>()
+        launchFragmentInContainer2<SubmissionDispatcherFragment>()
+        takeScreenshot<SubmissionDispatcherFragment>()
+
         onView(withId(R.id.submission_dispatcher_tan_tele))
             .perform(scrollTo())
         takeScreenshot<SubmissionDispatcherFragment>("2")

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionSymptomCalendarFragmentTest.kt

@@ -27,7 +27,7 @@ import org.junit.runner.RunWith
 import testhelpers.BaseUITest
 import testhelpers.Screenshot
 import testhelpers.TestDispatcherProvider
-import testhelpers.captureScreenshot
+import testhelpers.launchFragmentInContainer2
 import testhelpers.takeScreenshot
 
 @RunWith(AndroidJUnit4::class)
@@ -73,13 +73,15 @@ class SubmissionSymptomCalendarFragmentTest : BaseUITest() {
     @Test
     @Screenshot
     fun capture_fragment() {
-        captureScreenshot<SubmissionSymptomCalendarFragment>(
+        launchFragmentInContainer2<SubmissionSymptomCalendarFragment>(
             fragmentArgs = SubmissionSymptomCalendarFragmentArgs(
                 Symptoms.Indication.POSITIVE,
                 CoronaTest.Type.PCR
             ).toBundle()
         )
 
+        takeScreenshot<SubmissionSymptomCalendarFragment>()
+
         onView(withId(R.id.target_button_verify))
             .perform(scrollTo())
 

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionSymptomIntroFragmentTest.kt

@@ -28,7 +28,6 @@ import org.junit.runner.RunWith
 import testhelpers.BaseUITest
 import testhelpers.Screenshot
 import testhelpers.TestDispatcherProvider
-import testhelpers.captureScreenshot
 import testhelpers.launchFragment2
 import testhelpers.launchFragmentInContainer2
 import testhelpers.takeScreenshot
@@ -92,11 +91,12 @@ class SubmissionSymptomIntroFragmentTest : BaseUITest() {
     @Test
     @Screenshot
     fun capture_fragment() {
-        captureScreenshot<SubmissionSymptomIntroductionFragment>(
+        launchFragmentInContainer2<SubmissionSymptomIntroductionFragment>(
             fragmentArgs = SubmissionSymptomIntroductionFragmentArgs(
                 CoronaTest.Type.PCR
             ).toBundle()
         )
+        takeScreenshot<SubmissionSymptomIntroductionFragment>()
         onView(withId(R.id.target_button_verify))
             .perform(scrollTo())
         takeScreenshot<SubmissionSymptomIntroductionFragment>("2")

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultAvailableFragmentTest.kt

@@ -28,7 +28,8 @@ import org.junit.runner.RunWith
 import testhelpers.BaseUITest
 import testhelpers.Screenshot
 import testhelpers.TestDispatcherProvider
-import testhelpers.captureScreenshot
+import testhelpers.launchFragmentInContainer2
+import testhelpers.takeScreenshot
 
 @RunWith(AndroidJUnit4::class)
 class SubmissionTestResultAvailableFragmentTest : BaseUITest() {
@@ -79,20 +80,20 @@ class SubmissionTestResultAvailableFragmentTest : BaseUITest() {
     @Screenshot
     fun capture_fragment_with_consent() {
         every { viewModel.consent } returns MutableLiveData(true)
-        captureScreenshot<SubmissionTestResultAvailableFragment>(
-            suffix = "_consent",
+        launchFragmentInContainer2<SubmissionTestResultAvailableFragment>(
             fragmentArgs = resultAvailableFragmentArgs
         )
+        takeScreenshot<SubmissionTestResultAvailableFragment>(suffix = "_consent")
     }
 
     @Test
     @Screenshot
     fun capture_fragment_without_consent() {
         every { viewModel.consent } returns MutableLiveData(false)
-        captureScreenshot<SubmissionTestResultAvailableFragment>(
-            suffix = "_no_consent",
+        launchFragmentInContainer2<SubmissionTestResultAvailableFragment>(
             fragmentArgs = resultAvailableFragmentArgs
         )
+        takeScreenshot<SubmissionTestResultAvailableFragment>(suffix = "_no_consent")
     }
 }
 

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultConsentGivenFragmentTest.kt

@@ -1,5 +1,6 @@
 package de.rki.coronawarnapp.ui.submission
 
+import androidx.fragment.app.testing.launchFragmentInContainer
 import androidx.lifecycle.MutableLiveData
 import androidx.navigation.Navigation
 import androidx.navigation.testing.TestNavHostController
@@ -35,9 +36,9 @@ import org.junit.runner.RunWith
 import testhelpers.BaseUITest
 import testhelpers.Screenshot
 import testhelpers.TestDispatcherProvider
-import testhelpers.captureScreenshot
 import testhelpers.launchFragment2
 import testhelpers.launchFragmentInContainer2
+import testhelpers.takeScreenshot
 
 @RunWith(AndroidJUnit4::class)
 class SubmissionTestResultConsentGivenFragmentTest : BaseUITest() {
@@ -91,7 +92,10 @@ class SubmissionTestResultConsentGivenFragmentTest : BaseUITest() {
 
     @Test
     fun testEventConsentGivenContinueWithSymptomsClicked() {
-        launchFragmentInContainer2<SubmissionTestResultConsentGivenFragment>(consentGivenFragmentArgs).onFragment { fragment ->
+        launchFragmentInContainer<SubmissionTestResultConsentGivenFragment>(
+            themeResId = R.style.AppTheme_Main,
+            fragmentArgs = consentGivenFragmentArgs
+        ).onFragment { fragment ->
             Navigation.setViewNavController(fragment.requireView(), navController)
         }
         // Verify that performing a click prompts the correct Navigation action
@@ -111,7 +115,8 @@ class SubmissionTestResultConsentGivenFragmentTest : BaseUITest() {
             )
         )
 
-        captureScreenshot<SubmissionTestResultConsentGivenFragment>(fragmentArgs = consentGivenFragmentArgs)
+        launchFragmentInContainer2<SubmissionTestResultConsentGivenFragment>(fragmentArgs = consentGivenFragmentArgs)
+        takeScreenshot<SubmissionTestResultConsentGivenFragment>()
     }
 }
 

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultFragmentTest.kt

@@ -29,9 +29,9 @@ import org.junit.runner.RunWith
 import testhelpers.BaseUITest
 import testhelpers.Screenshot
 import testhelpers.TestDispatcherProvider
-import testhelpers.captureScreenshot
 import testhelpers.launchFragment2
 import testhelpers.launchFragmentInContainer2
+import testhelpers.takeScreenshot
 
 @RunWith(AndroidJUnit4::class)
 class SubmissionTestResultFragmentTest : BaseUITest() {
@@ -117,7 +117,8 @@ class SubmissionTestResultFragmentTest : BaseUITest() {
                 }
             )
         )
-        captureScreenshot<SubmissionTestResultPendingFragment>(fragmentArgs = pendingFragmentArgs)
+        launchFragmentInContainer2<SubmissionTestResultPendingFragment>(fragmentArgs = pendingFragmentArgs)
+        takeScreenshot<SubmissionTestResultPendingFragment>()
     }
 }
 

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultNegativeFragmentTest.kt

@@ -26,7 +26,8 @@ import org.junit.runner.RunWith
 import testhelpers.BaseUITest
 import testhelpers.Screenshot
 import testhelpers.TestDispatcherProvider
-import testhelpers.captureScreenshot
+import testhelpers.launchFragmentInContainer2
+import testhelpers.takeScreenshot
 
 @RunWith(AndroidJUnit4::class)
 class SubmissionTestResultNegativeFragmentTest : BaseUITest() {
@@ -77,7 +78,8 @@ class SubmissionTestResultNegativeFragmentTest : BaseUITest() {
                 }
             )
         )
-        captureScreenshot<SubmissionTestResultNegativeFragment>(fragmentArgs = resultNegativeFragmentArgs)
+        launchFragmentInContainer2<SubmissionTestResultNegativeFragment>(fragmentArgs = resultNegativeFragmentArgs)
+        takeScreenshot<SubmissionTestResultNegativeFragment>()
     }
 }
 

Corona-Warn-App/src/androidTest/java/de/rki/coronawarnapp/ui/submission/SubmissionTestResultNoConsentGivenFragmentTest.kt

@@ -26,7 +26,8 @@ import org.junit.runner.RunWith
 import testhelpers.BaseUITest
 import testhelpers.Screenshot
 import testhelpers.TestDispatcherProvider
-import testhelpers.captureScreenshot
+import testhelpers.launchFragmentInContainer2
+import testhelpers.takeScreenshot
 
 @RunWith(AndroidJUnit4::class)
 class SubmissionTestResultNoConsentGivenFragmentTest : BaseUITest() {
@@ -78,7 +79,8 @@ class SubmissionTestResultNoConsentGivenFragmentTest : BaseUITest() {
             )
         )
 
-        captureScreenshot<SubmissionTestResultNoConsentFragment>(fragmentArgs = noConsentGivenFragmentArgs)
+        launchFragmentInContainer2<SubmissionTestResultNoConsentFragment>(fragmentArgs = noConsentGivenFragmentArgs)
+        takeScreenshot<SubmissionTestResultNoConsentFragment>()
     }
 }