Merge branch 'update-to-junit5-droid-569'

3 files changed, 21 insertions, 11 deletions

diff --git a/android/test/common/build.gradle.kts b/android/test/common/build.gradle.kts
index 99fcb9d2a7..df9dea41ab 100644
--- a/android/test/common/build.gradle.kts
+++ b/android/test/common/build.gradle.kts
@@ -22,6 +22,16 @@ android {
         abortOnError = true
         warningsAsErrors = true
     }
+
+    packaging {
+        resources {
+            pickFirsts += setOf(
+                // Fixes packaging error caused by: jetified-junit-*
+                "META-INF/LICENSE.md",
+                "META-INF/LICENSE-notice.md"
+            )
+        }
+    }
 }
 
 androidComponents {
@@ -37,7 +47,7 @@ dependencies {
     implementation(Dependencies.AndroidX.testRunner)
     implementation(Dependencies.AndroidX.testRules)
     implementation(Dependencies.AndroidX.testUiAutomator)
-    implementation(Dependencies.junit)
+    implementation(Dependencies.junitEngine)
     implementation(Dependencies.Kotlin.stdlib)
 
     androidTestUtil(Dependencies.AndroidX.testOrchestrator)
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(