diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-01-11 11:49:30 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-01-11 11:49:30 +0100 |
| commit | 6c754c3a45fdb93bcb6f9e615c00e70aaa8d90ba (patch) | |
| tree | 7d25c5e9a9066c7c97517bfbe39469242e0e08e5 /android/test/common/src | |
| parent | b5decd12a264c3e37092211eb0951dac6c640670 (diff) | |
| parent | b4167469808206ecc7ff2f788befe05e1d7ea57b (diff) | |
| download | mullvadvpn-6c754c3a45fdb93bcb6f9e615c00e70aaa8d90ba.tar.xz mullvadvpn-6c754c3a45fdb93bcb6f9e615c00e70aaa8d90ba.zip | |
Merge branch 'update-to-junit5-droid-569'
Diffstat (limited to 'android/test/common/src')
2 files changed, 10 insertions, 10 deletions
diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt index 024522e94a..9138982a43 100644 --- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt +++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/CaptureScreenshotOnFailedTestRule.kt @@ -16,15 +16,15 @@ import java.io.IOException import java.nio.file.Paths import java.time.OffsetDateTime import java.time.temporal.ChronoUnit -import org.junit.rules.TestWatcher -import org.junit.runner.Description +import org.junit.jupiter.api.extension.ExtensionContext +import org.junit.jupiter.api.extension.TestWatcher -class CaptureScreenshotOnFailedTestRule(private val testTag: String) : TestWatcher() { +class CaptureScreenshotOnFailedTestRule(private val testTag: String) : TestWatcher { - override fun failed(e: Throwable?, description: Description) { - Log.d(testTag, "Capturing screenshot of failed test: " + description.methodName) + override fun testFailed(context: ExtensionContext, cause: Throwable) { + Log.d(testTag, "Capturing screenshot of failed test: " + context.requiredTestMethod.name) val timestamp = OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS) - val screenshotName = "$timestamp-${description.methodName}.jpeg" + val screenshotName = "$timestamp-${context.requiredTestMethod.name}.jpeg" captureScreenshot(testTag, screenshotName) } diff --git a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/ForgetAllVpnAppsInSettingsTestRule.kt b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/ForgetAllVpnAppsInSettingsTestRule.kt index eebdb291ab..0e5371fcc3 100644 --- a/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/ForgetAllVpnAppsInSettingsTestRule.kt +++ b/android/test/common/src/main/kotlin/net/mullvad/mullvadvpn/test/common/rule/ForgetAllVpnAppsInSettingsTestRule.kt @@ -7,11 +7,11 @@ import androidx.test.uiautomator.By import androidx.test.uiautomator.UiDevice import net.mullvad.mullvadvpn.test.common.extension.findObjectByCaseInsensitiveText import net.mullvad.mullvadvpn.test.common.extension.findObjectWithTimeout -import org.junit.rules.TestWatcher -import org.junit.runner.Description +import org.junit.jupiter.api.extension.BeforeTestExecutionCallback +import org.junit.jupiter.api.extension.ExtensionContext -class ForgetAllVpnAppsInSettingsTestRule : TestWatcher() { - override fun starting(description: Description) { +class ForgetAllVpnAppsInSettingsTestRule : BeforeTestExecutionCallback { + override fun beforeTestExecution(context: ExtensionContext) { val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()) val targetContext = InstrumentationRegistry.getInstrumentation().targetContext targetContext.startActivity( |