Implement AbstractDefaultVersionsGradleIntegrationTest.kt

4 files changed, 71 insertions, 64 deletions

diff --git a/integration-tests/gradle/projects/it-basic/build.gradle.kts b/integration-tests/gradle/projects/it-basic/build.gradle.kts
index 69e469bc..bdb59279 100644
--- a/integration-tests/gradle/projects/it-basic/build.gradle.kts
+++ b/integration-tests/gradle/projects/it-basic/build.gradle.kts
@@ -17,6 +17,6 @@ dependencies {
 }
 
 afterEvaluate {
-    logger.quiet("Kotlin version: ${KotlinVersion.CURRENT}")
     logger.quiet("Gradle version: ${gradle.gradleVersion}")
+    logger.quiet("Kotlin version: ${property("kotlin_version")}")
 }
diff --git a/integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/AbstractDefaultVersionsGradleIntegrationTest.kt b/integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/AbstractDefaultVersionsGradleIntegrationTest.kt
new file mode 100644
index 00000000..b7f44a4c
--- /dev/null
+++ b/integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/AbstractDefaultVersionsGradleIntegrationTest.kt
@@ -0,0 +1,68 @@
+package org.jetbrains.dokka.it.gradle
+
+import org.junit.Test
+
+abstract class AbstractDefaultVersionsGradleIntegrationTest : AbstractGradleIntegrationTest() {
+
+    protected abstract fun execute(versions: BuildVersions)
+
+    @Test
+    fun `gradle 5_6_4 kotlin 1_3_72`() {
+        execute(
+            BuildVersions(
+                gradleVersion = "5.6.4",
+                kotlinVersion = "1.3.72"
+            )
+        )
+    }
+
+    @Test
+    fun `gradle 5_6_4 kotlin 1_3_30`() {
+        execute(
+            BuildVersions(
+                gradleVersion = "5.6.4",
+                kotlinVersion = "1.3.30"
+            )
+        )
+    }
+
+    @Test
+    fun `gradle 5_6_4 kotlin 1_4_M2_eap_70`() {
+        execute(
+            BuildVersions(
+                gradleVersion = "5.6.4",
+                kotlinVersion = "1.4-M2-eap-70"
+            )
+        )
+    }
+
+    @Test
+    fun `gradle 6_1_1 kotlin 1_3_72`() {
+        execute(
+            BuildVersions(
+                gradleVersion = "6.1.1",
+                kotlinVersion = "1.3.72"
+            )
+        )
+    }
+
+    @Test
+    fun `gradle 6_5_1 kotlin 1_4_M2_eap_70`() {
+        execute(
+            BuildVersions(
+                gradleVersion = "6.5.1",
+                kotlinVersion = "1.4-M2-eap-70"
+            )
+        )
+    }
+
+    @Test
+    fun `gradle 6_5_1 kotlin 1_3_72`() {
+        execute(
+            BuildVersions(
+                gradleVersion = "6.5.1",
+                kotlinVersion = "1.3.72"
+            )
+        )
+    }
+}
diff --git a/integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/AbstractGradleIntegrationTest.kt b/integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/AbstractGradleIntegrationTest.kt
index 271720fe..34114c74 100644
--- a/integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/AbstractGradleIntegrationTest.kt
+++ b/integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/AbstractGradleIntegrationTest.kt
@@ -5,7 +5,6 @@ import org.junit.Rule
 import org.junit.rules.TemporaryFolder
 import java.io.File
 import kotlin.test.assertFalse
-import kotlin.test.assertTrue
 
 abstract class AbstractGradleIntegrationTest {
 
diff --git a/integration-tests/gradle/src/test/kotlin/org/jetbrains/dokka/it/gradle/BasicTest.kt b/integration-tests/gradle/src/test/kotlin/org/jetbrains/dokka/it/gradle/BasicTest.kt
index deba4a16..ba6da4f9 100644
--- a/integration-tests/gradle/src/test/kotlin/org/jetbrains/dokka/it/gradle/BasicTest.kt
+++ b/integration-tests/gradle/src/test/kotlin/org/jetbrains/dokka/it/gradle/BasicTest.kt
@@ -4,57 +4,7 @@ import org.gradle.testkit.runner.TaskOutcome
 import java.io.File
 import kotlin.test.*
 
-class BasicTest : AbstractGradleIntegrationTest() {
-
-    @Test
-    fun `gradle 5_6_4 kotlin 1_3_72`() {
-        execute(
-            BuildVersions(
-                gradleVersion = "5.6.4",
-                kotlinVersion = "1.3.72"
-            )
-        )
-    }
-
-    @Test
-    fun `gradle 5_6_4 kotlin 1_3_30`() {
-        execute(
-            BuildVersions(
-                gradleVersion = "5.6.4",
-                kotlinVersion = "1.3.30"
-            )
-        )
-    }
-
-    @Test
-    fun `gradle 5_6_4 kotlin 1_4_M2_eap_70`() {
-        execute(
-            BuildVersions(
-                gradleVersion = "5.6.4",
-                kotlinVersion = "1.4-M2-eap-70"
-            )
-        )
-    }
-
-    @Test
-    fun `gradle 6_1_1 kotlin 1_3_72`() {
-        execute(
-            BuildVersions(
-                gradleVersion = "6.1.1",
-                kotlinVersion = "1.3.72"
-            )
-        )
-    }
-
-    @Test
-    fun `gradle 6_5_1 kotlin 1_4_M2_eap_70`() {
-        execute(
-            BuildVersions(
-                gradleVersion = "6.5.1",
-                kotlinVersion = "1.4-M2-eap-70"
-            )
-        )
-    }
+class BasicTest : AbstractDefaultVersionsGradleIntegrationTest() {
 
     @BeforeTest
     fun prepareProjectFiles() {
@@ -67,17 +17,7 @@ class BasicTest : AbstractGradleIntegrationTest() {
         File(templateProjectDir, "src").copyRecursively(File(projectDir, "src"))
     }
 
-    @Test
-    fun `gradle 6_5_1 kotlin 1_3_72`() {
-        execute(
-            BuildVersions(
-                gradleVersion = "6.5.1",
-                kotlinVersion = "1.3.72"
-            )
-        )
-    }
-
-    private fun execute(versions: BuildVersions) {
+    override fun execute(versions: BuildVersions) {
         val result = createGradleRunner(
             buildVersions = versions,
             arguments = arrayOf("dokka", "--stacktrace")