Remove DIKTAT_RULE_SET_ID from expected lint errors (ignored in the…

… new ktlint)
saveourtool · Oct 25, 2022 · 5a8a39d · 5a8a39d
1 parent 311c34e
commit 5a8a39d
Show file tree

Hide file tree

Showing 82 changed files with 105 additions and 187 deletions.
diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/IdentifierNamingWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/IdentifierNamingWarnTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter1
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.Warnings.BACKTICKS_PROHIBITED
 import org.cqfn.diktat.ruleset.constants.Warnings.CLASS_NAME_INCORRECT
@@ -25,7 +24,7 @@ import org.junit.jupiter.api.Tags
 import org.junit.jupiter.api.Test
 
 class IdentifierNamingWarnTest : LintTestBase(::IdentifierNaming) {
-    private val ruleId: String = "$DIKTAT_RULE_SET_ID:${IdentifierNaming.NAME_ID}"
+    private val ruleId: String = IdentifierNaming.NAME_ID
     private val rulesConfigBooleanFunctions: List<RulesConfig> = listOf(
         RulesConfig(FUNCTION_BOOLEAN_PREFIX.name, true,
             mapOf("allowedPrefixes" to "equals, equivalent, foo"))

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/MethodNamingWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/MethodNamingWarnTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter1
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.ruleset.constants.Warnings.FUNCTION_BOOLEAN_PREFIX
 import org.cqfn.diktat.ruleset.constants.Warnings.FUNCTION_NAME_INCORRECT_CASE
 import org.cqfn.diktat.ruleset.constants.Warnings.TYPEALIAS_NAME_INCORRECT_CASE
@@ -13,7 +12,7 @@ import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
 class MethodNamingWarnTest : LintTestBase(::IdentifierNaming) {
-    private val ruleId: String = "$DIKTAT_RULE_SET_ID:${IdentifierNaming.NAME_ID}"
+    private val ruleId: String = IdentifierNaming.NAME_ID
 
     @Test
     @Tag(WarningNames.FUNCTION_NAME_INCORRECT_CASE)

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/PackageNamingWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter1/PackageNamingWarnTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter1
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.Warnings.INCORRECT_PACKAGE_SEPARATOR
 import org.cqfn.diktat.ruleset.constants.Warnings.PACKAGE_NAME_INCORRECT_CASE
@@ -18,7 +17,7 @@ import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
 class PackageNamingWarnTest : LintTestBase(::PackageNaming) {
-    private val ruleId: String = "$DIKTAT_RULE_SET_ID:${PackageNaming.NAME_ID}"
+    private val ruleId: String = PackageNaming.NAME_ID
     private val rulesConfigList: List<RulesConfig> = listOf(
         RulesConfig("DIKTAT_COMMON", true, mapOf("domainName" to "org.cqfn.diktat"))
     )

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/CommentsFormattingTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/CommentsFormattingTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter2
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.ruleset.constants.Warnings
 import org.cqfn.diktat.ruleset.constants.Warnings.IF_ELSE_COMMENTS
 import org.cqfn.diktat.ruleset.rules.chapter2.kdoc.CommentsFormatting
@@ -13,7 +12,7 @@ import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
 class CommentsFormattingTest : LintTestBase(::CommentsFormatting) {
-    private val ruleId = "$DIKTAT_RULE_SET_ID:${CommentsFormatting.NAME_ID}"
+    private val ruleId = CommentsFormatting.NAME_ID
 
     @Test
     @Tag(WarningNames.COMMENT_WHITE_SPACE)

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/HeaderCommentRuleTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/HeaderCommentRuleTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter2
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.Warnings
 import org.cqfn.diktat.ruleset.constants.Warnings.HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE
@@ -18,7 +17,7 @@ import org.junit.jupiter.api.Test
 import java.time.LocalDate
 
 class HeaderCommentRuleTest : LintTestBase(::HeaderCommentRule) {
-    private val ruleId: String = "$DIKTAT_RULE_SET_ID:${HeaderCommentRule.NAME_ID}"
+    private val ruleId: String = HeaderCommentRule.NAME_ID
     private val curYear = LocalDate.now().year
     private val rulesConfigList: List<RulesConfig> = listOf(
         RulesConfig("HEADER_MISSING_OR_WRONG_COPYRIGHT", true,

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocCommentsWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocCommentsWarnTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter2
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.ruleset.constants.Warnings
 import org.cqfn.diktat.ruleset.constants.Warnings.KDOC_EXTRA_PROPERTY
 import org.cqfn.diktat.ruleset.constants.Warnings.KDOC_NO_CLASS_BODY_PROPERTIES_IN_HEADER
@@ -18,7 +17,7 @@ import org.junit.jupiter.api.Tags
 import org.junit.jupiter.api.Test
 
 class KdocCommentsWarnTest : LintTestBase(::KdocComments) {
-    private val ruleId: String = "$DIKTAT_RULE_SET_ID:${KdocComments.NAME_ID}"
+    private val ruleId: String = KdocComments.NAME_ID
 
     @Test
     @Tag(WarningNames.COMMENTED_BY_KDOC)

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocFormattingTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocFormattingTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter2
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.Warnings
 import org.cqfn.diktat.ruleset.constants.Warnings.KDOC_EMPTY_KDOC
@@ -20,7 +19,7 @@ import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
 class KdocFormattingTest : LintTestBase(::KdocFormatting) {
-    private val ruleId: String = "$DIKTAT_RULE_SET_ID:${KdocFormatting.NAME_ID}"
+    private val ruleId: String = KdocFormatting.NAME_ID
     private val funCode = """
          fun foo(a: Int): Int {
              if (false) throw IllegalStateException()

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocMethodsTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocMethodsTest.kt
@@ -1,7 +1,6 @@
 package org.cqfn.diktat.ruleset.chapter2
 
 import org.cqfn.diktat.common.config.rules.DIKTAT_COMMON
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.Warnings.KDOC_TRIVIAL_KDOC_ON_FUNCTION
 import org.cqfn.diktat.ruleset.constants.Warnings.KDOC_WITHOUT_PARAM_TAG
@@ -18,7 +17,7 @@ import org.junit.jupiter.api.Tags
 import org.junit.jupiter.api.Test
 
 class KdocMethodsTest : LintTestBase(::KdocMethods) {
-    private val ruleId: String = "$DIKTAT_RULE_SET_ID:${KdocMethods.NAME_ID}"
+    private val ruleId: String = KdocMethods.NAME_ID
     private val funCode = """
         fun doubleInt(a: Int): Int {
             if (Config.condition) throw IllegalStateException()

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocParamPresentWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocParamPresentWarnTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter2
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.ruleset.constants.Warnings.KDOC_WITHOUT_PARAM_TAG
 import org.cqfn.diktat.ruleset.constants.Warnings.MISSING_KDOC_ON_FUNCTION
 import org.cqfn.diktat.ruleset.rules.chapter2.kdoc.KdocMethods
@@ -13,7 +12,7 @@ import org.junit.jupiter.api.Tags
 import org.junit.jupiter.api.Test
 
 class KdocParamPresentWarnTest : LintTestBase(::KdocMethods) {
-    private val ruleId = "$DIKTAT_RULE_SET_ID:${KdocMethods.NAME_ID}"
+    private val ruleId = KdocMethods.NAME_ID
 
     @Test
     @Tag(WarningNames.KDOC_WITHOUT_PARAM_TAG)

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/comments/CommentedCodeTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/comments/CommentedCodeTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter2.comments
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.ruleset.constants.Warnings.COMMENTED_OUT_CODE
 import org.cqfn.diktat.ruleset.rules.chapter2.comments.CommentsRule
 import org.cqfn.diktat.util.LintTestBase
@@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
 class CommentedCodeTest : LintTestBase(::CommentsRule) {
-    private val ruleId = "$DIKTAT_RULE_SET_ID:${CommentsRule.NAME_ID}"
+    private val ruleId = CommentsRule.NAME_ID
 
     @Test
     @Tag(WarningNames.COMMENTED_OUT_CODE)

diff --git a/...t-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/AnnotationNewLineRuleWarnTest.kt b/...t-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/AnnotationNewLineRuleWarnTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter3
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.ruleset.constants.Warnings
 import org.cqfn.diktat.ruleset.rules.chapter3.AnnotationNewLineRule
 import org.cqfn.diktat.util.LintTestBase
@@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
 class AnnotationNewLineRuleWarnTest : LintTestBase(::AnnotationNewLineRule) {
-    private val ruleId = "$DIKTAT_RULE_SET_ID:${AnnotationNewLineRule.NAME_ID}"
+    private val ruleId = AnnotationNewLineRule.NAME_ID
 
     @Test
     @Tag(WarningNames.ANNOTATION_NEW_LINE)

diff --git a/...at-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BlockStructureBracesWarnTest.kt b/...at-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BlockStructureBracesWarnTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter3
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.Warnings.BRACES_BLOCK_STRUCTURE_ERROR
 import org.cqfn.diktat.ruleset.rules.chapter3.BlockStructureBraces
@@ -12,7 +11,7 @@ import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
 class BlockStructureBracesWarnTest : LintTestBase(::BlockStructureBraces) {
-    private val ruleId = "$DIKTAT_RULE_SET_ID:${BlockStructureBraces.NAME_ID}"
+    private val ruleId = BlockStructureBraces.NAME_ID
     private val rulesConfigList: List<RulesConfig> = listOf(
         RulesConfig(BRACES_BLOCK_STRUCTURE_ERROR.name, true,
             mapOf("openBraceNewline" to "False", "closeBraceNewline" to "False"))

diff --git a/...-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BooleanExpressionsRuleWarnTest.kt b/...-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BooleanExpressionsRuleWarnTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter3
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.ruleset.constants.Warnings
 import org.cqfn.diktat.ruleset.rules.chapter3.BooleanExpressionsRule
 import org.cqfn.diktat.ruleset.utils.KotlinParser
@@ -15,7 +14,7 @@ import java.io.ByteArrayOutputStream
 import java.io.PrintStream
 
 class BooleanExpressionsRuleWarnTest : LintTestBase(::BooleanExpressionsRule) {
-    private val ruleId = "$DIKTAT_RULE_SET_ID:${BooleanExpressionsRule.NAME_ID}"
+    private val ruleId = BooleanExpressionsRule.NAME_ID
 
     @Test
     @Tag(WarningNames.COMPLEX_BOOLEAN_EXPRESSION)

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BracesRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BracesRuleWarnTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter3
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.ruleset.constants.Warnings.NO_BRACES_IN_CONDITIONALS_AND_LOOPS
 import org.cqfn.diktat.ruleset.rules.chapter3.BracesInConditionalsAndLoopsRule
 import org.cqfn.diktat.util.LintTestBase
@@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
 class BracesRuleWarnTest : LintTestBase(::BracesInConditionalsAndLoopsRule) {
-    private val ruleId = "$DIKTAT_RULE_SET_ID:${BracesInConditionalsAndLoopsRule.NAME_ID}"
+    private val ruleId = BracesInConditionalsAndLoopsRule.NAME_ID
 
     @Test
     @Tag(WarningNames.NO_BRACES_IN_CONDITIONALS_AND_LOOPS)

diff --git a/.../src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ClassLikeStructuresOrderRuleWarnTest.kt b/.../src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ClassLikeStructuresOrderRuleWarnTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter3
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.ruleset.chapter3.spaces.describe
 import org.cqfn.diktat.ruleset.constants.Warnings.BLANK_LINE_BETWEEN_PROPERTIES
 import org.cqfn.diktat.ruleset.constants.Warnings.WRONG_ORDER_IN_CLASS_LIKE_STRUCTURES
@@ -15,7 +14,7 @@ import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
 class ClassLikeStructuresOrderRuleWarnTest : LintTestBase(::ClassLikeStructuresOrderRule) {
-    private val ruleId = "$DIKTAT_RULE_SET_ID:${ClassLikeStructuresOrderRule.NAME_ID}"
+    private val ruleId = ClassLikeStructuresOrderRule.NAME_ID
 
     // ===== order of declarations =====
 

diff --git a/...ules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/CollapseIfStatementsRuleWarnTest.kt b/...ules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/CollapseIfStatementsRuleWarnTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter3
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.ruleset.constants.Warnings.COLLAPSE_IF_STATEMENTS
 import org.cqfn.diktat.ruleset.rules.chapter3.CollapseIfStatementsRule
 import org.cqfn.diktat.util.LintTestBase
@@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
 class CollapseIfStatementsRuleWarnTest : LintTestBase(::CollapseIfStatementsRule) {
-    private val ruleId = "$DIKTAT_RULE_SET_ID:${CollapseIfStatementsRule.NAME_ID}"
+    private val ruleId = CollapseIfStatementsRule.NAME_ID
 
     @Test
     @Tag(WarningNames.COLLAPSE_IF_STATEMENTS)

diff --git a/...t-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ConsecutiveSpacesRuleWarnTest.kt b/...t-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ConsecutiveSpacesRuleWarnTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter3
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.Warnings.TOO_MANY_CONSECUTIVE_SPACES
 import org.cqfn.diktat.ruleset.rules.chapter3.ConsecutiveSpacesRule
@@ -12,7 +11,7 @@ import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
 class ConsecutiveSpacesRuleWarnTest : LintTestBase(::ConsecutiveSpacesRule) {
-    private val ruleId = "$DIKTAT_RULE_SET_ID:${ConsecutiveSpacesRule.NAME_ID}"
+    private val ruleId = ConsecutiveSpacesRule.NAME_ID
     private val rulesConfigListNoSpaces: List<RulesConfig> = listOf(
         RulesConfig(TOO_MANY_CONSECUTIVE_SPACES.name, true,
             mapOf("maxSpaces" to "2"))

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/DebugPrintRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/DebugPrintRuleWarnTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter3
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.ruleset.constants.Warnings
 import org.cqfn.diktat.ruleset.rules.chapter3.DebugPrintRule
 import org.cqfn.diktat.util.LintTestBase
@@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
 class DebugPrintRuleWarnTest : LintTestBase(::DebugPrintRule) {
-    private val ruleId = "$DIKTAT_RULE_SET_ID:${DebugPrintRule.NAME_ID}"
+    private val ruleId = DebugPrintRule.NAME_ID
 
     @Test
     @Tag(WarningNames.DEBUG_PRINT)

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EmptyBlockWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EmptyBlockWarnTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter3
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.Warnings.EMPTY_BLOCK_STRUCTURE_ERROR
 import org.cqfn.diktat.ruleset.rules.chapter3.EmptyBlock
@@ -12,7 +11,7 @@ import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
 class EmptyBlockWarnTest : LintTestBase(::EmptyBlock) {
-    private val ruleId = "$DIKTAT_RULE_SET_ID:${EmptyBlock.NAME_ID}"
+    private val ruleId = EmptyBlock.NAME_ID
     private val rulesConfigListIgnoreEmptyBlock: List<RulesConfig> = listOf(
         RulesConfig(EMPTY_BLOCK_STRUCTURE_ERROR.name, true,
             mapOf("styleEmptyBlockWithNewline" to "False"))

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EnumsSeparatedWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/EnumsSeparatedWarnTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter3
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.ruleset.constants.Warnings.ENUMS_SEPARATED
 import org.cqfn.diktat.ruleset.rules.chapter3.EnumsSeparated
 import org.cqfn.diktat.util.LintTestBase
@@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
 class EnumsSeparatedWarnTest : LintTestBase(::EnumsSeparated) {
-    private val ruleId = "$DIKTAT_RULE_SET_ID:${EnumsSeparated.NAME_ID}"
+    private val ruleId = EnumsSeparated.NAME_ID
 
     @Test
     @Tag(WarningNames.ENUMS_SEPARATED)

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/FileSizeWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/FileSizeWarnTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter3
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.Warnings
 import org.cqfn.diktat.ruleset.rules.chapter3.files.FileSize
@@ -14,7 +13,7 @@ import org.junit.jupiter.api.Test
 import java.io.File
 
 class FileSizeWarnTest : LintTestBase(::FileSize) {
-    private val ruleId = "$DIKTAT_RULE_SET_ID:${FileSize.NAME_ID}"
+    private val ruleId = FileSize.NAME_ID
     private val rulesConfigListLarge: List<RulesConfig> = listOf(
         RulesConfig(Warnings.FILE_IS_TOO_LONG.name, true,
             mapOf("maxSize" to "5"))

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/FileStructureRuleTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/FileStructureRuleTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter3
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.Warnings
 import org.cqfn.diktat.ruleset.constants.Warnings.FILE_CONTAINS_ONLY_COMMENTS
@@ -18,7 +17,7 @@ import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
 class FileStructureRuleTest : LintTestBase(::FileStructureRule) {
-    private val ruleId = "$DIKTAT_RULE_SET_ID:${FileStructureRule.NAME_ID}"
+    private val ruleId = FileStructureRule.NAME_ID
     private val rulesConfigListWildCardImport: List<RulesConfig> = listOf(
         RulesConfig(FILE_WILDCARD_IMPORTS.name, true,
             mapOf("allowedWildcards" to "org.cqfn.diktat.*"))

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LineLengthWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LineLengthWarnTest.kt
@@ -2,7 +2,6 @@
 
 package org.cqfn.diktat.ruleset.chapter3
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.common.config.rules.RulesConfig
 import org.cqfn.diktat.ruleset.constants.Warnings.LONG_LINE
 import org.cqfn.diktat.ruleset.rules.chapter3.LineLength
@@ -14,7 +13,7 @@ import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
 class LineLengthWarnTest : LintTestBase(::LineLength) {
-    private val ruleId = "$DIKTAT_RULE_SET_ID:${LineLength.NAME_ID}"
+    private val ruleId = LineLength.NAME_ID
     private val rulesConfigListLineLength: List<RulesConfig> = listOf(
         RulesConfig(LONG_LINE.name, true,
             mapOf("lineLength" to "163"))

diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LocalVariablesWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LocalVariablesWarnTest.kt
@@ -1,6 +1,5 @@
 package org.cqfn.diktat.ruleset.chapter3
 
-import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID
 import org.cqfn.diktat.ruleset.constants.Warnings
 import org.cqfn.diktat.ruleset.rules.chapter3.identifiers.LocalVariablesRule
 import org.cqfn.diktat.util.LintTestBase
@@ -13,7 +12,7 @@ import org.junit.jupiter.api.Test
 
 @Suppress("LargeClass")
 class LocalVariablesWarnTest : LintTestBase(::LocalVariablesRule) {
-    private val ruleId = "$DIKTAT_RULE_SET_ID:${LocalVariablesRule.NAME_ID}"
+    private val ruleId = LocalVariablesRule.NAME_ID
 
     private fun warnMessage(name: String,
                             declared: Int,