Fixed smoke tests

diktat-rules/src/main/kotlin/com/saveourtool/diktat/ruleset/rules/chapter1/PackageNaming.kt

@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.KtNodeTypes.DOT_QUALIFIED_EXPRESSION
 import org.jetbrains.kotlin.KtNodeTypes.FILE_ANNOTATION_LIST
 import org.jetbrains.kotlin.KtNodeTypes.PACKAGE_DIRECTIVE
 import org.jetbrains.kotlin.KtNodeTypes.REFERENCE_EXPRESSION
+import org.jetbrains.kotlin.com.intellij.lang.ASTFactory
 import org.jetbrains.kotlin.com.intellij.lang.ASTNode
 import org.jetbrains.kotlin.com.intellij.psi.impl.source.tree.LeafPsiElement
 import org.jetbrains.kotlin.com.intellij.psi.impl.source.tree.PsiWhiteSpaceImpl
@@ -255,7 +256,7 @@ class PackageNaming(configRules: List<RulesConfig>) : DiktatRule(
  packageDirectiveParent.removeChild(packageDirectiveNode)
  packageDirectiveParent.addChild(newPackageDirective, addBefore)
  if (newPackageDirective.treePrev.elementType != WHITE_SPACE) {
- packageDirectiveParent.addChild(PsiWhiteSpaceImpl("\n"), newPackageDirective)
+ packageDirectiveParent.addChild(ASTFactory.whitespace("\n"), newPackageDirective)
  }
  } else {
  packageDirectiveParent.replaceChild(packageDirectiveNode, newPackageDirective)

diktat-rules/src/test/kotlin/com/saveourtool/diktat/ruleset/chapter1/PackagePathFixTest.kt

@@ -1,12 +1,16 @@
 package com.saveourtool.diktat.ruleset.chapter1
 
 import com.saveourtool.diktat.common.config.rules.RulesConfig
+import com.saveourtool.diktat.ruleset.constants.Warnings
 import com.saveourtool.diktat.ruleset.rules.chapter1.PackageNaming
 import com.saveourtool.diktat.util.FixTestBase
 
 import generated.WarningNames
+import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import java.nio.file.Path
 
 class PackagePathFixTest : FixTestBase(
  "test/paragraph1/naming/package/src/main/kotlin",
@@ -68,4 +72,36 @@
  fun `fix missing package name with a proper location`() {
  fixAndCompare("com/saveourtool/diktat/some/name/FixMissingExpected.kt", "com/saveourtool/diktat/some/name/FixMissingTest.kt")
  }
+
+ @Test
+ @Tag(WarningNames.PACKAGE_NAME_MISSING)
+ fun `several empty lines after package`(@TempDir tempDir: Path) {
+ fixAndCompareContent(
+ """
+ /**
+ * @param bar
+ * @return something
+ */
+ fun foo1(bar: Bar): Baz {
+ // placeholder
+ }
+ """.trimIndent(),
+ """
+ package com.saveourtool.diktat
+
+ /**
+ * @param bar
+ * @return something
+ */
+ fun foo1(bar: Bar): Baz {
+ // placeholder
+ }
+ """.trimIndent(),
+ tempDir = tempDir,
+ )
+ .run {
+ Assertions.assertEquals(expectedContentWithoutWarns, actualContent)
+ }
+
+ }
 }

diktat-rules/src/test/kotlin/com/saveourtool/diktat/ruleset/chapter2/KdocFormattingFixTest.kt

@@ -4,9 +4,12 @@
 import com.saveourtool.diktat.util.FixTestBase
 
 import generated.WarningNames
+import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Tags
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import java.nio.file.Path
 
 class KdocFormattingFixTest : FixTestBase("test/paragraph2/kdoc/", ::KdocFormatting) {
  @Test
@@ -62,4 +65,49 @@
  fun `KdocFormatting - sort order`() {
  fixAndCompare("KdocFormattingOrderExpected.kt", "KdocFormattingOrderTest.kt")
  }
+
+ @Test
+ @Tag(WarningNames.KDOC_NO_EMPTY_TAGS)
+ fun `several empty lines after package`(@TempDir tempDir: Path) {
+ fixAndCompareContent(
+ actualContent = """
+ /**
+ * @param bar lorem ipsum
+ *
+ * dolor sit amet
+ */
+ fun foo1(bar: Bar): Baz {
+ // placeholder
+ }
+
+ /**
+ * @param bar lorem ipsum
+ *
+ * dolor sit amet
+ *
+ */
+ fun foo2(bar: Bar): Baz {
+ // placeholder
+ }
+ """.trimIndent(),
+ expectedContent = """
+ package com.saveourtool.diktat
+
+ /**
+ * @param bar
+ * @return
+ */
+ fun foo1(bar: Bar): Baz {
+ // placeholder
+ }
+ """.trimIndent(),
+ tempDir = tempDir,
+ )
+ .run {
+ Assertions.assertEquals(expectedContentWithoutWarns, actualContent)
+ }
+
+ }
+
+
 }

diktat-ruleset/src/test/kotlin/com/saveourtool/diktat/ruleset/smoke/DiktatSmokeTest.kt

@@ -25,13 +25,18 @@
  ) {
  val result = getTestComparatorUnit(config)
  .compareFilesFromResources(expected, test)
  Assertions.assertAll(
  {
  Assertions.assertTrue(result.isSuccessful)
  },
  {
  Assertions.assertEquals(result.expectedContentWithoutWarns, result.actualContent)
- }
+ },
+// {
+// assertUnfixedLintErrors {
+// org.assertj.core.api.Assertions.assertThat(unfixedLintErrors).isEmpty()
+// }
+// },
  )
 
  }

diktat-ruleset/src/test/kotlin/com/saveourtool/diktat/ruleset/smoke/DiktatSmokeTestBase.kt

@@ -39,7 +39,6 @@
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeAll
-import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.Timeout
@@ -143,7 +142,6 @@
  @Test
  @Tag("DiktatRuleSetProvider")
  @Timeout(TEST_TIMEOUT_SECONDS, unit = SECONDS)
- @Disabled("https://github.com/saveourtool/diktat/issues/1737")
  fun `smoke test #5`() {
  val configFilePath = prepareOverriddenRulesConfig(emptyList(),
  mapOf(
@@ -207,7 +205,6 @@
  @Test
  @Tag("DiktatRuleSetProvider")
  @Timeout(TEST_TIMEOUT_SECONDS, unit = SECONDS)
- @Disabled("https://github.com/saveourtool/diktat/issues/1737")
  fun `smoke test #2`() {
  val configFilePath = prepareOverriddenRulesConfig(
  rulesToDisable = emptyList(),
@@ -220,7 +217,7 @@
  )
  fixAndCompare(configFilePath, "Example2Expected.kt", "Example2Test.kt")
  assertUnfixedLintErrors { unfixedLintErrors ->
  assertThat(unfixedLintErrors).containsExactlyInAnyOrder(
  DiktatError(1, 1, "$DIKTAT_RULE_SET_ID:${HeaderCommentRule.NAME_ID}",
  "${HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE.warnText()} there are 2 declared classes and/or objects", false),
  DiktatError(15, 30, "$DIKTAT_RULE_SET_ID:${KdocMethods.NAME_ID}",
@@ -234,7 +231,6 @@
  @Test
  @Tag("DiktatRuleSetProvider")
  @Timeout(TEST_TIMEOUT_SECONDS, unit = SECONDS)
- @Disabled("https://github.com/saveourtool/diktat/issues/1737")
  fun `smoke test #1`() {
  val configFilePath = prepareOverriddenRulesConfig(
  rulesToDisable = emptyList(),
@@ -247,7 +243,7 @@
  )
  fixAndCompare(configFilePath, "Example1Expected.kt", "Example1Test.kt")
  assertUnfixedLintErrors { unfixedLintErrors ->
  assertThat(unfixedLintErrors).containsExactlyInAnyOrder(
  DiktatError(1, 1, "$DIKTAT_RULE_SET_ID:${FileNaming.NAME_ID}", "${FILE_NAME_MATCH_CLASS.warnText()} Example1Test.kt vs Example", true),
  DiktatError(1, 1, "$DIKTAT_RULE_SET_ID:${KdocFormatting.NAME_ID}", "${KDOC_NO_EMPTY_TAGS.warnText()} @return", false),
  DiktatError(3, 13, "$DIKTAT_RULE_SET_ID:${KdocComments.NAME_ID}", "${MISSING_KDOC_TOP_LEVEL.warnText()} Example", false),
@@ -286,9 +282,14 @@
  @Test
  @Tag("DiktatRuleSetProvider")
  @Timeout(TEST_TIMEOUT_SECONDS, unit = SECONDS)
- @Disabled("https://github.com/saveourtool/diktat/issues/1737")
  fun `regression - should correctly handle tags with empty lines`() {
- fixAndCompare(prepareOverriddenRulesConfig(), "KdocFormattingMultilineTagsExpected.kt", "KdocFormattingMultilineTagsTest.kt")
+ fixAndCompare(
+ prepareOverriddenRulesConfig(
+// listOf(Warnings.HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE, Warnings.KDOC_WITHOUT_RETURN_TAG),
+ ),
+ expected = "KdocFormattingMultilineTagsExpected.kt",
+ test = "KdocFormattingMultilineTagsTest.kt",
+ )
  }
 
  @Test
@@ -301,7 +302,6 @@
  @Test
  @Tag("DiktatRuleSetProvider")
  @Timeout(TEST_TIMEOUT_SECONDS, unit = SECONDS)
- @Disabled("https://github.com/saveourtool/diktat/issues/1737")
  fun `fix can cause long line`() {
  val configFilePath = prepareOverriddenRulesConfig(
  rulesToDisable = emptyList(),
@@ -345,7 +345,6 @@
 
  @Test
  @Tag("DiktatRuleSetProvider")
- @Disabled("https://github.com/saveourtool/diktat/issues/1737")
  fun `smoke test with gradle script plugin`() {
  fixAndCompare(prepareOverriddenRulesConfig(), "kotlin-library-expected.gradle.kts", "kotlin-library.gradle.kts")
  assertUnfixedLintErrors { unfixedLintErrors ->
@@ -360,7 +359,6 @@
 
  @Test
  @Tag("DiktatRuleSetProvider")
- @Disabled("https://github.com/saveourtool/diktat/issues/1737")
  fun `disable chapters`() {
  val configFilePath = prepareOverriddenRulesConfig(
  emptyList(),
@@ -373,7 +371,7 @@
  )
  fixAndCompare(configFilePath, "Example1-2Expected.kt", "Example1-2Test.kt")
  assertUnfixedLintErrors { unfixedLintErrors ->
  assertThat(unfixedLintErrors).containsExactlyInAnyOrder(
  DiktatError(1, 1, "$DIKTAT_RULE_SET_ID:${KdocFormatting.NAME_ID}", "${KDOC_NO_EMPTY_TAGS.warnText()} @return", false),
  DiktatError(3, 1, "$DIKTAT_RULE_SET_ID:${KdocComments.NAME_ID}", "${MISSING_KDOC_TOP_LEVEL.warnText()} example", false),
  DiktatError(3, 16, "$DIKTAT_RULE_SET_ID:${KdocComments.NAME_ID}", "${MISSING_KDOC_CLASS_ELEMENTS.warnText()} isValid", false),

diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/ManyLineTransformInLongLineExpected.kt

@@ -4,7 +4,8 @@ fun foo() {
  (1 or 2 or 3 or 4 or 5 or 6 or 7 or 8 or 9 or 10 or 11 or 12 or 13 or 14 or 15 or 16 or 17 or 18 or 19 or 20 or 21 or 22 or 23 or 24 or 25 or 26 or 27 or 28 or 29 or 30 or 31
  ?: 32 or 33 or 34 or 35 or 36 or 37 or 38 or 39 ?: 40 or 41 or 42 or 43 or 44 or 45 or 46 or 47 or 48 or 49 or 50 or 51 or 52 or 53 + 54 or 55 or 56 or 57 or 58 or 59
  ?: 60 or 61 or 62 or 63 or 64 or 65 or 66 - 67 or 68 or 69 or 70 or 1 + 2 or 3 or 4 or 5 or 6 or 7 or 8 or 9 or 10 or 11 or 12 or 13 or 14 or 15 or 16 or 17 or 18 + 19 -
- 20 or 21 or 22 or 23 or 24 or 25 or 26 or 27 or 28 or 29 or 30 or 31 or 32 or 33 or 34 or 35 or 36 or 37 or 38 or 39 or 40 or 41 || 42 or 43 or 44 or 45 or 46 or 47 && 48 or 49 ||
+ 20 or 21 or 22 or 23 or 24 or 25 or 26 or 27 or 28 or 29 or 30 or 31 or 32 or 33 or 34 or 35 or 36 or 37 or 38 or 39 or 40 or 41 || 42 or 43 or 44 or 45 or 46 or 47 &&
+ 48 or 49 ||
  50 or 51 or 52 or 53 or 54 or 55 or 56 or 57 or 58 or 59 or 60 or 61 or 62 or 63 or 64 or 65 or 66 or 67 or 68 or 69 or 70 or 1 or 2 or 3 or 4 or 5 or 6 or 7 or 8 or 9 or 10 or 11 or
  12 or 13 or 14 or 15 or 16 or 17 or 18 or 19 or 20 or 21 or 22 or 23 or 24 or 25 or 26 or 27 or 28 or 29 or 30 or 31 or 32 or 33 or 34 or 35 or 36 or 37 or 38 or 39 or 40 or 41 or
  42 or 43 or 44 or 45 or 46 or 47 or 48 or 49 or 50 or 51 or 52 or 53 or 54 or 55 or 56 or 57 or 58 or 59 or 60 or 61 or 62 or 63 or 64 or 65 or 66 or 67 or 68 or 69 or 70)