re-used constants

saveourtool · Mar 24, 2023 · a5e9f97 · a5e9f97
1 parent d71a7a0
commit a5e9f97
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/diktat-gradle-plugin/src/main/kotlin/org/cqfn/diktat/plugin/gradle/DiktatJavaExecTaskBase.kt b/diktat-gradle-plugin/src/main/kotlin/org/cqfn/diktat/plugin/gradle/DiktatJavaExecTaskBase.kt
@@ -1,6 +1,7 @@
 package org.cqfn.diktat.plugin.gradle
 
 import org.cqfn.diktat.common.config.rules.DIKTAT_CONF_PROPERTY
+import org.cqfn.diktat.common.ktlint.ktlintDisabledRulesArgument
 import org.cqfn.diktat.plugin.gradle.DiktatGradlePlugin.Companion.DIKTAT_CHECK_TASK
 import org.cqfn.diktat.plugin.gradle.DiktatGradlePlugin.Companion.DIKTAT_FIX_TASK
 import org.cqfn.diktat.plugin.gradle.DiktatGradlePlugin.Companion.MIN_JVM_REQUIRES_ADD_OPENS
@@ -99,13 +100,7 @@ open class DiktatJavaExecTaskBase @Inject constructor(
              * Classpath exclusion (see `DiktatGradlePlugin`) is enough, but
              * this is better left enabled as a safety net.
              */
-            run {
-                val ktlintRuleSetIds = sequenceOf("standard", "experimental", "test", "custom")
-                ktlintRuleSetIds.joinToString(
-                    prefix = "--disabled_rules=",
-                    separator = ","
-                )
-            }.let(::add)
+            add(ktlintDisabledRulesArgument)
 
             if (diktatExtension.debug) {
                 add("--debug")

diff --git a/diktat-gradle-plugin/src/test/kotlin/org/cqfn/diktat/plugin/gradle/DiktatJavaExecTaskTest.kt b/diktat-gradle-plugin/src/test/kotlin/org/cqfn/diktat/plugin/gradle/DiktatJavaExecTaskTest.kt
@@ -1,6 +1,7 @@
 package org.cqfn.diktat.plugin.gradle
 
 import org.cqfn.diktat.common.config.rules.DIKTAT_CONF_PROPERTY
+import org.cqfn.diktat.common.ktlint.ktlintDisabledRulesArgument
 
 import org.gradle.api.Project
 import org.gradle.testfixtures.ProjectBuilder
@@ -35,7 +36,7 @@ class DiktatJavaExecTaskTest {
         assertCommandLineEquals(
             listOf(
                 null,
-                DISABLED_RULES,
+                ktlintDisabledRulesArgument,
                 combinePathParts("src", "main", "kotlin", "Test.kt"),
                 "--reporter=plain"
             )
@@ -49,7 +50,7 @@ class DiktatJavaExecTaskTest {
         assertCommandLineEquals(
             listOf(
                 null,
-                DISABLED_RULES,
+                ktlintDisabledRulesArgument,
                 "--debug",
                 combinePathParts("src", "main", "kotlin", "Test.kt"),
                 "--reporter=plain"
@@ -67,7 +68,7 @@ class DiktatJavaExecTaskTest {
         assertCommandLineEquals(
             listOf(
                 null,
-                DISABLED_RULES,
+                ktlintDisabledRulesArgument,
                 combinePathParts("src", "main", "kotlin", "Test.kt"),
                 "--reporter=plain"
             )
@@ -109,7 +110,7 @@ class DiktatJavaExecTaskTest {
         assertCommandLineEquals(
             listOf(
                 null,
-                DISABLED_RULES,
+                ktlintDisabledRulesArgument,
                 "--reporter=json,output=${project.projectDir.resolve("some.txt")}"
             )
         ) {
@@ -125,7 +126,7 @@ class DiktatJavaExecTaskTest {
         assertCommandLineEquals(
             listOf(
                 null,
-                DISABLED_RULES,
+                ktlintDisabledRulesArgument,
                 "--reporter=json"
             )
         ) {
@@ -141,7 +142,7 @@ class DiktatJavaExecTaskTest {
         assertCommandLineEquals(
             listOf(
                 null,
-                DISABLED_RULES,
+                ktlintDisabledRulesArgument,
                 "--reporter=sarif,output=$path"
             )
         ) {
@@ -162,7 +163,7 @@ class DiktatJavaExecTaskTest {
         assertCommandLineEquals(
             listOf(
                 null,
-                DISABLED_RULES,
+                ktlintDisabledRulesArgument,
                 "--reporter=sarif,output=$path"
             )
         ) {
@@ -179,7 +180,7 @@ class DiktatJavaExecTaskTest {
         assertCommandLineEquals(
             listOf(
                 null,
-                DISABLED_RULES,
+                ktlintDisabledRulesArgument,
                 "--reporter=sarif"
             )
         ) {
@@ -268,6 +269,5 @@ class DiktatJavaExecTaskTest {
 
     companion object {
         private const val DIKTAT_CHECK_TASK = "diktatCheck"
-        private const val DISABLED_RULES = "--disabled_rules=standard,experimental,test,custom"
     }
 }