From 26df2a5c68ac8f1892a3d9a1b27912904fd34eb0 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 26 Feb 2020 16:10:00 +0300 Subject: [PATCH] Enable mute test with database in BaseKotlinJpsBuildTestCase --- .../kotlin/android/tests/AndroidJpsBuildTestCase.java | 2 +- .../kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidJpsBuildTestCase.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidJpsBuildTestCase.java index 0d0b8f46fcd..60d860a9909 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidJpsBuildTestCase.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/AndroidJpsBuildTestCase.java @@ -41,7 +41,7 @@ public class AndroidJpsBuildTestCase extends BaseKotlinJpsBuildTestCase { } @Override - protected void runTest() throws Throwable { + protected void runTest() { doTest(); } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt index 76267b23734..399d4024fa5 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.jps.build import org.jetbrains.jps.builders.JpsBuildTestCase import org.jetbrains.jps.model.library.JpsLibrary import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner +import org.jetbrains.kotlin.test.runTest abstract class BaseKotlinJpsBuildTestCase : JpsBuildTestCase() { @Throws(Exception::class) @@ -41,4 +42,10 @@ abstract class BaseKotlinJpsBuildTestCase : JpsBuildTestCase() { protected fun requireLibrary(library: KotlinJpsLibrary) = libraries.getOrPut(library.id) { library.create(myProject) } + + override fun runTest() { + runTest { + super.runTest() + } + } } \ No newline at end of file