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 index 45cf508fae..5a09a230a1 100644 --- 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 = 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 index 288c70cec7..68625a9891 100644 --- 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 index 60ddd1e26a..56c68d441b 100644 --- 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 = 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 index 8b87bbc735..dd4efc08ee 100644 --- 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 index 1b030758ea..ac326a8345 100644 --- 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 = 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 index 060b786e24..3588e12af5 100644 --- 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 index 9779a3c7b9..bb31711e6c 100644 --- 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 index d4166a1965..46dc17195f 100644 --- 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 index a44168ec7a..933403bc10 100644 --- 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 index 04aad9c13b..36311df899 100644 --- 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/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/AnnotationNewLineRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/AnnotationNewLineRuleWarnTest.kt index 8fb9cd572c..d432aba954 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/AnnotationNewLineRuleWarnTest.kt +++ b/diktat-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/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BlockStructureBracesWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BlockStructureBracesWarnTest.kt index 23d4eed513..0e083c6cf4 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BlockStructureBracesWarnTest.kt +++ b/diktat-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 = listOf( RulesConfig(BRACES_BLOCK_STRUCTURE_ERROR.name, true, mapOf("openBraceNewline" to "False", "closeBraceNewline" to "False")) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BooleanExpressionsRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BooleanExpressionsRuleWarnTest.kt index e03919276c..95ce3d1790 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/BooleanExpressionsRuleWarnTest.kt +++ b/diktat-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 index 48a9431890..2c1a7f851b 100644 --- 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/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ClassLikeStructuresOrderRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ClassLikeStructuresOrderRuleWarnTest.kt index 2d795bad41..47b36b81d1 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ClassLikeStructuresOrderRuleWarnTest.kt +++ b/diktat-rules/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/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/CollapseIfStatementsRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/CollapseIfStatementsRuleWarnTest.kt index d8c5fe53d6..6f3e344b38 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/CollapseIfStatementsRuleWarnTest.kt +++ b/diktat-rules/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/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ConsecutiveSpacesRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ConsecutiveSpacesRuleWarnTest.kt index 3ae0d5a7a5..9f5e28a170 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/ConsecutiveSpacesRuleWarnTest.kt +++ b/diktat-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 = 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 index e460036f46..a5c1c8974f 100644 --- 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 index e846c948d2..08aef5b023 100644 --- 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 = 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 index 1c2cc672ec..f8385cc855 100644 --- 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 index cd578e1b8e..bacb28525b 100644 --- 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 = 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 index 7d423a3db0..431bab5aa8 100644 --- 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 = 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 index 463090c776..cdd1163514 100644 --- 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 = 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 index 51f59e574f..401c327bac 100644 --- 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, diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LongNumericalValuesSeparatedWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LongNumericalValuesSeparatedWarnTest.kt index f564afc014..7730f22179 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LongNumericalValuesSeparatedWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/LongNumericalValuesSeparatedWarnTest.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.LongNumericalValuesSeparatedRule @@ -12,7 +11,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class LongNumericalValuesSeparatedWarnTest : LintTestBase(::LongNumericalValuesSeparatedRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${LongNumericalValuesSeparatedRule.NAME_ID}" + private val ruleId = LongNumericalValuesSeparatedRule.NAME_ID private val rulesConfig: List = listOf( RulesConfig(Warnings.LONG_NUMERICAL_VALUES_SEPARATED.name, true, mapOf("maxNumberLength" to "2")) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/MagicNumberRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/MagicNumberRuleWarnTest.kt index ec73e59b55..2535cfd256 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/MagicNumberRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/MagicNumberRuleWarnTest.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.MAGIC_NUMBER import org.cqfn.diktat.ruleset.rules.chapter3.MagicNumberRule @@ -12,7 +11,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class MagicNumberRuleWarnTest : LintTestBase(::MagicNumberRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${MagicNumberRule.NAME_ID}" + private val ruleId = MagicNumberRule.NAME_ID private val rulesConfigMagicNumber: List = listOf( RulesConfig( MAGIC_NUMBER.name, true, diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/MultipleModifiersSequenceWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/MultipleModifiersSequenceWarnTest.kt index 8a672bce7a..9ddaa57a19 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/MultipleModifiersSequenceWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/MultipleModifiersSequenceWarnTest.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.WRONG_MULTIPLE_MODIFIERS_ORDER import org.cqfn.diktat.ruleset.rules.chapter3.MultipleModifiersSequence import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class MultipleModifiersSequenceWarnTest : LintTestBase(::MultipleModifiersSequence) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${MultipleModifiersSequence.NAME_ID}" + private val ruleId = MultipleModifiersSequence.NAME_ID @Test @Tag(WarningNames.WRONG_MULTIPLE_MODIFIERS_ORDER) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/NullableTypeRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/NullableTypeRuleWarnTest.kt index a0de2c05eb..48c3222afd 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/NullableTypeRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/NullableTypeRuleWarnTest.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.NULLABLE_PROPERTY_TYPE import org.cqfn.diktat.ruleset.rules.chapter3.NullableTypeRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class NullableTypeRuleWarnTest : LintTestBase(::NullableTypeRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${NullableTypeRule.NAME_ID}" + private val ruleId = NullableTypeRule.NAME_ID @Test @Tag(WarningNames.NULLABLE_PROPERTY_TYPE) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/RangeConventionalRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/RangeConventionalRuleWarnTest.kt index bef1ae0013..56293f385d 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/RangeConventionalRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/RangeConventionalRuleWarnTest.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.RangeConventionalRule @@ -10,7 +9,7 @@ import com.pinterest.ktlint.core.LintError import org.junit.jupiter.api.Test class RangeConventionalRuleWarnTest : LintTestBase(::RangeConventionalRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${RangeConventionalRule.NAME_ID}" + private val ruleId = RangeConventionalRule.NAME_ID private val rulesConfigRangeRule: List = listOf( RulesConfig( Warnings.CONVENTIONAL_RANGE.name, true, diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SingleLineStatementsRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SingleLineStatementsRuleWarnTest.kt index 482de292d4..71b3791a2a 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SingleLineStatementsRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SingleLineStatementsRuleWarnTest.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.MORE_THAN_ONE_STATEMENT_PER_LINE import org.cqfn.diktat.ruleset.rules.chapter3.SingleLineStatementsRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class SingleLineStatementsRuleWarnTest : LintTestBase(::SingleLineStatementsRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${SingleLineStatementsRule.NAME_ID}" + private val ruleId = SingleLineStatementsRule.NAME_ID @Test @Tag(WarningNames.MORE_THAN_ONE_STATEMENT_PER_LINE) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SortRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SortRuleWarnTest.kt index 75bddc621b..9c7fb07614 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SortRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/SortRuleWarnTest.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.WRONG_DECLARATIONS_ORDER import org.cqfn.diktat.ruleset.rules.chapter3.SortRule @@ -12,7 +11,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class SortRuleWarnTest : LintTestBase(::SortRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${SortRule.NAME_ID}" + private val ruleId = SortRule.NAME_ID private val rulesConfigNotSortEnum: List = listOf( RulesConfig(WRONG_DECLARATIONS_ORDER.name, true, mapOf("sortEnum" to "false")) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringConcatenationWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringConcatenationWarnTest.kt index eace0eb09b..2dd15ef98a 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringConcatenationWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringConcatenationWarnTest.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.StringConcatenationRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class StringConcatenationWarnTest : LintTestBase(::StringConcatenationRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${StringConcatenationRule.NAME_ID}" + private val ruleId = StringConcatenationRule.NAME_ID private val canBeAutoCorrected = true @Test diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringTemplateRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringTemplateRuleWarnTest.kt index 1f53b01d40..70f497db2e 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringTemplateRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/StringTemplateRuleWarnTest.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.StringTemplateFormatRule import org.cqfn.diktat.util.LintTestBase @@ -12,7 +11,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class StringTemplateRuleWarnTest : LintTestBase(::StringTemplateFormatRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${StringTemplateFormatRule.NAME_ID}" + private val ruleId = StringTemplateFormatRule.NAME_ID @Test @Tag(STRING_TEMPLATE_CURLY_BRACES) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/TrailingCommaWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/TrailingCommaWarnTest.kt index ca06598ba0..54829d909f 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/TrailingCommaWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/TrailingCommaWarnTest.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.TRAILING_COMMA import org.cqfn.diktat.ruleset.rules.chapter3.TrailingCommaRule @@ -12,7 +11,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class TrailingCommaWarnTest : LintTestBase(::TrailingCommaRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${TrailingCommaRule.NAME_ID}" + private val ruleId = TrailingCommaRule.NAME_ID private fun getRulesConfig(paramName: String): List = listOf( RulesConfig( diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/WhenMustHaveElseWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/WhenMustHaveElseWarnTest.kt index a41baac3ba..4af5e5033d 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/WhenMustHaveElseWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/WhenMustHaveElseWarnTest.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.WhenMustHaveElseRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class WhenMustHaveElseWarnTest : LintTestBase(::WhenMustHaveElseRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${WhenMustHaveElseRule.NAME_ID}" + private val ruleId = WhenMustHaveElseRule.NAME_ID @Test @Tag(WarningNames.WHEN_WITHOUT_ELSE) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/BlankLinesWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/BlankLinesWarnTest.kt index 51bc63d232..a4181f8e3d 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/BlankLinesWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/BlankLinesWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter3.files -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings.TOO_MANY_BLANK_LINES import org.cqfn.diktat.ruleset.rules.chapter3.files.BlankLinesRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class BlankLinesWarnTest : LintTestBase(::BlankLinesRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${BlankLinesRule.NAME_ID}" + private val ruleId = BlankLinesRule.NAME_ID private val consecutiveLinesWarn = "${TOO_MANY_BLANK_LINES.warnText()} do not use more than two consecutive blank lines" private fun blankLinesInBlockWarn(isBeginning: Boolean) = "${TOO_MANY_BLANK_LINES.warnText()} do not put newlines ${if (isBeginning) "in the beginning" else "at the end"} of code blocks" diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/NewlinesRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/NewlinesRuleWarnTest.kt index 3281a0d679..849d8c3e06 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/NewlinesRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/NewlinesRuleWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter3.files -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.COMPLEX_EXPRESSION import org.cqfn.diktat.ruleset.constants.Warnings.REDUNDANT_SEMICOLON @@ -25,7 +24,7 @@ class NewlinesRuleWarnTest : LintTestBase(::NewlinesRule) { RulesConfig(WRONG_NEWLINES.name, true, mapOf("maxCallsInOneLine" to "1")) ) - private val ruleId = "$DIKTAT_RULE_SET_ID:${NewlinesRule.NAME_ID}" + private val ruleId = NewlinesRule.NAME_ID private val dotQuaOrSafeAccessOrPostfixExpression = "${WRONG_NEWLINES.warnText()} wrong split long `dot qualified expression` or `safe access expression`" private val shouldBreakAfter = "${WRONG_NEWLINES.warnText()} should break a line after and not before" private val shouldBreakBefore = "${WRONG_NEWLINES.warnText()} should break a line before and not after" diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/TopLevelOrderRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/TopLevelOrderRuleWarnTest.kt index ec84b2030f..a37e41be57 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/TopLevelOrderRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/files/TopLevelOrderRuleWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter3.files -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings.TOP_LEVEL_ORDER import org.cqfn.diktat.ruleset.rules.chapter3.files.TopLevelOrderRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class TopLevelOrderRuleWarnTest : LintTestBase(::TopLevelOrderRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${TopLevelOrderRule.NAME_ID}" + private val ruleId = TopLevelOrderRule.NAME_ID @Test @Tag(WarningNames.TOP_LEVEL_ORDER) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/ExpectedIndentationError.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/ExpectedIndentationError.kt index b90bb5dd29..289a0783e6 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/ExpectedIndentationError.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/ExpectedIndentationError.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter3.spaces -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings.WRONG_INDENTATION import org.cqfn.diktat.ruleset.junit.ExpectedLintError import org.cqfn.diktat.ruleset.rules.chapter3.files.IndentationRule.Companion.NAME_ID @@ -36,7 +35,7 @@ class ExpectedIndentationError(override val line: Int, LintError( line, column, - "$DIKTAT_RULE_SET_ID:$NAME_ID", + NAME_ID, message, true) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleWarnTest.kt index 79adc34eb8..8f05f506b2 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/IndentationRuleWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter3.spaces -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.WRONG_INDENTATION import org.cqfn.diktat.ruleset.junit.NaturalDisplayName @@ -29,7 +28,7 @@ import org.junit.jupiter.api.TestMethodOrder @Suppress("LargeClass") @TestMethodOrder(NaturalDisplayName::class) class IndentationRuleWarnTest : LintTestBase(::IndentationRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${IndentationRule.NAME_ID}" + private val ruleId = IndentationRule.NAME_ID private val rulesConfigList = listOf( RulesConfig(WRONG_INDENTATION.name, true, mapOf( diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/WhiteSpaceRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/WhiteSpaceRuleWarnTest.kt index d7a5c39077..00015a8c7d 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/WhiteSpaceRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter3/spaces/WhiteSpaceRuleWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter3.spaces -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings.WRONG_WHITESPACE import org.cqfn.diktat.ruleset.rules.chapter3.files.WhiteSpaceRule import org.cqfn.diktat.util.LintTestBase @@ -12,7 +11,7 @@ import org.junit.jupiter.api.Test @Suppress("LargeClass") class WhiteSpaceRuleWarnTest : LintTestBase(::WhiteSpaceRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${WhiteSpaceRule.NAME_ID}" + private val ruleId = WhiteSpaceRule.NAME_ID private val eolSpaceWarn = "${WRONG_WHITESPACE.warnText()} there should be no spaces in the end of line" private val lbraceWarn = "${WRONG_WHITESPACE.warnText()} there should be a whitespace before '{'" private fun keywordWarn(keyword: String, sep: String) = diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/AccurateCalculationsWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/AccurateCalculationsWarnTest.kt index bf5da3910c..07b3d45b04 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/AccurateCalculationsWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/AccurateCalculationsWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter4 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings.FLOAT_IN_ACCURATE_CALCULATIONS import org.cqfn.diktat.ruleset.rules.chapter4.calculations.AccurateCalculationsRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class AccurateCalculationsWarnTest : LintTestBase(::AccurateCalculationsRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${AccurateCalculationsRule.NAME_ID}" + private val ruleId = AccurateCalculationsRule.NAME_ID private fun warnText(ref: String, expr: String) = "${FLOAT_IN_ACCURATE_CALCULATIONS.warnText()} float value of <$ref> used in arithmetic expression in $expr" diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NoVarRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NoVarRuleWarnTest.kt index fc954509ae..113202246d 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NoVarRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NoVarRuleWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter4 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.chapter4.ImmutableValNoVarRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class NoVarRuleWarnTest : LintTestBase(::ImmutableValNoVarRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${ImmutableValNoVarRule.NAME_ID}" + private val ruleId = ImmutableValNoVarRule.NAME_ID @Test @Tag(SAY_NO_TO_VAR) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NullChecksRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NullChecksRuleWarnTest.kt index cf7d11726f..fcebf12568 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NullChecksRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NullChecksRuleWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter4 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.chapter4.NullChecksRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class NullChecksRuleWarnTest : LintTestBase(::NullChecksRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${NullChecksRule.NAME_ID}" + private val ruleId = NullChecksRule.NAME_ID @Test @Tag(WarningNames.AVOID_NULL_CHECKS) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/SmartCastRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/SmartCastRuleWarnTest.kt index 300cd4648f..c28c5267c8 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/SmartCastRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/SmartCastRuleWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter4 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.chapter4.SmartCastRule import org.cqfn.diktat.util.LintTestBase @@ -12,7 +11,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class SmartCastRuleWarnTest : LintTestBase(::SmartCastRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${SmartCastRule.NAME_ID}" + private val ruleId = SmartCastRule.NAME_ID @Test @Tag(SMART_CAST_NEEDED) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/TypeAliasRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/TypeAliasRuleWarnTest.kt index c3fd6297d7..240abcae00 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/TypeAliasRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/TypeAliasRuleWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter4 -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.TYPE_ALIAS import org.cqfn.diktat.ruleset.rules.chapter4.TypeAliasRule @@ -12,7 +11,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class TypeAliasRuleWarnTest : LintTestBase(::TypeAliasRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${TypeAliasRule.NAME_ID}" + private val ruleId = TypeAliasRule.NAME_ID private val rulesConfigListShortType: List = listOf( RulesConfig(TYPE_ALIAS.name, true, mapOf("typeReferenceLength" to "4")) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/VariableGenericTypeDeclarationRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/VariableGenericTypeDeclarationRuleWarnTest.kt index d48aa0aee6..5c25ca2a1c 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/VariableGenericTypeDeclarationRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/VariableGenericTypeDeclarationRuleWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter4 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.chapter4.VariableGenericTypeDeclarationRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class VariableGenericTypeDeclarationRuleWarnTest : LintTestBase(::VariableGenericTypeDeclarationRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${VariableGenericTypeDeclarationRule.NAME_ID}" + private val ruleId = VariableGenericTypeDeclarationRule.NAME_ID @Test @Tag(GENERIC_VARIABLE_WRONG_DECLARATION) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AsyncAndSyncRuleTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AsyncAndSyncRuleTest.kt index 469294936d..b9b639ff94 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AsyncAndSyncRuleTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AsyncAndSyncRuleTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter5 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings.RUN_BLOCKING_INSIDE_ASYNC import org.cqfn.diktat.ruleset.rules.chapter5.AsyncAndSyncRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class AsyncAndSyncRuleTest : LintTestBase(::AsyncAndSyncRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${AsyncAndSyncRule.NAME_ID}" + private val ruleId = AsyncAndSyncRule.NAME_ID @Test @Tag(WarningNames.RUN_BLOCKING_INSIDE_ASYNC) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AvoidNestedFunctionsWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AvoidNestedFunctionsWarnTest.kt index 248e915dd2..32d80fa488 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AvoidNestedFunctionsWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/AvoidNestedFunctionsWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter5 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.chapter5.AvoidNestedFunctionsRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class AvoidNestedFunctionsWarnTest : LintTestBase(::AvoidNestedFunctionsRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${AvoidNestedFunctionsRule.NAME_ID}" + private val ruleId = AvoidNestedFunctionsRule.NAME_ID @Test @Tag(AVOID_NESTED_FUNCTIONS) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CheckInverseMethodRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CheckInverseMethodRuleWarnTest.kt index 17ab8bba16..b31f2c5a02 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CheckInverseMethodRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CheckInverseMethodRuleWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter5 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.chapter5.CheckInverseMethodRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class CheckInverseMethodRuleWarnTest : LintTestBase(::CheckInverseMethodRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${CheckInverseMethodRule.NAME_ID}" + private val ruleId = CheckInverseMethodRule.NAME_ID @Test @Tag(INVERSE_FUNCTION_PREFERRED) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CustomLabelsTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CustomLabelsTest.kt index 95d0440526..9c054aa573 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CustomLabelsTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/CustomLabelsTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter5 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings.CUSTOM_LABEL import org.cqfn.diktat.ruleset.rules.chapter5.CustomLabel import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class CustomLabelsTest : LintTestBase(::CustomLabel) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${CustomLabel.NAME_ID}" + private val ruleId = CustomLabel.NAME_ID @Test @Tag(WarningNames.CUSTOM_LABEL) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/FunctionArgumentsSizeWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/FunctionArgumentsSizeWarnTest.kt index cbe78faacf..8da4cb609f 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/FunctionArgumentsSizeWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/FunctionArgumentsSizeWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter5 -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_PARAMETERS import org.cqfn.diktat.ruleset.rules.chapter5.FunctionArgumentsSize @@ -12,7 +11,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class FunctionArgumentsSizeWarnTest : LintTestBase(::FunctionArgumentsSize) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${FunctionArgumentsSize.NAME_ID}" + private val ruleId = FunctionArgumentsSize.NAME_ID private val rulesConfigList: List = listOf( RulesConfig(TOO_MANY_PARAMETERS.name, true, mapOf("maxParameterListSize" to "1")) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/FunctionLengthWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/FunctionLengthWarnTest.kt index 35b67631bc..e34c3dc718 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/FunctionLengthWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/FunctionLengthWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter5 -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_LONG_FUNCTION import org.cqfn.diktat.ruleset.rules.chapter5.FunctionLength @@ -12,7 +11,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class FunctionLengthWarnTest : LintTestBase(::FunctionLength) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${FunctionLength.NAME_ID}" + private val ruleId = FunctionLength.NAME_ID private val rulesConfigList: List = listOf( RulesConfig(TOO_LONG_FUNCTION.name, true, mapOf("maxFunctionLength" to "5")) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/LambdaLengthWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/LambdaLengthWarnTest.kt index f1c3cdd249..c577dbb6be 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/LambdaLengthWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/LambdaLengthWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter5 -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.chapter5.LambdaLengthRule @@ -12,7 +11,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class LambdaLengthWarnTest : LintTestBase(::LambdaLengthRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${LambdaLengthRule.NAME_ID}" + private val ruleId = LambdaLengthRule.NAME_ID private val rulesConfigList: List = listOf( RulesConfig( Warnings.TOO_MANY_LINES_IN_LAMBDA.name, true, diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/LambdaParameterOrderWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/LambdaParameterOrderWarnTest.kt index 8cc527f53c..adc193b1f0 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/LambdaParameterOrderWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/LambdaParameterOrderWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter5 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings.LAMBDA_IS_NOT_LAST_PARAMETER import org.cqfn.diktat.ruleset.rules.chapter5.LambdaParameterOrder import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class LambdaParameterOrderWarnTest : LintTestBase(::LambdaParameterOrder) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${LambdaParameterOrder.NAME_ID}" + private val ruleId = LambdaParameterOrder.NAME_ID @Test @Tag(WarningNames.LAMBDA_IS_NOT_LAST_PARAMETER) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/NestedFunctionBlockWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/NestedFunctionBlockWarnTest.kt index 92a733494f..a15b43d50c 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/NestedFunctionBlockWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/NestedFunctionBlockWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter5 -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.NESTED_BLOCK import org.cqfn.diktat.ruleset.rules.chapter5.NestedFunctionBlock @@ -12,7 +11,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class NestedFunctionBlockWarnTest : LintTestBase(::NestedFunctionBlock) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${NestedFunctionBlock.NAME_ID}" + private val ruleId = NestedFunctionBlock.NAME_ID private val rulesConfigList = listOf( RulesConfig(NESTED_BLOCK.name, true, mapOf("maxNestedBlockQuantity" to "2")) ) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/OverloadingArgumentsFunctionWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/OverloadingArgumentsFunctionWarnTest.kt index eac4209fa8..ecd82b3caf 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/OverloadingArgumentsFunctionWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/OverloadingArgumentsFunctionWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter5 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings.WRONG_OVERLOADING_FUNCTION_ARGUMENTS import org.cqfn.diktat.ruleset.rules.chapter5.OverloadingArgumentsFunction import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class OverloadingArgumentsFunctionWarnTest : LintTestBase(::OverloadingArgumentsFunction) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${OverloadingArgumentsFunction.NAME_ID}" + private val ruleId = OverloadingArgumentsFunction.NAME_ID @Test @Tag(WarningNames.WRONG_OVERLOADING_FUNCTION_ARGUMENTS) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/ParameterNameInOuterLambdaRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/ParameterNameInOuterLambdaRuleWarnTest.kt index dda19c367f..b2a280acc6 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/ParameterNameInOuterLambdaRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter5/ParameterNameInOuterLambdaRuleWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter5 -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.chapter5.ParameterNameInOuterLambdaRule @@ -12,7 +11,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class ParameterNameInOuterLambdaRuleWarnTest : LintTestBase(::ParameterNameInOuterLambdaRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${ParameterNameInOuterLambdaRule.NAME_ID}" + private val ruleId = ParameterNameInOuterLambdaRule.NAME_ID private val rulesConfigList: List = listOf( RulesConfig(Warnings.PARAMETER_NAME_IN_OUTER_LAMBDA.name, true) ) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AbstractClassesWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AbstractClassesWarnTest.kt index 21f2176031..2dc31a3a25 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AbstractClassesWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AbstractClassesWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.chapter6.classes.AbstractClassesRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class AbstractClassesWarnTest : LintTestBase(::AbstractClassesRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${AbstractClassesRule.NAME_ID}" + private val ruleId = AbstractClassesRule.NAME_ID @Test @Tag(CLASS_SHOULD_NOT_BE_ABSTRACT) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AvoidUtilityClassWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AvoidUtilityClassWarnTest.kt index 0f18e6312e..9f725a52c3 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AvoidUtilityClassWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/AvoidUtilityClassWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings.AVOID_USING_UTILITY_CLASS import org.cqfn.diktat.ruleset.rules.chapter6.AvoidUtilityClass import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class AvoidUtilityClassWarnTest : LintTestBase(::AvoidUtilityClass) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${AvoidUtilityClass.NAME_ID}" + private val ruleId = AvoidUtilityClass.NAME_ID @Test @Tag(WarningNames.AVOID_USING_UTILITY_CLASS) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CompactInitializationWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CompactInitializationWarnTest.kt index e5eae7488e..b0bb510a17 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CompactInitializationWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CompactInitializationWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings.COMPACT_OBJECT_INITIALIZATION import org.cqfn.diktat.ruleset.rules.chapter6.classes.CompactInitialization import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class CompactInitializationWarnTest : LintTestBase(::CompactInitialization) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${CompactInitialization.NAME_ID}" + private val ruleId = CompactInitialization.NAME_ID @Test @Tag(WarningNames.COMPACT_OBJECT_INITIALIZATION) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CustomGetterSetterWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CustomGetterSetterWarnTest.kt index ef8b1db3fd..4d87cda01b 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CustomGetterSetterWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/CustomGetterSetterWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.chapter6.CustomGetterSetterRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class CustomGetterSetterWarnTest : LintTestBase(::CustomGetterSetterRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${CustomGetterSetterRule.NAME_ID}" + private val ruleId = CustomGetterSetterRule.NAME_ID @Test @Tag(CUSTOM_GETTERS_SETTERS) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/DataClassesRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/DataClassesRuleWarnTest.kt index ce4dba68e7..87cfd4533b 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/DataClassesRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/DataClassesRuleWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.chapter6.classes.DataClassesRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class DataClassesRuleWarnTest : LintTestBase(::DataClassesRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${DataClassesRule.NAME_ID}" + private val ruleId = DataClassesRule.NAME_ID @Test @Tag(USE_DATA_CLASS) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/EmptyPrimaryConstructorWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/EmptyPrimaryConstructorWarnTest.kt index 9f131203c9..f0953ec24b 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/EmptyPrimaryConstructorWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/EmptyPrimaryConstructorWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings.EMPTY_PRIMARY_CONSTRUCTOR import org.cqfn.diktat.ruleset.rules.chapter6.AvoidEmptyPrimaryConstructor import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class EmptyPrimaryConstructorWarnTest : LintTestBase(::AvoidEmptyPrimaryConstructor) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${AvoidEmptyPrimaryConstructor.NAME_ID}" + private val ruleId = AvoidEmptyPrimaryConstructor.NAME_ID @Test @Tag(WarningNames.EMPTY_PRIMARY_CONSTRUCTOR) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ExtensionFunctionsInFileWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ExtensionFunctionsInFileWarnTest.kt index 4cdff48e26..c189654c4b 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ExtensionFunctionsInFileWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ExtensionFunctionsInFileWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.chapter6.ExtensionFunctionsInFileRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class ExtensionFunctionsInFileWarnTest : LintTestBase(::ExtensionFunctionsInFileRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${ExtensionFunctionsInFileRule.NAME_ID}" + private val ruleId = ExtensionFunctionsInFileRule.NAME_ID @Test @Tag(EXTENSION_FUNCTION_WITH_CLASS) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ExtensionFunctionsSameNameWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ExtensionFunctionsSameNameWarnTest.kt index 4760b91db4..20445397ef 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ExtensionFunctionsSameNameWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ExtensionFunctionsSameNameWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.chapter6.ExtensionFunctionsSameNameRule import org.cqfn.diktat.util.LintTestBase @@ -12,7 +11,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class ExtensionFunctionsSameNameWarnTest : LintTestBase(::ExtensionFunctionsSameNameRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${ExtensionFunctionsSameNameRule.NAME_ID}" + private val ruleId = ExtensionFunctionsSameNameRule.NAME_ID @Test @Tag(EXTENSION_FUNCTION_SAME_SIGNATURE) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ImplicitBackingPropertyWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ImplicitBackingPropertyWarnTest.kt index 9433e0e937..b1f693343d 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ImplicitBackingPropertyWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/ImplicitBackingPropertyWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.chapter6.ImplicitBackingPropertyRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class ImplicitBackingPropertyWarnTest : LintTestBase(::ImplicitBackingPropertyRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${ImplicitBackingPropertyRule.NAME_ID}" + private val ruleId = ImplicitBackingPropertyRule.NAME_ID @Test @Tag(NO_CORRESPONDING_PROPERTY) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/InlineClassesWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/InlineClassesWarnTest.kt index e1e7a57700..93abe44257 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/InlineClassesWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/InlineClassesWarnTest.kt @@ -1,7 +1,6 @@ package org.cqfn.diktat.ruleset.chapter6 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.INLINE_CLASS_CAN_BE_USED import org.cqfn.diktat.ruleset.rules.chapter6.classes.InlineClassesRule @@ -13,7 +12,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class InlineClassesWarnTest : LintTestBase(::InlineClassesRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${InlineClassesRule.NAME_ID}" + private val ruleId = InlineClassesRule.NAME_ID private val rulesConfigListEarlierVersion: List = listOf( RulesConfig( DIKTAT_COMMON, true, diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/PropertyAccessorFieldsWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/PropertyAccessorFieldsWarnTest.kt index b488e8a577..fb0ff16b47 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/PropertyAccessorFieldsWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/PropertyAccessorFieldsWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings.WRONG_NAME_OF_VARIABLE_INSIDE_ACCESSOR import org.cqfn.diktat.ruleset.rules.chapter6.PropertyAccessorFields import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class PropertyAccessorFieldsWarnTest : LintTestBase(::PropertyAccessorFields) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${PropertyAccessorFields.NAME_ID}" + private val ruleId = PropertyAccessorFields.NAME_ID @Test @Tag(WarningNames.WRONG_NAME_OF_VARIABLE_INSIDE_ACCESSOR) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/RunInScriptWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/RunInScriptWarnTest.kt index 440dbdf3dd..b31b28ee55 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/RunInScriptWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/RunInScriptWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings.RUN_IN_SCRIPT import org.cqfn.diktat.ruleset.rules.chapter6.RunInScript import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class RunInScriptWarnTest : LintTestBase(::RunInScript) { - private val ruleId: String = "$DIKTAT_RULE_SET_ID:${RunInScript.NAME_ID}" + private val ruleId: String = "${RunInScript.NAME_ID}" @Test @Tag(WarningNames.RUN_IN_SCRIPT) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleConstructorRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleConstructorRuleWarnTest.kt index fe9f1b8066..75c299d318 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleConstructorRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleConstructorRuleWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings.SINGLE_CONSTRUCTOR_SHOULD_BE_PRIMARY import org.cqfn.diktat.ruleset.rules.chapter6.classes.SingleConstructorRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class SingleConstructorRuleWarnTest : LintTestBase(::SingleConstructorRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${SingleConstructorRule.NAME_ID}" + private val ruleId = SingleConstructorRule.NAME_ID @Test @Tag(WarningNames.SINGLE_CONSTRUCTOR_SHOULD_BE_PRIMARY) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleInitRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleInitRuleWarnTest.kt index ebde70f1b6..832dd53057 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleInitRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/SingleInitRuleWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.chapter6.classes.SingleInitRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class SingleInitRuleWarnTest : LintTestBase(::SingleInitRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${SingleInitRule.NAME_ID}" + private val ruleId = SingleInitRule.NAME_ID @Test @Tag(WarningNames.MULTIPLE_INIT_BLOCKS) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/StatelessClassesRuleWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/StatelessClassesRuleWarnTest.kt index 17f9ffe53b..bd8cd6ec3f 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/StatelessClassesRuleWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/StatelessClassesRuleWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.chapter6.classes.StatelessClassesRule import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class StatelessClassesRuleWarnTest : LintTestBase(::StatelessClassesRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${StatelessClassesRule.NAME_ID}" + private val ruleId = StatelessClassesRule.NAME_ID @Test @Tag(OBJECT_IS_PREFERRED) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/TrivialPropertyAccessorsWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/TrivialPropertyAccessorsWarnTest.kt index 7ef6e71bf7..5a1055741a 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/TrivialPropertyAccessorsWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/TrivialPropertyAccessorsWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.chapter6.TrivialPropertyAccessors import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class TrivialPropertyAccessorsWarnTest : LintTestBase(::TrivialPropertyAccessors) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${TrivialPropertyAccessors.NAME_ID}" + private val ruleId = TrivialPropertyAccessors.NAME_ID @Test @Tag(TRIVIAL_ACCESSORS_ARE_NOT_RECOMMENDED) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/UseLastIndexWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/UseLastIndexWarnTest.kt index 444b3eee2b..5337442341 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/UseLastIndexWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/UseLastIndexWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.chapter6.UseLastIndex import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class UseLastIndexWarnTest : LintTestBase(::UseLastIndex) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${UseLastIndex.NAME_ID}" + private val ruleId = UseLastIndex.NAME_ID @Test @Tag(WarningNames.USE_LAST_INDEX) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/UselessSupertypeWarnTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/UselessSupertypeWarnTest.kt index 45aaf6f58b..32954df947 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/UselessSupertypeWarnTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter6/UselessSupertypeWarnTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.chapter6 -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings.USELESS_SUPERTYPE import org.cqfn.diktat.ruleset.rules.chapter6.UselessSupertype import org.cqfn.diktat.util.LintTestBase @@ -11,7 +10,7 @@ import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Test class UselessSupertypeWarnTest : LintTestBase(::UselessSupertype) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${UselessSupertype.NAME_ID}" + private val ruleId = UselessSupertype.NAME_ID @Test @Tag(WarningNames.USELESS_SUPERTYPE) diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSmokeTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSmokeTest.kt index 6276dc6556..fbe8f77393 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSmokeTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSmokeTest.kt @@ -1,7 +1,6 @@ package org.cqfn.diktat.ruleset.smoke import org.cqfn.diktat.common.config.rules.DIKTAT_COMMON -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings.KDOC_NO_EMPTY_TAGS import org.cqfn.diktat.ruleset.constants.Warnings.MISSING_KDOC_CLASS_ELEMENTS import org.cqfn.diktat.ruleset.constants.Warnings.MISSING_KDOC_ON_FUNCTION @@ -75,7 +74,7 @@ class DiktatSmokeTest : DiktatSmokeTestBase() { fun `smoke test with gradle script plugin`() { fixAndCompareSmokeTest("kotlin-library-expected.gradle.kts", "kotlin-library.gradle.kts") Assertions.assertEquals( - LintError(2, 1, "$DIKTAT_RULE_SET_ID:${CommentsRule.NAME_ID}", "[COMMENTED_OUT_CODE] you should not comment out code, " + + LintError(2, 1, "${CommentsRule.NAME_ID}", "[COMMENTED_OUT_CODE] you should not comment out code, " + "use VCS to save it in history and delete this block: import org.jetbrains.kotlin.gradle.dsl.jvm", false), unfixedLintErrors.single() ) @@ -95,15 +94,15 @@ class DiktatSmokeTest : DiktatSmokeTestBase() { ) fixAndCompareSmokeTest("Example1-2Expected.kt", "Example1Test.kt") unfixedLintErrors.assertEquals( - LintError(1, 1, "$DIKTAT_RULE_SET_ID:${KdocFormatting.NAME_ID}", "${KDOC_NO_EMPTY_TAGS.warnText()} @return", false), - LintError(3, 1, "$DIKTAT_RULE_SET_ID:${KdocComments.NAME_ID}", "${MISSING_KDOC_TOP_LEVEL.warnText()} example", false), - LintError(3, 16, "$DIKTAT_RULE_SET_ID:${KdocComments.NAME_ID}", "${MISSING_KDOC_CLASS_ELEMENTS.warnText()} isValid", false), - LintError(6, 5, "$DIKTAT_RULE_SET_ID:${KdocComments.NAME_ID}", "${MISSING_KDOC_CLASS_ELEMENTS.warnText()} foo", false), - LintError(6, 5, "$DIKTAT_RULE_SET_ID:${KdocMethods.NAME_ID}", "${MISSING_KDOC_ON_FUNCTION.warnText()} foo", false), - LintError(8, 5, "$DIKTAT_RULE_SET_ID:${KdocComments.NAME_ID}", "${MISSING_KDOC_CLASS_ELEMENTS.warnText()} foo", false), - LintError(10, 4, "$DIKTAT_RULE_SET_ID:${KdocFormatting.NAME_ID}", "${KDOC_NO_EMPTY_TAGS.warnText()} @return", false), - LintError(13, 9, "$DIKTAT_RULE_SET_ID:${KdocFormatting.NAME_ID}", "${KDOC_NO_EMPTY_TAGS.warnText()} @return", false), - LintError(18, 40, "$DIKTAT_RULE_SET_ID:${KdocFormatting.NAME_ID}", "${KDOC_NO_EMPTY_TAGS.warnText()} @return", false) + LintError(1, 1, "${KdocFormatting.NAME_ID}", "${KDOC_NO_EMPTY_TAGS.warnText()} @return", false), + LintError(3, 1, "${KdocComments.NAME_ID}", "${MISSING_KDOC_TOP_LEVEL.warnText()} example", false), + LintError(3, 16, "${KdocComments.NAME_ID}", "${MISSING_KDOC_CLASS_ELEMENTS.warnText()} isValid", false), + LintError(6, 5, "${KdocComments.NAME_ID}", "${MISSING_KDOC_CLASS_ELEMENTS.warnText()} foo", false), + LintError(6, 5, "${KdocMethods.NAME_ID}", "${MISSING_KDOC_ON_FUNCTION.warnText()} foo", false), + LintError(8, 5, "${KdocComments.NAME_ID}", "${MISSING_KDOC_CLASS_ELEMENTS.warnText()} foo", false), + LintError(10, 4, "${KdocFormatting.NAME_ID}", "${KDOC_NO_EMPTY_TAGS.warnText()} @return", false), + LintError(13, 9, "${KdocFormatting.NAME_ID}", "${KDOC_NO_EMPTY_TAGS.warnText()} @return", false), + LintError(18, 40, "${KdocFormatting.NAME_ID}", "${KDOC_NO_EMPTY_TAGS.warnText()} @return", false) ) } diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSmokeTestBase.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSmokeTestBase.kt index 6d53ea9590..7be51cb721 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSmokeTestBase.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSmokeTestBase.kt @@ -7,7 +7,6 @@ package org.cqfn.diktat.ruleset.smoke 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.common.config.rules.RulesConfigReader import org.cqfn.diktat.ruleset.constants.Warnings @@ -218,11 +217,11 @@ abstract class DiktatSmokeTestBase : FixTestBase("test/smoke/src/main/kotlin", fixAndCompare(configFilePath, "Example2Expected.kt", "Example2Test.kt") if (isLintErrors) { unfixedLintErrors.assertEquals( - LintError(1, 1, "$DIKTAT_RULE_SET_ID:${HeaderCommentRule.NAME_ID}", + LintError(1, 1, "${HeaderCommentRule.NAME_ID}", "${HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE.warnText()} there are 2 declared classes and/or objects", false), - LintError(15, 23, "$DIKTAT_RULE_SET_ID:${KdocMethods.NAME_ID}", + LintError(15, 23, "${KdocMethods.NAME_ID}", "${KDOC_WITHOUT_PARAM_TAG.warnText()} createWithFile (containerName)", true), - LintError(31, 14, "$DIKTAT_RULE_SET_ID:${EmptyBlock.NAME_ID}", + LintError(31, 14, "${EmptyBlock.NAME_ID}", "${EMPTY_BLOCK_STRUCTURE_ERROR.warnText()} empty blocks are forbidden unless it is function with override keyword", false) ) } @@ -244,18 +243,18 @@ abstract class DiktatSmokeTestBase : FixTestBase("test/smoke/src/main/kotlin", fixAndCompare(configFilePath, "Example1Expected.kt", "Example1Test.kt") if (isLintErrors) { unfixedLintErrors.assertEquals( - LintError(1, 1, "$DIKTAT_RULE_SET_ID:${FileNaming.NAME_ID}", "${FILE_NAME_MATCH_CLASS.warnText()} Example1Test.kt vs Example", true), - LintError(1, 1, "$DIKTAT_RULE_SET_ID:${KdocFormatting.NAME_ID}", "${KDOC_NO_EMPTY_TAGS.warnText()} @return", false), - LintError(3, 6, "$DIKTAT_RULE_SET_ID:${KdocComments.NAME_ID}", "${MISSING_KDOC_TOP_LEVEL.warnText()} Example", false), - LintError(3, 26, "$DIKTAT_RULE_SET_ID:${KdocComments.NAME_ID}", "${MISSING_KDOC_CLASS_ELEMENTS.warnText()} isValid", false), - LintError(6, 9, "$DIKTAT_RULE_SET_ID:${KdocComments.NAME_ID}", "${MISSING_KDOC_CLASS_ELEMENTS.warnText()} foo", false), - LintError(8, 8, "$DIKTAT_RULE_SET_ID:${KdocComments.NAME_ID}", "${MISSING_KDOC_CLASS_ELEMENTS.warnText()} foo", false), - LintError(8, 8, "$DIKTAT_RULE_SET_ID:${KdocMethods.NAME_ID}", "${MISSING_KDOC_ON_FUNCTION.warnText()} foo", false), - LintError(9, 3, "$DIKTAT_RULE_SET_ID:${EmptyBlock.NAME_ID}", EMPTY_BLOCK_STRUCTURE_ERROR.warnText() + + LintError(1, 1, "${FileNaming.NAME_ID}", "${FILE_NAME_MATCH_CLASS.warnText()} Example1Test.kt vs Example", true), + LintError(1, 1, "${KdocFormatting.NAME_ID}", "${KDOC_NO_EMPTY_TAGS.warnText()} @return", false), + LintError(3, 6, "${KdocComments.NAME_ID}", "${MISSING_KDOC_TOP_LEVEL.warnText()} Example", false), + LintError(3, 26, "${KdocComments.NAME_ID}", "${MISSING_KDOC_CLASS_ELEMENTS.warnText()} isValid", false), + LintError(6, 9, "${KdocComments.NAME_ID}", "${MISSING_KDOC_CLASS_ELEMENTS.warnText()} foo", false), + LintError(8, 8, "${KdocComments.NAME_ID}", "${MISSING_KDOC_CLASS_ELEMENTS.warnText()} foo", false), + LintError(8, 8, "${KdocMethods.NAME_ID}", "${MISSING_KDOC_ON_FUNCTION.warnText()} foo", false), + LintError(9, 3, "${EmptyBlock.NAME_ID}", EMPTY_BLOCK_STRUCTURE_ERROR.warnText() + " empty blocks are forbidden unless it is function with override keyword", false), - LintError(12, 10, "$DIKTAT_RULE_SET_ID:${KdocFormatting.NAME_ID}", "${KDOC_NO_EMPTY_TAGS.warnText()} @return", false), - LintError(14, 8, "$DIKTAT_RULE_SET_ID:${KdocFormatting.NAME_ID}", "${KDOC_NO_EMPTY_TAGS.warnText()} @return", false), - LintError(19, 20, "$DIKTAT_RULE_SET_ID:${KdocFormatting.NAME_ID}", "${KDOC_NO_EMPTY_TAGS.warnText()} @return", false) + LintError(12, 10, "${KdocFormatting.NAME_ID}", "${KDOC_NO_EMPTY_TAGS.warnText()} @return", false), + LintError(14, 8, "${KdocFormatting.NAME_ID}", "${KDOC_NO_EMPTY_TAGS.warnText()} @return", false), + LintError(19, 20, "${KdocFormatting.NAME_ID}", "${KDOC_NO_EMPTY_TAGS.warnText()} @return", false) ) } } diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/utils/SuppressAnnotatedExpressionTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/utils/SuppressAnnotatedExpressionTest.kt index 0dad0f35d3..2d9b5a14c0 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/utils/SuppressAnnotatedExpressionTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/utils/SuppressAnnotatedExpressionTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.utils -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.CollapseIfStatementsRule import org.cqfn.diktat.util.LintTestBase @@ -9,7 +8,7 @@ import com.pinterest.ktlint.core.LintError import org.junit.jupiter.api.Test class SuppressAnnotatedExpressionTest : LintTestBase(::CollapseIfStatementsRule) { - private val ruleId: String = "$DIKTAT_RULE_SET_ID:${CollapseIfStatementsRule.NAME_ID}" + private val ruleId: String = "${CollapseIfStatementsRule.NAME_ID}" @Test fun `should lint errors without suppress`() { diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/utils/SuppressTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/utils/SuppressTest.kt index 8cfbd3f781..fd867f48bc 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/utils/SuppressTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/utils/SuppressTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.ruleset.utils -import org.cqfn.diktat.common.config.rules.DIKTAT_RULE_SET_ID import org.cqfn.diktat.ruleset.constants.Warnings import org.cqfn.diktat.ruleset.rules.chapter1.IdentifierNaming import org.cqfn.diktat.util.LintTestBase @@ -9,7 +8,7 @@ import com.pinterest.ktlint.core.LintError import org.junit.jupiter.api.Test class SuppressTest : LintTestBase(::IdentifierNaming) { - private val ruleId: String = "$DIKTAT_RULE_SET_ID:${IdentifierNaming.NAME_ID}" + private val ruleId: String = "${IdentifierNaming.NAME_ID}" @Test fun `test suppress on class`() { @@ -140,7 +139,7 @@ class SuppressTest : LintTestBase(::IdentifierNaming) { } """.trimIndent() lintMethod(code, - LintError(3, 15, "$DIKTAT_RULE_SET_ID:${IdentifierNaming.NAME_ID}", + LintError(3, 15, "${IdentifierNaming.NAME_ID}", "${Warnings.FUNCTION_NAME_INCORRECT_CASE.warnText()} methODTREE", true)) } } diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/util/DiktatRuleTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/util/DiktatRuleTest.kt index 5dce75a75d..7696f46caa 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/util/DiktatRuleTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/util/DiktatRuleTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.util -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.BLANK_LINE_BETWEEN_PROPERTIES import org.cqfn.diktat.ruleset.constants.Warnings.WRONG_ORDER_IN_CLASS_LIKE_STRUCTURES @@ -10,7 +9,7 @@ import com.pinterest.ktlint.core.LintError import org.junit.jupiter.api.Test class DiktatRuleTest : LintTestBase(::ClassLikeStructuresOrderRule) { - private val ruleId = "$DIKTAT_RULE_SET_ID:${ClassLikeStructuresOrderRule.NAME_ID}" + private val ruleId = ClassLikeStructuresOrderRule.NAME_ID private val codeTemplate = """ |class Example { | private val FOO = 42 diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/util/SuppressingTest.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/util/SuppressingTest.kt index 54cf3d3ba1..ab04d92ba6 100644 --- a/diktat-rules/src/test/kotlin/org/cqfn/diktat/util/SuppressingTest.kt +++ b/diktat-rules/src/test/kotlin/org/cqfn/diktat/util/SuppressingTest.kt @@ -1,6 +1,5 @@ package org.cqfn.diktat.util -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.IDENTIFIER_LENGTH import org.cqfn.diktat.ruleset.rules.chapter1.IdentifierNaming @@ -9,7 +8,7 @@ import com.pinterest.ktlint.core.LintError import org.junit.jupiter.api.Test class SuppressingTest : LintTestBase(::IdentifierNaming) { - private val ruleId: String = "$DIKTAT_RULE_SET_ID:${IdentifierNaming.NAME_ID}" + private val ruleId: String = "${IdentifierNaming.NAME_ID}" private val rulesConfigBooleanFunctions: List = listOf( RulesConfig(IDENTIFIER_LENGTH.name, true, emptyMap(), setOf("MySuperSuppress")) )