From b87058b532a87623c73dfc83190246863b367ae3 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 11 Dec 2018 16:56:35 +0300 Subject: [PATCH] Attempt to fix ABI tests on TC Locally they work fine --- plugins/jvm-abi-gen/build.gradle.kts | 1 + .../test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/jvm-abi-gen/build.gradle.kts b/plugins/jvm-abi-gen/build.gradle.kts index aeeefb5af47..31a8acd1daa 100644 --- a/plugins/jvm-abi-gen/build.gradle.kts +++ b/plugins/jvm-abi-gen/build.gradle.kts @@ -20,6 +20,7 @@ dependencies { testCompile(commonDep("junit:junit")) testCompile(projectTests(":compiler:tests-common")) testCompile(projectTests(":compiler:incremental-compilation-impl")) + testRuntime(intellijCoreDep()) } sourceSets { diff --git a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt index d9c59a50d34..90096f2eec3 100644 --- a/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt +++ b/plugins/jvm-abi-gen/test/org/jetbrains/kotlin/jvm/abi/BaseJvmAbiTest.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.jvm.abi -import com.intellij.testFramework.UsefulTestCase import junit.framework.TestCase import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler @@ -74,6 +73,6 @@ abstract class BaseJvmAbiTest : TestCase() { } protected val kotlinJvmStdlib = File("dist/kotlinc/lib/kotlin-stdlib.jar").also { - UsefulTestCase.assertExists(it) + check(it.exists()) { "Stdlib file '$it' does not exist" } } } \ No newline at end of file