diff options
Diffstat (limited to 'android/test')
3 files changed, 37 insertions, 7 deletions
diff --git a/android/test/arch/build.gradle.kts b/android/test/arch/build.gradle.kts index 18503fa362..2665083cb0 100644 --- a/android/test/arch/build.gradle.kts +++ b/android/test/arch/build.gradle.kts @@ -1,6 +1,7 @@ plugins { id(Dependencies.Plugin.androidLibraryId) id(Dependencies.Plugin.kotlinAndroidId) + id(Dependencies.Plugin.junit5) version Versions.Plugin.junit5 } android { @@ -28,6 +29,8 @@ androidComponents { } dependencies { + testRuntimeOnly(Dependencies.junitEngine) + testImplementation(Dependencies.Compose.uiToolingAndroidPreview) testImplementation(Dependencies.AndroidX.appcompat) testImplementation(Dependencies.junitApi) diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/JUnitTests.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/JUnitTests.kt new file mode 100644 index 0000000000..bce85d8f8a --- /dev/null +++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/JUnitTests.kt @@ -0,0 +1,30 @@ +package net.mullvad.mullvadvpn.test.arch + +import com.lemonappdev.konsist.api.Konsist +import com.lemonappdev.konsist.api.verify.assertEmpty +import org.junit.jupiter.api.Test + +class JUnitTests { + + @Test + fun `ensure only junit5 annotations are used for functions`() = + Konsist.scopeFromProject() + .functions() + .filter { + it.annotations.any { annotation -> + annotation.fullyQualifiedName.matches(Regex("org.junit((?!jupiter).)*\$")) + } + } + .assertEmpty() + + @Test + fun `ensure only junit5 annotations are used for classes`() = + Konsist.scopeFromProject() + .classes() + .filter { + it.annotations.any { annotation -> + annotation.fullyQualifiedName.matches(Regex("org.junit((?!jupiter).)*\$")) + } + } + .assertEmpty() +} diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LogoutTest.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LogoutTest.kt index 8552b8a238..95ad9c22f5 100644 --- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LogoutTest.kt +++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/LogoutTest.kt @@ -1,18 +1,15 @@ package net.mullvad.mullvadvpn.test.e2e -import androidx.test.runner.AndroidJUnit4 import androidx.test.uiautomator.By -import junit.framework.Assert.assertNotNull import net.mullvad.mullvadvpn.test.common.extension.findObjectWithTimeout import net.mullvad.mullvadvpn.test.e2e.misc.CleanupAccountTestRule -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith +import org.junit.jupiter.api.Assertions.assertNotNull +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.extension.RegisterExtension -@RunWith(AndroidJUnit4::class) class LogoutTest : EndToEndTest() { - @Rule @JvmField val cleanupAccountTestRule = CleanupAccountTestRule() + @RegisterExtension @JvmField val cleanupAccountTestRule = CleanupAccountTestRule() @Test fun testLogout() { |