10 files changed, 13 insertions, 11 deletions
diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/ArchitectureTests.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/ArchitectureTest.kt
index 4c0eac135e..b6618713dd 100644
--- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/ArchitectureTests.kt
+++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/ArchitectureTest.kt
@@ -5,7 +5,7 @@ import com.lemonappdev.konsist.api.architecture.KoArchitectureCreator.assertArch
 import com.lemonappdev.konsist.api.architecture.Layer
 import org.junit.jupiter.api.Test
 
-class ArchitectureTests {
+class ArchitectureTest {
 
     @Test
     fun `ensure model layer depends on nothing`() =
diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/GeneralTests.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/GeneralTest.kt
index a4049270ed..238ad2066c 100644
--- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/GeneralTests.kt
+++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/GeneralTest.kt
@@ -6,7 +6,7 @@ import com.lemonappdev.konsist.api.verify.assert
 import com.lemonappdev.konsist.api.verify.assertNot
 import org.junit.jupiter.api.Test
 
-class GeneralTests {
+class GeneralTest {
     @Test
     fun `ensure package name must match file path`() =
         Konsist.scopeFromProject().packages.assert { it.hasMatchingPath }
diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/JUnitTests.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/JUnitTest.kt
index bce85d8f8a..e676b55d7d 100644
--- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/JUnitTests.kt
+++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/JUnitTest.kt
@@ -4,7 +4,7 @@ import com.lemonappdev.konsist.api.Konsist
 import com.lemonappdev.konsist.api.verify.assertEmpty
 import org.junit.jupiter.api.Test
 
-class JUnitTests {
+class JUnitTest {
 
     @Test
     fun `ensure only junit5 annotations are used for functions`() =
diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/KonsistTests.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/KonsistTest.kt
index a1994c4a83..e47e20dd30 100644
--- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/KonsistTests.kt
+++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/KonsistTest.kt
@@ -5,7 +5,7 @@ import com.lemonappdev.konsist.api.ext.list.withAnnotationOf
 import com.lemonappdev.konsist.api.verify.assert
 import org.junit.jupiter.api.Test
 
-class KonsistTests {
+class KonsistTest {
     @Test
     fun `ensure konsist tests have 'ensure ' prefix`() =
         Konsist.scopeFromModule("test/arch").functions().withAnnotationOf(Test::class).assert {
diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/ViewModelTests.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/ViewModelTest.kt
index d80959af78..a612999a18 100644
--- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/ViewModelTests.kt
+++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/ViewModelTest.kt
@@ -10,7 +10,7 @@ import com.lemonappdev.konsist.api.verify.assert
 import com.lemonappdev.konsist.api.verify.assertNot
 import org.junit.jupiter.api.Test
 
-class ViewModelTests {
+class ViewModelTest {
     @Test
     fun `ensure view models have view model suffix`() =
         allViewModels().assert { it.name.endsWith("ViewModel") }
diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/ClassTests.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/ClassTest.kt
index 00b18354f3..cb2cd8f50b 100644
--- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/ClassTests.kt
+++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/ClassTest.kt
@@ -4,7 +4,7 @@ import com.lemonappdev.konsist.api.Konsist
 import com.lemonappdev.konsist.api.verify.assertTrue
 import org.junit.jupiter.api.Test
 
-class ClassTests {
+class ClassTest {
     @Test
     fun `ensure companion object is last declaration in the class`() =
         Konsist.scopeFromProject().classes(includeNested = true).assertTrue {
@@ -20,5 +20,7 @@ class ClassTests {
 
     @Test
     fun `ensure test classes have 'Test' suffix`() =
-        Konsist.scopeFromTest().classes().assertTrue { it.hasNameEndingWith("Test") }
+        Konsist.scopeFromTest().classes(includeNested = false).assertTrue {
+            it.hasNameEndingWith("Test")
+        }
 }
diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTests.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTest.kt
index 06ffaddcc3..2236b964d5 100644
--- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTests.kt
+++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/DataClassTest.kt
@@ -6,7 +6,7 @@ import com.lemonappdev.konsist.api.ext.list.properties
 import com.lemonappdev.konsist.api.verify.assertNot
 import org.junit.jupiter.api.Test
 
-class DataClassTests {
+class DataClassTest {
     @Test
     fun `ensure data classes only use immutable properties`() =
         Konsist.scopeFromProject()
diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/ValueClassTests.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/ValueClassTest.kt
index 9d085876fd..2b45d44816 100644
--- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/ValueClassTests.kt
+++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/classes/ValueClassTest.kt
@@ -5,7 +5,7 @@ import com.lemonappdev.konsist.api.ext.list.modifierprovider.withValueModifier
 import com.lemonappdev.konsist.api.verify.assertTrue
 import org.junit.jupiter.api.Test
 
-class ValueClassTests {
+class ValueClassTest {
     @Test
     fun `ensure value classes property is named value`() {
         Konsist.scopeFromProject().classes(includeNested = true).withValueModifier().assertTrue {
diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/compose/ComposePreviewTests.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/compose/ComposePreviewTest.kt
index 1c2df4bdd7..4b7680562c 100644
--- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/compose/ComposePreviewTests.kt
+++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/compose/ComposePreviewTest.kt
@@ -6,7 +6,7 @@ import com.lemonappdev.konsist.api.ext.list.withAllAnnotationsOf
 import com.lemonappdev.konsist.api.verify.assert
 import org.junit.jupiter.api.Test
 
-class ComposePreviewTests {
+class ComposePreviewTest {
     @Test
     fun `ensure all preview functions are private`() =
         allPreviewFunctions().assert { it.hasPrivateModifier }
diff --git a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/compose/ComposeTests.kt b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/compose/ComposeTest.kt
index 2f7bb481fd..be06c6b0b6 100644
--- a/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/compose/ComposeTests.kt
+++ b/android/test/arch/src/test/kotlin/net/mullvad/mullvadvpn/test/arch/compose/ComposeTest.kt
@@ -6,7 +6,7 @@ import com.lemonappdev.konsist.api.ext.list.withAllAnnotationsOf
 import com.lemonappdev.konsist.api.verify.assert
 import org.junit.jupiter.api.Test
 
-class ComposeTests {
+class ComposeTest {
     @Test
     fun `ensure all app composables are in the compose package`() =
         allAppComposeFunctions().assert { it.resideInPackage("net.mullvad.mullvadvpn.compose..") }