Commit fd3fa71

committed

Fix JS tests

1 parent f238179 commit fd3fa71Copy full SHA for fd3fa71

File tree

3 files changed

+21

-4

lines changed

core
- build.gradle
- src/test/kotlin/com/tschuchort/compiletesting
  - CompilerPluginsTest.kt
  - KotlinJsCompilationTests.kt

3 files changed

+21

-4

lines changed

`‎core/build.gradle`

Lines changed: 19 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,18 +17,35 @@ buildConfig {`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
	`20`	`+/* Multiple variants are offered of the dependencies kotlin-dom-api-compat and kotlin-stdlib-js. Usually, Gradle picks`
	`21`	`+* them automatically based on what kind of build it is, i.e. it would look for a platform JVM variant for this JVM build.`
	`22`	`+* Naturally, there is no JVM version for JS libraries. We need to fix the variant attributes manually so the right variant`
	`23`	`+* will be picked for runtime use in the JS compile tests. */`
`20`	`24`	`configurations.all {`
`21`	`25`	`resolutionStrategy.dependencySubstitution {`
`22`	`26`	`substitute(module("org.jetbrains.kotlin:kotlin-dom-api-compat"))`
`23`	`27`	`.using variant(module("org.jetbrains.kotlin:kotlin-dom-api-compat:$embedded_kotlin_version")) {`
`24`	`28`	`attributes {`
`25`		`- attribute(KotlinPlatformType.attribute, KotlinPlatformType.js)`
	`29`	`+ attribute(Attribute.of("org.jetbrains.kotlin.platform.type", KotlinPlatformType.class), KotlinPlatformType.js)`
`26`	`30`	`attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage, "kotlin-runtime"))`
`27`	`31`	`}`
`28`	`32`	`}`
`29`	`33`	`}`
`30`	`34`	`}`
`31`	`35`
	`36`	`+configurations.all {`
	`37`	`+ resolutionStrategy.dependencySubstitution {`
	`38`	`+ substitute(module("org.jetbrains.kotlin:kotlin-stdlib-js"))`
	`39`	`+ .using variant(module("org.jetbrains.kotlin:kotlin-stdlib-js:$embedded_kotlin_version")) {`
	`40`	`+ attributes {`
	`41`	`+ attribute(Attribute.of("org.jetbrains.kotlin.platform.type", KotlinPlatformType.class), KotlinPlatformType.js)`
	`42`	`+ attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage, "kotlin-runtime"))`
	`43`	`+ attribute(Attribute.of("org.jetbrains.kotlin.js.compiler", String), "ir")`
	`44`	`+ }`
	`45`	`+ }`
	`46`	`+ }`
	`47`	`+}`
	`48`	`+`
`32`	`49`	`dependencies {`
`33`	`50`	`compileOnly 'com.google.auto.service:auto-service:1.1.1'`
`34`	`51`	`kapt "com.google.auto.service:auto-service:1.1.1"`
`@@ -44,7 +61,7 @@ dependencies {`
`44`	`61`	`// running compiler plugins passed via the pluginClasspath CLI option works`
`45`	`62`	`testRuntimeOnly "org.jetbrains.kotlin:kotlin-scripting-compiler:$embedded_kotlin_version"`
`46`	`63`
`47`		`- // Include Kotlin/JS standard library in test classpath for auto loading`
	`64`	`+ // Include Kotlin/JS standard library in test classpath for auto loading`
`48`	`65`	`testRuntimeOnly "org.jetbrains.kotlin:kotlin-stdlib-js"`
`49`	`66`	`testRuntimeOnly "org.jetbrains.kotlin:kotlin-dom-api-compat"`
`50`	`67`

`‎core/src/test/kotlin/com/tschuchort/compiletesting/CompilerPluginsTest.kt`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ class CompilerPluginsTest {`
`87`	`87`	`Assertions.assertThat(result.exitCode).isEqualTo(KotlinCompilation.ExitCode.OK)`
`88`	`88`	`}`
`89`	`89`
`90`		`- @Disabled("JS tests don't currently work with the new compiler IR")`
	`90`	`+ //@Disabled("JS tests don't currently work with the new compiler IR")`
`91`	`91`	`@Test`
`92`	`92`	fun `when JS compiler plugins are added they get executed`() {
`93`	`93`	`val mockLegacyPlugin = Mockito.mock(ComponentRegistrar::class.java)`

`‎core/src/test/kotlin/com/tschuchort/compiletesting/KotlinJsCompilationTests.kt`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import kotlin.io.path.createDirectory`
`16`	`16`	`import kotlin.io.path.createFile`
`17`	`17`	`import kotlin.io.path.writeText`
`18`	`18`
`19`		`-@Disabled("These JS tests don't currently work with the new compiler IR")`
	`19`	`+//@Disabled("These JS tests don't currently work with the new compiler IR")`
`20`	`20`	`@Suppress("MemberVisibilityCanBePrivate")`
`21`	`21`	`class KotlinJsCompilationTests {`
`22`	`22`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit fd3fa71

File tree

3 files changed

3 files changed

`‎core/build.gradle`

`‎core/src/test/kotlin/com/tschuchort/compiletesting/CompilerPluginsTest.kt`

`‎core/src/test/kotlin/com/tschuchort/compiletesting/KotlinJsCompilationTests.kt`

0 commit comments