Skip to content

Commit 309b6a4

Browse files
committed
Unify test class suffix
1 parent a8828b2 commit 309b6a4

File tree

10 files changed

+13
-11
lines changed

10 files changed

+13
-11
lines changed

android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/ArchitectureTests.kt android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/ArchitectureTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.lemonappdev.konsist.api.architecture.KoArchitectureCreator.assertArch
55
import com.lemonappdev.konsist.api.architecture.Layer
66
import org.junit.jupiter.api.Test
77

8-
class ArchitectureTests {
8+
class ArchitectureTest {
99

1010
@Test
1111
fun `ensure model layer depends on nothing`() =

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.lemonappdev.konsist.api.verify.assert
66
import com.lemonappdev.konsist.api.verify.assertNot
77
import org.junit.jupiter.api.Test
88

9-
class GeneralTests {
9+
class GeneralTest {
1010
@Test
1111
fun `ensure package name must match file path`() =
1212
Konsist.scopeFromProject().packages.assert { it.hasMatchingPath }

android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/JUnitTests.kt android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/JUnitTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.lemonappdev.konsist.api.Konsist
44
import com.lemonappdev.konsist.api.verify.assertEmpty
55
import org.junit.jupiter.api.Test
66

7-
class JUnitTests {
7+
class JUnitTest {
88

99
@Test
1010
fun `ensure only junit5 annotations are used for functions`() =

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.lemonappdev.konsist.api.ext.list.withAnnotationOf
55
import com.lemonappdev.konsist.api.verify.assert
66
import org.junit.jupiter.api.Test
77

8-
class KonsistTests {
8+
class KonsistTest {
99
@Test
1010
fun `ensure konsist tests have 'ensure ' prefix`() =
1111
Konsist.scopeFromModule("test/arch").functions().withAnnotationOf(Test::class).assert {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import com.lemonappdev.konsist.api.verify.assert
1010
import com.lemonappdev.konsist.api.verify.assertNot
1111
import org.junit.jupiter.api.Test
1212

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

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.lemonappdev.konsist.api.Konsist
44
import com.lemonappdev.konsist.api.verify.assertTrue
55
import org.junit.jupiter.api.Test
66

7-
class ClassTests {
7+
class ClassTest {
88
@Test
99
fun `ensure companion object is last declaration in the class`() =
1010
Konsist.scopeFromProject().classes(includeNested = true).assertTrue {
@@ -20,5 +20,7 @@ class ClassTests {
2020

2121
@Test
2222
fun `ensure test classes have 'Test' suffix`() =
23-
Konsist.scopeFromTest().classes().assertTrue { it.hasNameEndingWith("Test") }
23+
Konsist.scopeFromTest().classes(includeNested = false).assertTrue {
24+
it.hasNameEndingWith("Test")
25+
}
2426
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.lemonappdev.konsist.api.ext.list.properties
66
import com.lemonappdev.konsist.api.verify.assertNot
77
import org.junit.jupiter.api.Test
88

9-
class DataClassTests {
9+
class DataClassTest {
1010
@Test
1111
fun `ensure data classes only use immutable properties`() =
1212
Konsist.scopeFromProject()

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.lemonappdev.konsist.api.ext.list.modifierprovider.withValueModifier
55
import com.lemonappdev.konsist.api.verify.assertTrue
66
import org.junit.jupiter.api.Test
77

8-
class ValueClassTests {
8+
class ValueClassTest {
99
@Test
1010
fun `ensure value classes property is named value`() {
1111
Konsist.scopeFromProject().classes(includeNested = true).withValueModifier().assertTrue {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.lemonappdev.konsist.api.ext.list.withAllAnnotationsOf
66
import com.lemonappdev.konsist.api.verify.assert
77
import org.junit.jupiter.api.Test
88

9-
class ComposePreviewTests {
9+
class ComposePreviewTest {
1010
@Test
1111
fun `ensure all preview functions are private`() =
1212
allPreviewFunctions().assert { it.hasPrivateModifier }

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.lemonappdev.konsist.api.ext.list.withAllAnnotationsOf
66
import com.lemonappdev.konsist.api.verify.assert
77
import org.junit.jupiter.api.Test
88

9-
class ComposeTests {
9+
class ComposeTest {
1010
@Test
1111
fun `ensure all app composables are in the compose package`() =
1212
allAppComposeFunctions().assert { it.resideInPackage("net.mullvad.mullvadvpn.compose..") }

0 commit comments

Comments
 (0)