diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-09-16 14:16:25 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-09-17 10:32:30 +0200 |
| commit | 1a1c67fc31bb4cbae0f9341b0c3046743cae661c (patch) | |
| tree | 6b8fd96c823ad56f7ccf68cb0727d9a3abdcfe7f /android/test | |
| parent | adce7d6a1e25a22f8bf40410cbcc8ea88e3c5b23 (diff) | |
| download | mullvadvpn-1a1c67fc31bb4cbae0f9341b0c3046743cae661c.tar.xz mullvadvpn-1a1c67fc31bb4cbae0f9341b0c3046743cae661c.zip | |
Fix konsist test
Diffstat (limited to 'android/test')
| -rw-r--r-- | android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/JUnitTest.kt | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/JUnitTest.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/JUnitTest.kt index 56f85b79d2..a2c743b360 100644 --- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/JUnitTest.kt +++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/JUnitTest.kt @@ -14,7 +14,8 @@ class JUnitTest { .functions() .filter { it.annotations.any { annotation -> - annotation.fullyQualifiedName.matches(Regex("org.junit((?!jupiter).)*\$")) + annotation.fullyQualifiedName?.matches(Regex("org.junit((?!jupiter).)*\$")) + ?: false } } .assertEmpty() @@ -25,7 +26,8 @@ class JUnitTest { .classes() .filter { it.annotations.any { annotation -> - annotation.fullyQualifiedName.matches(Regex("org.junit((?!jupiter).)*\$")) + annotation.fullyQualifiedName?.matches(Regex("org.junit((?!jupiter).)*\$")) + ?: false } } .assertEmpty() @@ -47,18 +49,7 @@ class JUnitTest { } private fun allNonAndroidTests() = - Konsist.scopeFromTest() - .functions() - .withAnnotationOf(Test::class) - .filter { it.sourceSetName != "androidTest" } - .filter { function -> - ignoredTestPackages.none { function.packagee!!.fullyQualifiedName.startsWith(it) } - } - - companion object { - // The following packages are not following the naming convention since they are android - // test that does not support spaces in function names. - private val ignoredTestPackages = - listOf("net.mullvad.mullvadvpn.test.e2e", "net.mullvad.mullvadvpn.test.mockapi") - } + Konsist.scopeFromTest().functions().withAnnotationOf(Test::class).filter { + it.sourceSetName != "androidTest" + } } |