Enabled functionalTest in gradle plugin (#1579)

saveourtool · Nov 25, 2022 · fb849b4 · fb849b4
1 parent 67aee72
commit fb849b4
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 26 deletions.
diff --git a/diktat-gradle-plugin/pom.xml b/diktat-gradle-plugin/pom.xml
@@ -72,6 +72,7 @@
                             <arguments>
                                 <argument>clean</argument>
                                 <argument>test</argument>
+                                <argument>functionalTest</argument>
                                 <argument>-Pgroup=${project.groupId}</argument>
                                 <argument>-Pversion=${project.version}</argument>
                                 <argument>-Pdescription=${project.description}</argument>

diff --git a/...Test/kotlin/org/cqfn/diktat/plugin/gradle/DiktatGradlePluginMultiprojectFunctionalTest.kt b/...Test/kotlin/org/cqfn/diktat/plugin/gradle/DiktatGradlePluginMultiprojectFunctionalTest.kt
@@ -1,11 +1,9 @@
 package org.cqfn.diktat.plugin.gradle
 
-import org.cqfn.diktat.plugin.gradle.DiktatGradlePlugin.Companion.DIKTAT_CHECK_TASK
 import org.gradle.buildinit.plugins.internal.modifiers.BuildInitDsl
 import org.gradle.internal.impldep.org.junit.rules.TemporaryFolder
 import org.gradle.testkit.runner.TaskOutcome
 import org.junit.jupiter.api.AfterEach
-import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import java.io.File
@@ -30,18 +28,8 @@ class DiktatGradlePluginMultiprojectFunctionalTest {
     @Test
     fun `should execute diktatCheck on default values in multiproject build`() {
         val result = runDiktat(testProjectDir, shouldSucceed = false)
-
-        val diktatCheckRootResult = result.task(":$DIKTAT_CHECK_TASK")
-        requireNotNull(diktatCheckRootResult)
-        Assertions.assertEquals(TaskOutcome.NO_SOURCE, diktatCheckRootResult.outcome) {
+        assertDiktatExecuted(result, TaskOutcome.NO_SOURCE) {
             "Task for root project with empty sources should succeed"
         }
-
-        val diktatCheckBackendResult = result.task(":backend:$DIKTAT_CHECK_TASK")
-        requireNotNull(diktatCheckBackendResult)
-        Assertions.assertEquals(TaskOutcome.FAILED, diktatCheckBackendResult.outcome)
-        Assertions.assertTrue(
-            result.output.contains("org.cqfn.diktat.example.gradle.multiproject")
-        )
     }
 }
diff --git a/diktat-gradle-plugin/src/functionalTest/kotlin/org/cqfn/diktat/plugin/gradle/Utils.kt b/diktat-gradle-plugin/src/functionalTest/kotlin/org/cqfn/diktat/plugin/gradle/Utils.kt
@@ -24,7 +24,7 @@ internal fun createExampleProject(testProjectDir: TemporaryFolder,
                 plugins {
                     id("org.cqfn.diktat.diktat-gradle-plugin")
                 }
-                
+
                 repositories {
                     mavenLocal()
                     mavenCentral()
@@ -75,11 +75,17 @@ private fun GradleRunner.withJaCoCo(number: Int) = apply {
         }
 }
 
-fun assertDiktatExecuted(result: BuildResult) {
+fun assertDiktatExecuted(
+    result: BuildResult,
+    taskOutcome: TaskOutcome = TaskOutcome.FAILED,
+    errorMessage: () -> String? = { null }
+) {
     val diktatCheckBuildResult = result.task(":${DiktatGradlePlugin.DIKTAT_CHECK_TASK}")
     requireNotNull(diktatCheckBuildResult)
-    Assertions.assertEquals(TaskOutcome.FAILED, diktatCheckBuildResult.outcome)
+    Assertions.assertEquals(taskOutcome, diktatCheckBuildResult.outcome, errorMessage)
     Assertions.assertTrue(
         result.output.contains("[FILE_NAME_MATCH_CLASS]")
-    )
+    ) {
+        "Task ${DiktatGradlePlugin.DIKTAT_CHECK_TASK} wasn't run"
+    }
 }
diff --git a/diktat-test-framework/pom.xml b/diktat-test-framework/pom.xml
@@ -31,8 +31,8 @@
             <artifactId>commons-io</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
+            <groupId>io.github.microutils</groupId>
+            <artifactId>kotlin-logging-jvm</artifactId>
         </dependency>
         <dependency>
             <groupId>io.github.petertrr</groupId>

diff --git a/pom.xml b/pom.xml
@@ -59,8 +59,8 @@
         <jacoco.version>0.8.8</jacoco.version>
         <maven-plugin-tools.version>3.6.4</maven-plugin-tools.version>
         <jbool.version>1.24</jbool.version>
-        <mu-logging.version>3.0.4</mu-logging.version>
-        <log4j.version>2.19.0</log4j.version>
+        <!-- downgraded to be compliance with ktlint -->
+        <mu-logging.version>2.1.23</mu-logging.version>
     </properties>
 
     <modules>
@@ -198,11 +198,6 @@
                 <artifactId>kotlin-logging-jvm</artifactId>
                 <version>${mu-logging.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-slf4j-impl</artifactId>
-                <version>${log4j.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.github.petertrr</groupId>
                 <artifactId>kotlin-multiplatform-diff-jvm</artifactId>

diff --git a/renovate.json b/renovate.json
@@ -49,6 +49,13 @@
       ],
       "allowedVersions": "<= 1.6.8 || > 1.6.13"
     },
+    {
+      "managers": ["maven"],
+      "matchPackageNames": [
+        "io.github.microutils:kotlin-logging-jvm"
+      ],
+      "allowedVersions": "<= 2.1.23"
+    },
     {
       "managers": ["gradle"],
       "matchPackagePatterns": [