Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions compiler-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ plugins {

project.plugins.apply(D8Plugin::class.java)

val testDataDir = layout.projectDirectory.dir("testData")
val testGenDirectory = layout.buildDirectory.dir("test-gen")

sourceSets {
main {
java.setSrcDirs(listOf("src"))
Expand All @@ -25,13 +28,14 @@ sourceSets {
java.setSrcDirs(listOf("test-fixtures"))
}
test {
java.setSrcDirs(listOf("test", "test-gen"))
resources.setSrcDirs(listOf("testData"))
java.setSrcDirs(listOf("test", testGenDirectory))
resources.setSrcDirs(listOf(testDataDir))
}
}

idea {
module.generatedSourceDirs.add(projectDir.resolve("test-gen"))
// This is needed until IDEA fixes IDEA-339729.
module.generatedSourceDirs.add(testGenDirectory.get().asFile)
}

val testArtifacts: Configuration by configurations.creating
Expand Down Expand Up @@ -123,15 +127,21 @@ kotlin {
}

val generateTests by tasks.registering(JavaExec::class) {
inputs.dir(layout.projectDirectory.dir("testData"))
inputs.dir(testDataDir)
.withPropertyName("testData")
.withPathSensitivity(PathSensitivity.RELATIVE)
outputs.dir(layout.projectDirectory.dir("test-gen"))
outputs.dir(testGenDirectory)
.withPropertyName("generatedTests")

classpath = sourceSets.testFixtures.get().runtimeClasspath
mainClass.set("org.jetbrains.kotlin.compiler.plugin.template.GenerateTestsKt")
workingDir = rootDir
args(
listOf(
testGenDirectory.get().asFile.absolutePath,
testDataDir.asFile.absolutePath,
)
)
}

tasks.compileTestKotlin {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
package org.jetbrains.kotlin.compiler.plugin.template

import org.jetbrains.kotlin.compiler.plugin.template.runners.AbstractJsBoxTest
import org.jetbrains.kotlin.compiler.plugin.template.runners.AbstractJsDiagnosticTest
import org.jetbrains.kotlin.compiler.plugin.template.runners.AbstractJvmBoxTest
import org.jetbrains.kotlin.compiler.plugin.template.runners.AbstractJvmDiagnosticTest
import org.jetbrains.kotlin.generators.dsl.junit5.generateTestGroupSuiteWithJUnit5

fun main() {
fun main(args: Array<String>) {
generateTestGroupSuiteWithJUnit5 {
testGroup(testDataRoot = "compiler-plugin/testData", testsRoot = "compiler-plugin/test-gen") {
testGroup(testsRoot = args[0], testDataRoot = args[1]) {
testClass<AbstractJvmDiagnosticTest> {
model("diagnostics")
}
testClass<AbstractJsDiagnosticTest> {
model("diagnostics")
}

testClass<AbstractJvmBoxTest> {
model("box")
}

testClass<AbstractJsBoxTest> {
model("box")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package org.jetbrains.kotlin.compiler.plugin.template.runners

import org.jetbrains.kotlin.compiler.plugin.template.services.configurePlugin
import org.jetbrains.kotlin.js.test.runners.AbstractJsDiagnosticWithBackendTestBase
import org.jetbrains.kotlin.test.FirParser
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
import org.jetbrains.kotlin.test.directives.CodegenTestDirectives
import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
import org.jetbrains.kotlin.test.runners.AbstractFirPhasedDiagnosticTest
import org.jetbrains.kotlin.test.services.EnvironmentBasedStandardLibrariesPathProvider
import org.jetbrains.kotlin.test.services.KotlinStandardLibrariesPathProvider

open class AbstractJsDiagnosticTest : AbstractJsDiagnosticWithBackendTestBase(FirParser.LightTree) {
override fun createKotlinStandardLibrariesPathProvider(): KotlinStandardLibrariesPathProvider {
return EnvironmentBasedStandardLibrariesPathProvider
}

override fun configure(builder: TestConfigurationBuilder) = with(builder) {
super.configure(builder)
/*
* Containers of different directives, which can be used in tests:
* - ModuleStructureDirectives
* - LanguageSettingsDirectives
* - DiagnosticsDirectives
* - FirDiagnosticsDirectives
*
* All of them are located in `org.jetbrains.kotlin.test.directives` package
*/
defaultDirectives {
+FirDiagnosticsDirectives.FIR_DUMP
+FirDiagnosticsDirectives.DISABLE_GENERATED_FIR_TAGS
}

configurePlugin()
}
}

This file was deleted.

This file was deleted.

This file was deleted.

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
7 changes: 2 additions & 5 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 10 additions & 22 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading