Fix deprecated assert methods

6 files changed, 25 insertions, 20 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 238ad2066c..57c5d332b5 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
@@ -2,14 +2,15 @@ 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.assert
+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
 
 class GeneralTest {
     @Test
     fun `ensure package name must match file path`() =
-        Konsist.scopeFromProject().packages.assert { it.hasMatchingPath }
+        Konsist.scopeFromProject().packages.assertTrue { it.hasMatchingPath }
 
     @Test
     fun `ensure no field should have 'm' prefix`() =
@@ -20,5 +21,5 @@ class GeneralTest {
 
     @Test
     fun `ensure no empty files allowed`() =
-        Konsist.scopeFromProject().files.assertNot { it.text.isEmpty() }
+        Konsist.scopeFromProject().files.assertFalse { it.text.isEmpty() }
 }
diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/KonsistTest.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/KonsistTest.kt
index e47e20dd30..c2be51bfe4 100644
--- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/KonsistTest.kt
+++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/KonsistTest.kt
@@ -2,13 +2,13 @@ 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.assert
+import com.lemonappdev.konsist.api.verify.assertTrue
 import org.junit.jupiter.api.Test
 
 class KonsistTest {
     @Test
     fun `ensure konsist tests have 'ensure ' prefix`() =
-        Konsist.scopeFromModule("test/arch").functions().withAnnotationOf(Test::class).assert {
+        Konsist.scopeFromModule("test/arch").functions().withAnnotationOf(Test::class).assertTrue {
             it.hasNameStartingWith("ensure ")
         }
 }
diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/ViewModelTest.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/ViewModelTest.kt
index a612999a18..5dc9705512 100644
--- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/ViewModelTest.kt
+++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/ViewModelTest.kt
@@ -6,27 +6,29 @@ import com.lemonappdev.konsist.api.ext.list.functions
 import com.lemonappdev.konsist.api.ext.list.modifierprovider.withPublicOrDefaultModifier
 import com.lemonappdev.konsist.api.ext.list.properties
 import com.lemonappdev.konsist.api.ext.list.withAllParentsOf
-import com.lemonappdev.konsist.api.verify.assert
-import com.lemonappdev.konsist.api.verify.assertNot
+import com.lemonappdev.konsist.api.verify.assertFalse
+import com.lemonappdev.konsist.api.verify.assertTrue
 import org.junit.jupiter.api.Test
 
 class ViewModelTest {
     @Test
     fun `ensure view models have view model suffix`() =
-        allViewModels().assert { it.name.endsWith("ViewModel") }
+        allViewModels().assertTrue { it.name.endsWith("ViewModel") }
 
     // The purpose of this check is to both keep the naming consistent and also to avoid exposing
     // properties that shouldn't be exposed.
     @Test
     fun `ensure public properties use permitted names`() =
-        allViewModels().properties(includeNested = false).withPublicOrDefaultModifier().assert {
-            property ->
-            property.name == "uiState" || property.name == "uiSideEffect"
-        }
+        allViewModels()
+            .properties(includeNested = false)
+            .withPublicOrDefaultModifier()
+            .assertTrue { property ->
+                property.name == "uiState" || property.name == "uiSideEffect"
+            }
 
     @Test
     fun `ensure public functions have no return type`() =
-        allViewModels().functions().withPublicOrDefaultModifier().assertNot { function ->
+        allViewModels().functions().withPublicOrDefaultModifier().assertFalse { function ->
             function.hasReturnType()
         }
 
diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTest.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTest.kt
index 2236b964d5..e1162e11d3 100644
--- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTest.kt
+++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTest.kt
@@ -3,7 +3,7 @@ package net.mullvad.mullvadvpn.test.arch.classes
 import com.lemonappdev.konsist.api.Konsist
 import com.lemonappdev.konsist.api.ext.list.modifierprovider.withDataModifier
 import com.lemonappdev.konsist.api.ext.list.properties
-import com.lemonappdev.konsist.api.verify.assertNot
+import com.lemonappdev.konsist.api.verify.assertFalse
 import org.junit.jupiter.api.Test
 
 class DataClassTest {
@@ -13,5 +13,5 @@ class DataClassTest {
             .classes(includeNested = true)
             .withDataModifier()
             .properties(includeNested = false, includeLocal = false)
-            .assertNot { it.hasVarModifier }
+            .assertFalse { it.hasVarModifier }
 }
diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/compose/ComposePreviewTest.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/compose/ComposePreviewTest.kt
index 4b7680562c..67ae06ed2f 100644
--- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/compose/ComposePreviewTest.kt
+++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/compose/ComposePreviewTest.kt
@@ -3,17 +3,17 @@ package net.mullvad.mullvadvpn.test.arch.compose
 import androidx.compose.ui.tooling.preview.Preview
 import com.lemonappdev.konsist.api.Konsist
 import com.lemonappdev.konsist.api.ext.list.withAllAnnotationsOf
-import com.lemonappdev.konsist.api.verify.assert
+import com.lemonappdev.konsist.api.verify.assertTrue
 import org.junit.jupiter.api.Test
 
 class ComposePreviewTest {
     @Test
     fun `ensure all preview functions are private`() =
-        allPreviewFunctions().assert { it.hasPrivateModifier }
+        allPreviewFunctions().assertTrue { it.hasPrivateModifier }
 
     @Test
     fun `ensure all preview functions are prefixed with 'Preview'`() =
-        allPreviewFunctions().assert { it.name.startsWith("Preview") }
+        allPreviewFunctions().assertTrue { it.name.startsWith("Preview") }
 
     private fun allPreviewFunctions() =
         Konsist.scopeFromProduction("app").functions().withAllAnnotationsOf(Preview::class)
diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/compose/ComposeTest.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/compose/ComposeTest.kt
index be06c6b0b6..fc84d3d0aa 100644
--- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/compose/ComposeTest.kt
+++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/compose/ComposeTest.kt
@@ -3,13 +3,15 @@ package net.mullvad.mullvadvpn.test.arch.compose
 import androidx.compose.runtime.Composable
 import com.lemonappdev.konsist.api.Konsist
 import com.lemonappdev.konsist.api.ext.list.withAllAnnotationsOf
-import com.lemonappdev.konsist.api.verify.assert
+import com.lemonappdev.konsist.api.verify.assertTrue
 import org.junit.jupiter.api.Test
 
 class ComposeTest {
     @Test
     fun `ensure all app composables are in the compose package`() =
-        allAppComposeFunctions().assert { it.resideInPackage("net.mullvad.mullvadvpn.compose..") }
+        allAppComposeFunctions().assertTrue {
+            it.resideInPackage("net.mullvad.mullvadvpn.compose..")
+        }
 
     private fun allAppComposeFunctions() =
         Konsist.scopeFromProduction("app").functions().withAllAnnotationsOf(Composable::class)