Use more specific assertions (#6858)

* Use isEmpty instead of hasSize(0) in tests * Use isNull() instead of isEqualTo(null) * Use fluent assertion for AtomicInteger * Refactor test to use hasSize assertion * Use singleElement to replace hasSize(1) and using collection 0 index
detekt · Apr 5, 2024 · 0f32dcd · 0f32dcd
1 parent 2256f8a
commit 0f32dcd
Show file tree

Hide file tree

Showing 46 changed files with 189 additions and 237 deletions.
diff --git a/detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/ConfigPropertySpec.kt b/detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/ConfigPropertySpec.kt
@@ -446,7 +446,7 @@ class ConfigPropertySpec {
                 repeat(5) {
                     assertThat(subject.useProperty()).isEqualTo("something with 1")
                 }
-                assertThat(subject.counter.get()).isEqualTo(1)
+                assertThat(subject.counter).hasValue(1)
             }
         }
     }

diff --git a/detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/PropertiesAwareSpec.kt b/detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/PropertiesAwareSpec.kt
@@ -38,7 +38,7 @@ class PropertiesAwareSpec {
 
     @Test
     fun `returns null on absent values`() {
-        assertThat(store.getOrNull<Boolean>("absent")).isEqualTo(null)
+        assertThat(store.getOrNull<Boolean>("absent")).isNull()
     }
 
     @Test

diff --git a/...tor/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/collection/RuleCollectorSpec.kt b/...tor/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/collection/RuleCollectorSpec.kt
@@ -214,7 +214,7 @@ class RuleCollectorSpec {
                 defaultAndroidValue = null,
                 deprecated = null
             )
-            assertThat(items[0].configurations[0]).isEqualTo(expectedConfiguration)
+            assertThat(items[0].configurations).singleElement().isEqualTo(expectedConfiguration)
         }
 
         @Test
@@ -531,7 +531,7 @@ class RuleCollectorSpec {
                     }
                 """.trimIndent()
                 val items = subject.run(code)
-                assertThat(items[0].configurations[0]).isEqualTo(
+                assertThat(items[0].configurations).singleElement().isEqualTo(
                     Configuration(
                         name = "maxLineLength",
                         description = "description",
@@ -555,7 +555,7 @@ class RuleCollectorSpec {
                     }
                 """.trimIndent()
                 val items = subject.run(code)
-                assertThat(items[0].configurations[0]).isEqualTo(
+                assertThat(items[0].configurations).singleElement().isEqualTo(
                     Configuration(
                         name = "maxLineLength",
                         description = "description",

diff --git a/...t/kotlin/io/gitlab/arturbosch/detekt/generator/collection/RuleSetProviderCollectorSpec.kt b/...t/kotlin/io/gitlab/arturbosch/detekt/generator/collection/RuleSetProviderCollectorSpec.kt
@@ -130,8 +130,7 @@ class RuleSetProviderCollectorSpec {
         fun `has one rule`() {
             val items = subject.run(code)
             val provider = items[0]
-            assertThat(provider.rules).hasSize(1)
-            assertThat(provider.rules[0]).isEqualTo(ruleName)
+            assertThat(provider.rules).singleElement().isEqualTo(ruleName)
         }
 
         @Test

diff --git a/...kt-metrics/src/test/kotlin/io/github/detekt/metrics/processors/PackageCountVisitorSpec.kt b/...kt-metrics/src/test/kotlin/io/github/detekt/metrics/processors/PackageCountVisitorSpec.kt
@@ -13,11 +13,10 @@ class PackageCountVisitorSpec {
             compileContentForTest(default),
             compileContentForTest(emptyEnum)
         )
-        val count = files
+        val distinctFiles = files
             .map { getData(it) }
             .distinct()
-            .count()
-        assertThat(count).isEqualTo(2)
+        assertThat(distinctFiles).hasSize(2)
     }
 }
 

diff --git a/...xity/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/ComplexConditionSpec.kt b/...xity/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/ComplexConditionSpec.kt
@@ -22,8 +22,9 @@ class ComplexConditionSpec {
 
         val actual = ComplexCondition(testConfig).compileAndLint(code)
 
-        assertThat(actual).hasSize(1)
-        assertThat(actual.first()).isThresholded().withValue(5)
+        assertThat(actual).singleElement()
+            .isThresholded()
+            .withValue(5)
     }
 
     @Test

diff --git a/...complexity/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/LongMethodSpec.kt b/...complexity/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/LongMethodSpec.kt
@@ -76,8 +76,9 @@ class LongMethodSpec {
 
         val findings = subject.compileAndLint(code)
 
-        assertThat(findings).hasSize(1)
-        assertThat(findings[0]).isThresholded().hasValue(6)
+        assertThat(findings).singleElement()
+            .isThresholded()
+            .hasValue(6)
     }
 
     @Test
@@ -100,8 +101,9 @@ class LongMethodSpec {
 
         val findings = subject.compileAndLint(code)
 
-        assertThat(findings).hasSize(1)
-        assertThat(findings[0]).isThresholded().hasValue(8)
+        assertThat(findings).singleElement()
+            .isThresholded()
+            .hasValue(8)
     }
 
     @Test
@@ -155,8 +157,9 @@ class LongMethodSpec {
 
         val findings = subject.compileAndLint(code)
 
-        assertThat(findings).hasSize(1)
+        assertThat(findings).singleElement()
+            .isThresholded()
+            .hasValue(6)
         assertThat(findings).hasTextLocations("nestedLongMethod")
-        assertThat(findings[0]).isThresholded().hasValue(6)
     }
 }
diff --git a/...lexity/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/NamedArgumentsSpec.kt b/...lexity/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/NamedArgumentsSpec.kt
@@ -39,7 +39,7 @@ class NamedArgumentsSpec(val env: KotlinCoreEnvironment) {
             }
         """.trimIndent()
         val findings = subject.compileAndLintWithContext(env, code)
-        assertThat(findings).hasSize(0)
+        assertThat(findings).isEmpty()
     }
 
     @Test
@@ -67,7 +67,7 @@ class NamedArgumentsSpec(val env: KotlinCoreEnvironment) {
             }
         """.trimIndent()
         val findings = subject.compileAndLintWithContext(env, code)
-        assertThat(findings).hasSize(0)
+        assertThat(findings).isEmpty()
     }
 
     @Test
@@ -81,7 +81,7 @@ class NamedArgumentsSpec(val env: KotlinCoreEnvironment) {
             }
         """.trimIndent()
         val findings = subject.compileAndLintWithContext(env, code)
-        assertThat(findings).hasSize(0)
+        assertThat(findings).isEmpty()
     }
 
     @Test
@@ -103,7 +103,7 @@ class NamedArgumentsSpec(val env: KotlinCoreEnvironment) {
             val obj = C(a = 1, b = 2, c= 3)
         """.trimIndent()
         val findings = subject.compileAndLintWithContext(env, code)
-        assertThat(findings).hasSize(0)
+        assertThat(findings).isEmpty()
     }
 
     @Test
@@ -114,7 +114,7 @@ class NamedArgumentsSpec(val env: KotlinCoreEnvironment) {
             val obj = C(1, 2)
         """.trimIndent()
         val findings = subject.compileAndLintWithContext(env, code)
-        assertThat(findings).hasSize(0)
+        assertThat(findings).isEmpty()
     }
 
     @Test
@@ -127,7 +127,7 @@ class NamedArgumentsSpec(val env: KotlinCoreEnvironment) {
             }
         """.trimIndent()
         val findings = subject.compileAndLintWithContext(env, code)
-        assertThat(findings).hasSize(0)
+        assertThat(findings).isEmpty()
     }
 
     @Test
@@ -141,7 +141,7 @@ class NamedArgumentsSpec(val env: KotlinCoreEnvironment) {
             }
         """.trimIndent()
         val findings = subject.compileAndLintWithContext(env, code)
-        assertThat(findings).hasSize(0)
+        assertThat(findings).isEmpty()
     }
 
     @Test
@@ -181,7 +181,7 @@ class NamedArgumentsSpec(val env: KotlinCoreEnvironment) {
                 }
             """.trimIndent()
             val findings = subject.compileAndLintWithContext(env, code)
-            assertThat(findings).hasSize(0)
+            assertThat(findings).isEmpty()
         }
 
         @Test
@@ -206,7 +206,7 @@ class NamedArgumentsSpec(val env: KotlinCoreEnvironment) {
             """.trimIndent()
             val subject = NamedArguments(TestConfig("threshold" to 1))
             val findings = subject.compileAndLintWithContext(env, code)
-            assertThat(findings).hasSize(0)
+            assertThat(findings).isEmpty()
         }
     }
 
@@ -226,7 +226,7 @@ class NamedArgumentsSpec(val env: KotlinCoreEnvironment) {
                     }
                 """.trimIndent()
                 val findings = subject.compileAndLintWithContext(env, code)
-                assertThat(findings).hasSize(0)
+                assertThat(findings).isEmpty()
             }
 
             @Test

diff --git a/...xity/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/NestedBlockDepthSpec.kt b/...xity/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/NestedBlockDepthSpec.kt
@@ -55,8 +55,9 @@ class NestedBlockDepthSpec {
             }
         """.trimIndent()
         val findings = subject.lint(code)
-        assertThat(findings).hasSize(1)
-        assertThat(findings[0]).isThresholded().hasValue(5)
+        assertThat(findings).singleElement()
+            .isThresholded()
+            .hasValue(5)
     }
 
     @Test

diff --git a/.../src/test/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/NestedScopeFunctionsSpec.kt b/.../src/test/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/NestedScopeFunctionsSpec.kt
@@ -114,7 +114,7 @@ class NestedScopeFunctionsSpec(private val env: KotlinCoreEnvironment) {
     private fun expectFunctionInMsg(scopeFunction: String) {
         val expected = "The scope function '$scopeFunction' is nested too deeply ('2'). " +
             "The maximum allowed depth is set to '1'."
-        assertThat(actual[0]).hasMessage(expected)
+        assertThat(actual).singleElement().hasMessage(expected)
     }
 
     private fun expectNoFindings() {

diff --git a/...s/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/coroutines/SleepInsteadOfDelaySpec.kt b/...s/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/coroutines/SleepInsteadOfDelaySpec.kt
@@ -23,7 +23,7 @@ class SleepInsteadOfDelaySpec(private val env: KotlinCoreEnvironment) {
                 delay(1000L)
             }
         """.trimIndent()
-        assertThat(subject.compileAndLintWithContext(env, code)).hasSize(0)
+        assertThat(subject.compileAndLintWithContext(env, code)).isEmpty()
     }
 
     @Test

diff --git a/...src/test/kotlin/io/gitlab/arturbosch/detekt/rules/documentation/DeprecatedBlockTagSpec.kt b/...src/test/kotlin/io/gitlab/arturbosch/detekt/rules/documentation/DeprecatedBlockTagSpec.kt
@@ -19,7 +19,7 @@ class DeprecatedBlockTagSpec {
              */
             val v = 2
         """.trimIndent()
-        assertThat(subject.compileAndLint(code)).hasSize(0)
+        assertThat(subject.compileAndLint(code)).isEmpty()
     }
 
     @Nested
@@ -33,14 +33,9 @@ class DeprecatedBlockTagSpec {
             fun ohNo() { }
         """.trimIndent()
 
-        @Test
-        fun `has found something`() {
-            assertThat(subject.compileAndLint(code)).hasSize(1)
-        }
-
         @Test
         fun `correct message`() {
-            assertThat(subject.compileAndLint(code)[0]).hasMessage(
+            assertThat(subject.compileAndLint(code)).singleElement().hasMessage(
                 "@deprecated tag block does not properly report " +
                     "deprecation in Kotlin, use @Deprecated annotation instead"
             )

diff --git a/.../kotlin/io/gitlab/arturbosch/detekt/rules/documentation/UndocumentedPublicPropertySpec.kt b/.../kotlin/io/gitlab/arturbosch/detekt/rules/documentation/UndocumentedPublicPropertySpec.kt
@@ -327,8 +327,9 @@ class UndocumentedPublicPropertySpec {
                 }
             """.trimIndent()
             val findings = subject.compileAndLint(code)
-            assertThat(findings).hasSize(1)
-            assertThat(findings[0]).hasSourceLocation(9, 13)
+            assertThat(findings)
+                .singleElement()
+                .hasSourceLocation(9, 13)
         }
 
         @Test
@@ -347,8 +348,9 @@ class UndocumentedPublicPropertySpec {
                 }
             """.trimIndent()
             val findings = subject.compileAndLint(code)
-            assertThat(findings).hasSize(1)
-            assertThat(findings[0]).hasSourceLocation(2, 9)
+            assertThat(findings)
+                .singleElement()
+                .hasSourceLocation(2, 9)
         }
 
         @Test

diff --git a/...c/test/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/CastNullableToNonNullableTypeSpec.kt b/...c/test/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/CastNullableToNonNullableTypeSpec.kt
@@ -20,12 +20,11 @@ class CastNullableToNonNullableTypeSpec(private val env: KotlinCoreEnvironment)
             }
         """.trimIndent()
         val findings = subject.compileAndLintWithContext(env, code)
-        assertThat(findings).hasSize(1)
-        assertThat(findings).hasStartSourceLocation(2, 17)
-        assertThat(findings[0]).hasMessage(
+        assertThat(findings).singleElement().hasMessage(
             "Use separate `null` assertion and type cast like " +
                 "('(bar ?: error(\"null assertion message\")) as String') instead of 'bar as String'."
         )
+        assertThat(findings).hasStartSourceLocation(2, 17)
     }
 
     @Test
@@ -40,12 +39,11 @@ class CastNullableToNonNullableTypeSpec(private val env: KotlinCoreEnvironment)
             }
         """.trimIndent()
         val findings = subject.compileAndLintWithContext(env, code)
-        assertThat(findings).hasSize(1)
-        assertThat(findings).hasStartSourceLocation(2, 11)
-        assertThat(findings[0]).hasMessage(
+        assertThat(findings).singleElement().hasMessage(
             "Use separate `null` assertion and type cast like " +
                 "('(bar() ?: error(\"null assertion message\")) as Int') instead of 'bar() as Int'."
         )
+        assertThat(findings).hasStartSourceLocation(2, 11)
     }
 
     @Test
@@ -205,8 +203,7 @@ class CastNullableToNonNullableTypeSpec(private val env: KotlinCoreEnvironment)
             }
         """.trimIndent()
         val findings = subject.compileAndLintWithContext(env, code)
-        assertThat(findings).hasSize(1)
-        assertThat(findings[0]).hasMessage(
+        assertThat(findings).singleElement().hasMessage(
             "Use separate `null` assertion and type cast like " +
                 "('(array[0] ?: error(\"null assertion message\")) as T') instead of 'array[0] as T'."
         )

diff --git a/...rorprone/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/CastToNullableTypeSpec.kt b/...rorprone/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/CastToNullableTypeSpec.kt
@@ -19,9 +19,8 @@ class CastToNullableTypeSpec(private val env: KotlinCoreEnvironment) {
             }
         """.trimIndent()
         val findings = subject.compileAndLintWithContext(env, code)
-        assertThat(findings).hasSize(1)
+        assertThat(findings).singleElement().hasMessage("Use the safe cast ('as? String') instead of 'as String?'.")
         assertThat(findings).hasStartSourceLocation(2, 24)
-        assertThat(findings[0]).hasMessage("Use the safe cast ('as? String') instead of 'as String?'.")
     }
 
     @Test