summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson@mullvad.net>2024-03-12 08:39:05 +0100
committerDavid Göransson <david.goransson@mullvad.net>2024-03-12 14:15:39 +0100
commitff280e682f1dd97a5e4820ce0ffa95f51c96073b (patch)
tree926e6a19d929913cc47d7b588e10cdecfbb84e95
parentf435cb0d609393ce1ec95c75e78daa6123572b35 (diff)
downloadmullvadvpn-ff280e682f1dd97a5e4820ce0ffa95f51c96073b.tar.xz
mullvadvpn-ff280e682f1dd97a5e4820ce0ffa95f51c96073b.zip
Remove konsist workaround
-rw-r--r--android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/JUnitTest.kt5
1 files changed, 2 insertions, 3 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 6a5b874340..56f85b79d2 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
@@ -1,6 +1,7 @@
package net.mullvad.mullvadvpn.test.arch
import com.lemonappdev.konsist.api.Konsist
+import com.lemonappdev.konsist.api.ext.list.withAnnotationOf
import com.lemonappdev.konsist.api.verify.assertEmpty
import com.lemonappdev.konsist.api.verify.assertTrue
import org.junit.jupiter.api.Test
@@ -48,9 +49,7 @@ class JUnitTest {
private fun allNonAndroidTests() =
Konsist.scopeFromTest()
.functions()
- // withAnnotationOf is broken in latest Consist version, so we filter manually
- // https://github.com/LemonAppDev/konsist/discussions/738
- .filter { it.annotations.any { it.text == "@Test" } }
+ .withAnnotationOf(Test::class)
.filter { it.sourceSetName != "androidTest" }
.filter { function ->
ignoredTestPackages.none { function.packagee!!.fullyQualifiedName.startsWith(it) }