Merge branch 'remove-konsist-workaround-droid-738'

2 files changed, 3 insertions, 5 deletions

diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/GeneralTest.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/GeneralTest.kt
index 57c5d332b5..314cde7e7f 100644
--- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/GeneralTest.kt
+++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/GeneralTest.kt
@@ -3,7 +3,6 @@ package net.mullvad.mullvadvpn.test.arch
 import com.lemonappdev.konsist.api.Konsist
 import com.lemonappdev.konsist.api.ext.list.properties
 import com.lemonappdev.konsist.api.verify.assertFalse
-import com.lemonappdev.konsist.api.verify.assertNot
 import com.lemonappdev.konsist.api.verify.assertTrue
 import org.junit.jupiter.api.Test
 
@@ -14,7 +13,7 @@ class GeneralTest {
 
     @Test
     fun `ensure no field should have 'm' prefix`() =
-        Konsist.scopeFromProject().classes().properties().assertNot {
+        Konsist.scopeFromProject().classes().properties().assertFalse {
             val secondCharacterIsUppercase = it.name.getOrNull(1)?.isUpperCase() ?: false
             it.name.startsWith('m') && secondCharacterIsUppercase
         }
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) }