diff --git a/samples/kaspresso-sample/src/androidTest/kotlin/com/kaspersky/kaspressample/docloc_tests/advanced/AdvancedScreenshotSampleTest.kt b/samples/kaspresso-sample/src/androidTest/kotlin/com/kaspersky/kaspressample/docloc_tests/advanced/AdvancedScreenshotSampleTest.kt index a2e012eb1..a16369607 100644 --- a/samples/kaspresso-sample/src/androidTest/kotlin/com/kaspersky/kaspressample/docloc_tests/advanced/AdvancedScreenshotSampleTest.kt +++ b/samples/kaspresso-sample/src/androidTest/kotlin/com/kaspersky/kaspressample/docloc_tests/advanced/AdvancedScreenshotSampleTest.kt @@ -2,6 +2,7 @@ package com.kaspersky.kaspressample.docloc_tests.advanced import android.Manifest import android.graphics.Color +import androidx.fragment.app.testing.FragmentScenario import androidx.fragment.app.testing.launchFragmentInContainer import androidx.test.rule.GrantPermissionRule import com.kaspersky.kaspressample.docloc.ScreenshotSampleFragment @@ -16,7 +17,7 @@ import org.junit.Test * For more information see DocLoc wiki page. */ class AdvancedScreenshotSampleTest : DocLocScreenshotTestCase(locales = "en,ru") { - private lateinit var view: ScreenshotSampleView + private lateinit var scenario: FragmentScenario @get:Rule val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant( @@ -27,26 +28,26 @@ class AdvancedScreenshotSampleTest : DocLocScreenshotTestCase(locales = "en,ru") @ScreenShooterTest @Test fun test() = before { - val scenario = launchFragmentInContainer() - scenario.onFragment { - view = getUiSafeProxy(it as ScreenshotSampleView) - } + scenario = launchFragmentInContainer() }.after { }.run { - step("1. Launch feature screen") { - view.setCounterValue(0) - view.setBackgroundColor(Color.WHITE) - captureScreenshot("1. Startup") - } + scenario.onFragment { + val view = getUiSafeProxy(it as ScreenshotSampleView) + step("1. Launch feature screen") { + view.setCounterValue(0) + view.setBackgroundColor(Color.WHITE) + captureScreenshot("1. Startup") + } - step("2. Increase counter by 5") { - view.setCounterValue(5) - captureScreenshot("2. Value has been increased by 5") - } + step("2. Increase counter by 5") { + view.setCounterValue(5) + captureScreenshot("2. Value has been increased by 5") + } - step("3. Set red background color") { - view.setBackgroundColor(Color.RED) - captureScreenshot("3. Background has been set to red") + step("3. Set red background color") { + view.setBackgroundColor(Color.RED) + captureScreenshot("3. Background has been set to red") + } } } } diff --git a/samples/kaspresso-sample/src/androidTest/kotlin/com/kaspersky/kaspressample/docloc_tests/advanced/AdvancedScreenshotSampleTestLegacy.kt b/samples/kaspresso-sample/src/androidTest/kotlin/com/kaspersky/kaspressample/docloc_tests/advanced/AdvancedScreenshotSampleTestLegacy.kt index 72c236afd..799dc44f1 100644 --- a/samples/kaspresso-sample/src/androidTest/kotlin/com/kaspersky/kaspressample/docloc_tests/advanced/AdvancedScreenshotSampleTestLegacy.kt +++ b/samples/kaspresso-sample/src/androidTest/kotlin/com/kaspersky/kaspressample/docloc_tests/advanced/AdvancedScreenshotSampleTestLegacy.kt @@ -2,6 +2,7 @@ package com.kaspersky.kaspressample.docloc_tests.advanced import android.Manifest import android.graphics.Color +import androidx.fragment.app.testing.FragmentScenario import androidx.fragment.app.testing.launchFragmentInContainer import androidx.test.rule.GrantPermissionRule import com.kaspersky.kaspressample.docloc.ScreenshotSampleFragment @@ -20,7 +21,7 @@ class AdvancedScreenshotSampleTestLegacy : DocLocScreenshotTestCase( screenshotsDirectory = File("screenshots"), locales = "en,ru" ) { - private lateinit var view: ScreenshotSampleView + private lateinit var scenario: FragmentScenario @get:Rule val runtimePermissionRule: GrantPermissionRule = GrantPermissionRule.grant( @@ -31,26 +32,26 @@ class AdvancedScreenshotSampleTestLegacy : DocLocScreenshotTestCase( @ScreenShooterTest @Test fun test() = before { - val scenario = launchFragmentInContainer() - scenario.onFragment { - view = getUiSafeProxy(it as ScreenshotSampleView) - } + scenario = launchFragmentInContainer() }.after { }.run { - step("1. Launch feature screen") { - view.setCounterValue(0) - view.setBackgroundColor(Color.WHITE) - captureScreenshot("1. Startup") - } + scenario.onFragment { + val view = getUiSafeProxy(it as ScreenshotSampleView) + step("1. Launch feature screen") { + view.setCounterValue(0) + view.setBackgroundColor(Color.WHITE) + captureScreenshot("1. Startup") + } - step("2. Increase counter by 5") { - view.setCounterValue(5) - captureScreenshot("2. Value has been increased by 5") - } + step("2. Increase counter by 5") { + view.setCounterValue(5) + captureScreenshot("2. Value has been increased by 5") + } - step("3. Set red background color") { - view.setBackgroundColor(Color.RED) - captureScreenshot("3. Background has been set to red") + step("3. Set red background color") { + view.setBackgroundColor(Color.RED) + captureScreenshot("3. Background has been set to red") + } } } }