Skip to content

Commit d68057b

Browse files
committed
Fix deprecated assert methods
1 parent 309b6a4 commit d68057b

File tree

6 files changed

+25
-20
lines changed

6 files changed

+25
-20
lines changed

android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/GeneralTest.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ package net.mullvad.mullvadvpn.test.arch
22

33
import com.lemonappdev.konsist.api.Konsist
44
import com.lemonappdev.konsist.api.ext.list.properties
5-
import com.lemonappdev.konsist.api.verify.assert
5+
import com.lemonappdev.konsist.api.verify.assertFalse
66
import com.lemonappdev.konsist.api.verify.assertNot
7+
import com.lemonappdev.konsist.api.verify.assertTrue
78
import org.junit.jupiter.api.Test
89

910
class GeneralTest {
1011
@Test
1112
fun `ensure package name must match file path`() =
12-
Konsist.scopeFromProject().packages.assert { it.hasMatchingPath }
13+
Konsist.scopeFromProject().packages.assertTrue { it.hasMatchingPath }
1314

1415
@Test
1516
fun `ensure no field should have 'm' prefix`() =
@@ -20,5 +21,5 @@ class GeneralTest {
2021

2122
@Test
2223
fun `ensure no empty files allowed`() =
23-
Konsist.scopeFromProject().files.assertNot { it.text.isEmpty() }
24+
Konsist.scopeFromProject().files.assertFalse { it.text.isEmpty() }
2425
}

android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/KonsistTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package net.mullvad.mullvadvpn.test.arch
22

33
import com.lemonappdev.konsist.api.Konsist
44
import com.lemonappdev.konsist.api.ext.list.withAnnotationOf
5-
import com.lemonappdev.konsist.api.verify.assert
5+
import com.lemonappdev.konsist.api.verify.assertTrue
66
import org.junit.jupiter.api.Test
77

88
class KonsistTest {
99
@Test
1010
fun `ensure konsist tests have 'ensure ' prefix`() =
11-
Konsist.scopeFromModule("test/arch").functions().withAnnotationOf(Test::class).assert {
11+
Konsist.scopeFromModule("test/arch").functions().withAnnotationOf(Test::class).assertTrue {
1212
it.hasNameStartingWith("ensure ")
1313
}
1414
}

android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/ViewModelTest.kt

+10-8
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,29 @@ import com.lemonappdev.konsist.api.ext.list.functions
66
import com.lemonappdev.konsist.api.ext.list.modifierprovider.withPublicOrDefaultModifier
77
import com.lemonappdev.konsist.api.ext.list.properties
88
import com.lemonappdev.konsist.api.ext.list.withAllParentsOf
9-
import com.lemonappdev.konsist.api.verify.assert
10-
import com.lemonappdev.konsist.api.verify.assertNot
9+
import com.lemonappdev.konsist.api.verify.assertFalse
10+
import com.lemonappdev.konsist.api.verify.assertTrue
1111
import org.junit.jupiter.api.Test
1212

1313
class ViewModelTest {
1414
@Test
1515
fun `ensure view models have view model suffix`() =
16-
allViewModels().assert { it.name.endsWith("ViewModel") }
16+
allViewModels().assertTrue { it.name.endsWith("ViewModel") }
1717

1818
// The purpose of this check is to both keep the naming consistent and also to avoid exposing
1919
// properties that shouldn't be exposed.
2020
@Test
2121
fun `ensure public properties use permitted names`() =
22-
allViewModels().properties(includeNested = false).withPublicOrDefaultModifier().assert {
23-
property ->
24-
property.name == "uiState" || property.name == "uiSideEffect"
25-
}
22+
allViewModels()
23+
.properties(includeNested = false)
24+
.withPublicOrDefaultModifier()
25+
.assertTrue { property ->
26+
property.name == "uiState" || property.name == "uiSideEffect"
27+
}
2628

2729
@Test
2830
fun `ensure public functions have no return type`() =
29-
allViewModels().functions().withPublicOrDefaultModifier().assertNot { function ->
31+
allViewModels().functions().withPublicOrDefaultModifier().assertFalse { function ->
3032
function.hasReturnType()
3133
}
3234

android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package net.mullvad.mullvadvpn.test.arch.classes
33
import com.lemonappdev.konsist.api.Konsist
44
import com.lemonappdev.konsist.api.ext.list.modifierprovider.withDataModifier
55
import com.lemonappdev.konsist.api.ext.list.properties
6-
import com.lemonappdev.konsist.api.verify.assertNot
6+
import com.lemonappdev.konsist.api.verify.assertFalse
77
import org.junit.jupiter.api.Test
88

99
class DataClassTest {
@@ -13,5 +13,5 @@ class DataClassTest {
1313
.classes(includeNested = true)
1414
.withDataModifier()
1515
.properties(includeNested = false, includeLocal = false)
16-
.assertNot { it.hasVarModifier }
16+
.assertFalse { it.hasVarModifier }
1717
}

android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/compose/ComposePreviewTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ package net.mullvad.mullvadvpn.test.arch.compose
33
import androidx.compose.ui.tooling.preview.Preview
44
import com.lemonappdev.konsist.api.Konsist
55
import com.lemonappdev.konsist.api.ext.list.withAllAnnotationsOf
6-
import com.lemonappdev.konsist.api.verify.assert
6+
import com.lemonappdev.konsist.api.verify.assertTrue
77
import org.junit.jupiter.api.Test
88

99
class ComposePreviewTest {
1010
@Test
1111
fun `ensure all preview functions are private`() =
12-
allPreviewFunctions().assert { it.hasPrivateModifier }
12+
allPreviewFunctions().assertTrue { it.hasPrivateModifier }
1313

1414
@Test
1515
fun `ensure all preview functions are prefixed with 'Preview'`() =
16-
allPreviewFunctions().assert { it.name.startsWith("Preview") }
16+
allPreviewFunctions().assertTrue { it.name.startsWith("Preview") }
1717

1818
private fun allPreviewFunctions() =
1919
Konsist.scopeFromProduction("app").functions().withAllAnnotationsOf(Preview::class)

android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/compose/ComposeTest.kt

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@ package net.mullvad.mullvadvpn.test.arch.compose
33
import androidx.compose.runtime.Composable
44
import com.lemonappdev.konsist.api.Konsist
55
import com.lemonappdev.konsist.api.ext.list.withAllAnnotationsOf
6-
import com.lemonappdev.konsist.api.verify.assert
6+
import com.lemonappdev.konsist.api.verify.assertTrue
77
import org.junit.jupiter.api.Test
88

99
class ComposeTest {
1010
@Test
1111
fun `ensure all app composables are in the compose package`() =
12-
allAppComposeFunctions().assert { it.resideInPackage("net.mullvad.mullvadvpn.compose..") }
12+
allAppComposeFunctions().assertTrue {
13+
it.resideInPackage("net.mullvad.mullvadvpn.compose..")
14+
}
1315

1416
private fun allAppComposeFunctions() =
1517
Konsist.scopeFromProduction("app").functions().withAllAnnotationsOf(Composable::class)

0 commit comments

Comments
 (0)