Merge remote-tracking branch 'aSemy/fix/failing_6_8_compat_test'

Author: hsz

src/test/kotlin/org/jetbrains/intellij/IntelliJPluginSpec.kt

@@ -561,21 +561,63 @@ class IntelliJPluginSpec : IntelliJPluginSpecBase() {
     }
 
     @Test
-    fun `throws exception if Gradle is lt 6_8`() {
-        val message = "Gradle IntelliJ Plugin requires Gradle $MINIMAL_SUPPORTED_GRADLE_VERSION and higher"
+    fun `expect build fails when using unsupported Gradle version`() {
+        val unsupportedGradleVersions = setOf(
+            "6.4",
+            "6.7.1",
+        )
 
-        build("6.4", true, "help").output.let {
-            assertTrue(it.contains("FAILURE: Build failed with an exception."))
+        unsupportedGradleVersions.forEach { gradleVersion ->
+            build(gradleVersion, true, "help").apply {
+                assertContains("Gradle IntelliJ Plugin requires Gradle", output)
+                assertContains("FAILURE: Build failed with an exception", output)
+            }
         }
+    }
 
-        build("6.7.1", true, "help").output.let {
-            assertTrue(it.contains("FAILURE: Build failed with an exception."))
-        }
+    /**
+     * Note: An older version of `kotlin("jvm")` is because 1.7.+ requires Gradle 7.1.
+     *
+     * (specifically `kotlin("jvm")` requires the method [org.gradle.api.plugins.JavaPluginExtension.getSourceSets])
+     */
+    @Test
+    fun `expect successful build using minimal supported Gradle version`() {
 
-        build(MINIMAL_SUPPORTED_GRADLE_VERSION, false, "help").output.let {
-            assertTrue(it.contains("BUILD SUCCESSFUL"))
-            assertFalse(it.contains(message))
-        }
+        buildFile.writeText("") // reset the build file - need to apply an older version of Kotlin plugin
+        buildFile.groovy(
+            """
+            plugins {
+                id 'org.jetbrains.intellij'
+                id 'org.jetbrains.kotlin.jvm' version '1.4.0' 
+            }
+            sourceCompatibility = 11
+            targetCompatibility = 11
+            repositories {
+                mavenCentral()
+            }
+            intellij {
+                version = '$intellijVersion'
+                downloadSources = false
+                pluginsRepositories {
+                    maven('$pluginsRepository')
+                }
+                instrumentCode = false
+            }
+            buildSearchableOptions {
+                enabled = false
+            }
+            
+            // Define tasks with a minimal set of tasks required to build a source set
+            sourceSets.all {
+                task(it.getTaskName('build', 'SourceSet'), dependsOn: it.output)
+            }
+        """.trimIndent()
+        )
+
+        val buildResult = build(MINIMAL_SUPPORTED_GRADLE_VERSION, false, "help")
+
+        assertContains("BUILD SUCCESSFUL", buildResult.output)
+        assertNotContains("Gradle IntelliJ Plugin requires Gradle", buildResult.output)
     }
 
     @SuppressWarnings("GrEqualsBetweenInconvertibleTypes")

src/test/kotlin/org/jetbrains/intellij/IntelliJPluginSpecBase.kt

@@ -36,15 +36,17 @@ abstract class IntelliJPluginSpecBase {
         ?: throw GradleException("'test.intellij.version' isn't provided")
     val testMarkdownPluginVersion = System.getProperty("test.markdownPlugin.version").takeUnless { it.isNullOrEmpty() }
         ?: throw GradleException("'test.markdownPlugin.version' isn't provided")
-    val dir: File by lazy { createTempDirectory("tmp").toFile() }
+    var dir: File = createTempDirectory("tmp").toFile()
 
-    val gradleProperties = file("gradle.properties")
-    val buildFile = file("build.gradle")
-    val pluginXml = file("src/main/resources/META-INF/plugin.xml")
-    val buildDirectory = File(dir, "build")
+    val gradleProperties get() = file("gradle.properties")
+    val buildFile get() = file("build.gradle")
+    val pluginXml get() = file("src/main/resources/META-INF/plugin.xml")
+    val buildDirectory get() = File(dir, "build")
 
     @BeforeTest
     open fun setUp() {
+        dir = createTempDirectory("tmp").toFile()
+
         file("settings.gradle").groovy("rootProject.name = 'projectName'")
 
         buildFile.groovy(

src/test/kotlin/org/jetbrains/intellij/tasks/PrepareSandboxTaskSpec.kt

@@ -17,7 +17,7 @@ import kotlin.test.assertTrue
 @Suppress("GroovyUnusedAssignment", "PluginXmlValidity", "ComplexRedundantLet")
 class PrepareSandboxTaskSpec : IntelliJPluginSpecBase() {
 
-    private val sandbox = File(buildDirectory, DEFAULT_SANDBOX)
+    private val sandbox get() = File(buildDirectory, DEFAULT_SANDBOX)
 
     @Test
     fun `prepare sandbox for two plugins`() {