Added trim() for list of string test directories (#1537)

* Added trim() for testDirs value ### What's done: * added trim() for testDirs value Closes #1288
saveourtool · Oct 28, 2022 · 0046681 · 0046681
1 parent 3beabb0
commit 0046681
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/diktat-common/src/main/kotlin/org/cqfn/diktat/common/config/rules/RulesConfigReader.kt b/diktat-common/src/main/kotlin/org/cqfn/diktat/common/config/rules/RulesConfigReader.kt
@@ -125,7 +125,7 @@ data class CommonConfiguration(private val configuration: Map<String, String>?)
      * List of directory names which will be used to detect test sources
      */
     val testAnchors: List<String> by lazy {
-        val testDirs = (configuration ?: emptyMap()).getOrDefault("testDirs", "test").split(',')
+        val testDirs = (configuration ?: emptyMap()).getOrDefault("testDirs", "test").split(',').map { it.trim() }
         if (testDirs.any { !it.lowercase(Locale.getDefault()).endsWith("test") }) {
             log.error("test directory names should end with `test`")
         }

diff --git a/diktat-common/src/test/kotlin/org/cqfn/diktat/test/ConfigReaderTest.kt b/diktat-common/src/test/kotlin/org/cqfn/diktat/test/ConfigReaderTest.kt
@@ -25,6 +25,7 @@ class ConfigReaderTest {
             .readResource("src/test/resources/test-rules-config.yml")
         requireNotNull(rulesConfigList)
         assert(rulesConfigList.getCommonConfiguration().kotlinVersion == kotlinVersion)
+        assert(rulesConfigList.getCommonConfiguration().testAnchors.contains("androidUnitTest"))
         assert(rulesConfigList.find { it.name == DIKTAT_COMMON }
             ?.configuration
             ?.get("kotlinVersion")

diff --git a/diktat-common/src/test/resources/test-rules-config.yml b/diktat-common/src/test/resources/test-rules-config.yml
@@ -3,6 +3,7 @@
   configuration:
     domainName: org.cqfn.diktat
     kotlinVersion: 1.4.21
+    testDirs: "test, androidUnitTest"
 - name: CLASS_NAME_INCORRECT
   enabled: true
 - name: CONSTANT_UPPERCASE