Skip to content
Draft
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
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ plugins {
kotlin("multiplatform") version "2.3.0-Beta1" apply false
kotlin("jvm") version "2.3.0-Beta1" apply false
id("com.github.gmazzo.buildconfig") version "5.6.5"
id("com.github.node-gradle.node") version "7.0.2" apply false
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.16.3" apply false
}

Expand Down
8 changes: 8 additions & 0 deletions compiler-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ plugins {
kotlin("jvm")
`java-test-fixtures`
id("com.github.gmazzo.buildconfig")
id("com.github.node-gradle.node")
idea
}

Expand Down Expand Up @@ -42,6 +43,9 @@ dependencies {
testArtifacts(kotlin("test"))
testArtifacts(kotlin("script-runtime"))
testArtifacts(kotlin("annotations-jvm"))

testArtifacts(kotlin("stdlib-js"))
testArtifacts(kotlin("test-js"))
}

buildConfig {
Expand Down Expand Up @@ -69,6 +73,10 @@ tasks.test {
setLibraryProperty("org.jetbrains.kotlin.test.kotlin-script-runtime", "kotlin-script-runtime")
setLibraryProperty("org.jetbrains.kotlin.test.kotlin-annotations-jvm", "kotlin-annotations-jvm")

setLibraryProperty("org.jetbrains.kotlin.test.kotlin-stdlib-js", "kotlin-stdlib-js")
setLibraryProperty("org.jetbrains.kotlin.test.kotlin-test-js", "kotlin-test-js")

systemProperty("kotlin.js.test.root.out.dir", "${node.nodeProjectDir.get().asFile}/")
systemProperty("idea.ignore.disabled.plugins", "true")
systemProperty("idea.home.path", rootDir)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.jetbrains.kotlin.compiler.plugin.template

import org.jetbrains.kotlin.compiler.plugin.template.runners.AbstractJsBoxTest
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
Expand All @@ -14,6 +15,10 @@ fun main() {
testClass<AbstractJvmBoxTest> {
model("box")
}

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

import org.jetbrains.kotlin.compiler.plugin.template.services.ExtensionRegistrarConfigurator
import org.jetbrains.kotlin.compiler.plugin.template.services.PluginAnnotationsProvider
import org.jetbrains.kotlin.js.test.fir.AbstractFirLightTreeJsBoxTest
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.services.EnvironmentBasedStandardLibrariesPathProvider
import org.jetbrains.kotlin.test.services.KotlinStandardLibrariesPathProvider

open class AbstractJsBoxTest : AbstractFirLightTreeJsBoxTest() {
override fun createKotlinStandardLibrariesPathProvider(): KotlinStandardLibrariesPathProvider {
return EnvironmentBasedStandardLibrariesPathProvider
}

override fun configure(builder: TestConfigurationBuilder) {
super.configure(builder)

with(builder) {
/*
* Containers of different directives, which can be used in tests:
* - ModuleStructureDirectives
* - LanguageSettingsDirectives
* - DiagnosticsDirectives
* - FirDiagnosticsDirectives
* - CodegenTestDirectives
* - JvmEnvironmentConfigurationDirectives
*
* All of them are located in `org.jetbrains.kotlin.test.directives` package
*/
defaultDirectives {
+CodegenTestDirectives.DUMP_IR
+FirDiagnosticsDirectives.FIR_DUMP
}

useConfigurators(
::PluginAnnotationsProvider,
::ExtensionRegistrarConfigurator
)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@


package org.jetbrains.kotlin.compiler.plugin.template.runners;

import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.jupiter.api.Test;

import java.io.File;
import java.util.regex.Pattern;

/** This class is generated by {@link org.jetbrains.kotlin.compiler.plugin.template.GenerateTestsKt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler-plugin/testData/box")
@TestDataPath("$PROJECT_ROOT")
public class JsBoxTestGenerated extends AbstractJsBoxTest {
@Test
public void testAllFilesPresentInBox() {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler-plugin/testData/box"), Pattern.compile("^(.+)\\.kt$"), null, true);
}

@Test
@TestMetadata("anotherBoxTest.kt")
public void testAnotherBoxTest() {
runTest("compiler-plugin/testData/box/anotherBoxTest.kt");

Check failure on line 26 in compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JsBoxTestGenerated.java

View workflow job for this annotation

GitHub Actions / JUnit Test Report

JsBoxTestGenerated.testAnotherBoxTest()

java.lang.AssertionError: The number of source files (1) does not match the number of IrFiles (2)
Raw output
java.lang.AssertionError: The number of source files (1) does not match the number of IrFiles (2)
	at org.jetbrains.kotlin.backend.common.serialization.SerializeModuleIntoKlibKt.serializeModuleIntoKlib(serializeModuleIntoKlib.kt:108)
	at org.jetbrains.kotlin.ir.backend.js.KlibKt.serializeModuleIntoKlib(klib.kt:435)
	at org.jetbrains.kotlin.cli.pipeline.web.WebKlibSerializationPipelinePhase.serializeFirKlib(WebKlibSerializationPipelinePhase.kt:71)
	at org.jetbrains.kotlin.cli.pipeline.web.WebKlibSerializationPipelinePhase.executePhase(WebKlibSerializationPipelinePhase.kt:33)
	at org.jetbrains.kotlin.js.test.converters.FirKlibSerializerCliWebFacade.transform(FirKlibSerializerCliWebFacade.kt:54)
	at org.jetbrains.kotlin.js.test.converters.FirKlibSerializerCliWebFacade.transform(FirKlibSerializerCliWebFacade.kt:30)
	at org.jetbrains.kotlin.test.TestStep$FacadeStep.processModule(TestStep.kt:47)
	at org.jetbrains.kotlin.test.TestRunner.processModule(TestRunner.kt:206)
	at org.jetbrains.kotlin.test.TestRunner.hackyProcessModule(TestRunner.kt:197)
	at org.jetbrains.kotlin.test.TestRunner.processModule(TestRunner.kt:141)
	at org.jetbrains.kotlin.test.TestRunner.runTestPipeline(TestRunner.kt:92)
	at org.jetbrains.kotlin.test.TestRunner.runTestImpl(TestRunner.kt:70)
	at org.jetbrains.kotlin.test.TestRunner.runTest(TestRunner.kt:30)
	at org.jetbrains.kotlin.test.TestRunner.runTest$default(TestRunner.kt:28)
	at org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerTest.runTest(AbstractKotlinCompilerTest.kt:115)
	at org.jetbrains.kotlin.compiler.plugin.template.runners.JsBoxTestGenerated.testAnotherBoxTest(JsBoxTestGenerated.java:26)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
	at java.base/java.util.concurrent.RecursiveAction.exec(RecursiveAction.java:194)
	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:387)
	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.tryRemoveAndExec(ForkJoinPool.java:1351)
	at java.base/java.util.concurrent.ForkJoinTask.awaitDone(ForkJoinTask.java:422)
	at java.base/java.util.concurrent.ForkJoinTask.join(ForkJoinTask.java:651)
	at java.base/java.util.concurrent.RecursiveAction.exec(RecursiveAction.java:194)
	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:387)
	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1312)
	at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1843)
	at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1808)
	at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:188)
}

@Test
@TestMetadata("simple.kt")
public void testSimple() {
runTest("compiler-plugin/testData/box/simple.kt");

Check failure on line 32 in compiler-plugin/test-gen/org/jetbrains/kotlin/compiler/plugin/template/runners/JsBoxTestGenerated.java

View workflow job for this annotation

GitHub Actions / JUnit Test Report

JsBoxTestGenerated.testSimple()

java.lang.AssertionError: The number of source files (1) does not match the number of IrFiles (2)
Raw output
java.lang.AssertionError: The number of source files (1) does not match the number of IrFiles (2)
	at org.jetbrains.kotlin.backend.common.serialization.SerializeModuleIntoKlibKt.serializeModuleIntoKlib(serializeModuleIntoKlib.kt:108)
	at org.jetbrains.kotlin.ir.backend.js.KlibKt.serializeModuleIntoKlib(klib.kt:435)
	at org.jetbrains.kotlin.cli.pipeline.web.WebKlibSerializationPipelinePhase.serializeFirKlib(WebKlibSerializationPipelinePhase.kt:71)
	at org.jetbrains.kotlin.cli.pipeline.web.WebKlibSerializationPipelinePhase.executePhase(WebKlibSerializationPipelinePhase.kt:33)
	at org.jetbrains.kotlin.js.test.converters.FirKlibSerializerCliWebFacade.transform(FirKlibSerializerCliWebFacade.kt:54)
	at org.jetbrains.kotlin.js.test.converters.FirKlibSerializerCliWebFacade.transform(FirKlibSerializerCliWebFacade.kt:30)
	at org.jetbrains.kotlin.test.TestStep$FacadeStep.processModule(TestStep.kt:47)
	at org.jetbrains.kotlin.test.TestRunner.processModule(TestRunner.kt:206)
	at org.jetbrains.kotlin.test.TestRunner.hackyProcessModule(TestRunner.kt:197)
	at org.jetbrains.kotlin.test.TestRunner.processModule(TestRunner.kt:141)
	at org.jetbrains.kotlin.test.TestRunner.runTestPipeline(TestRunner.kt:92)
	at org.jetbrains.kotlin.test.TestRunner.runTestImpl(TestRunner.kt:70)
	at org.jetbrains.kotlin.test.TestRunner.runTest(TestRunner.kt:30)
	at org.jetbrains.kotlin.test.TestRunner.runTest$default(TestRunner.kt:28)
	at org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerTest.runTest(AbstractKotlinCompilerTest.kt:115)
	at org.jetbrains.kotlin.compiler.plugin.template.runners.JsBoxTestGenerated.testSimple(JsBoxTestGenerated.java:32)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
	at java.base/java.util.concurrent.RecursiveAction.exec(RecursiveAction.java:194)
	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:387)
	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.tryRemoveAndExec(ForkJoinPool.java:1351)
	at java.base/java.util.concurrent.ForkJoinTask.awaitDone(ForkJoinTask.java:422)
	at java.base/java.util.concurrent.ForkJoinTask.join(ForkJoinTask.java:651)
	at java.base/java.util.concurrent.RecursiveAction.exec(RecursiveAction.java:194)
	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:387)
	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1312)
	at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1843)
	at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1808)
	at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:188)
}
}
Loading