diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/IgnoreAll.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/IgnoreAll.java new file mode 100644 index 00000000000..24dd4a3fd21 --- /dev/null +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/IgnoreAll.java @@ -0,0 +1,27 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.test; + +import junit.framework.Test; +import junit.framework.TestResult; +import org.junit.internal.runners.JUnit38ClassRunner; + +public class IgnoreAll extends JUnit38ClassRunner { + public IgnoreAll(@SuppressWarnings("unused") Class klass) { + super(new Test() { + @Override + public int countTestCases() { + return 0; + } + + @Override + public void run(TestResult result) { + result.startTest(this); + result.endTest(this); + } + }); + } +} diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/experimental/integration/CompilerApiTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/experimental/integration/CompilerApiTest.kt index 8c5b6c505ab..a649ff4c6bd 100644 --- a/compiler/tests/org/jetbrains/kotlin/daemon/experimental/integration/CompilerApiTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/daemon/experimental/integration/CompilerApiTest.kt @@ -21,10 +21,11 @@ import org.jetbrains.kotlin.daemon.common.ReportSeverity import org.jetbrains.kotlin.daemon.loggerCompatiblePath import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase import org.jetbrains.kotlin.scripts.captureOut +import org.jetbrains.kotlin.test.IgnoreAll import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase import org.junit.Assert -import org.junit.Ignore +import org.junit.runner.RunWith import java.io.File import java.net.URLClassLoader import java.util.logging.LogManager @@ -34,7 +35,7 @@ private val logFiles = arrayListOf() // TODO: remove ignore annotation from tests. -@Ignore +@RunWith(IgnoreAll::class) class CompilerApiTest : KotlinIntegrationTestBase() { val kotlinCompilerClient = KotlinCompilerDaemonClient diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt index afe961e587a..4700adf0779 100644 --- a/compiler/tests/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt @@ -25,8 +25,10 @@ import org.jetbrains.kotlin.daemon.common.* import org.jetbrains.kotlin.daemon.common.experimental.findCallbackServerSocket import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase import org.jetbrains.kotlin.progress.experimental.CompilationCanceledStatus +import org.jetbrains.kotlin.test.IgnoreAll import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.utils.KotlinPaths +import org.junit.runner.RunWith import java.io.ByteArrayOutputStream import java.io.File import java.io.IOException @@ -51,14 +53,13 @@ import kotlin.script.experimental.dependencies.DependenciesResolver.ResolveResul import kotlin.script.experimental.dependencies.ScriptDependencies import kotlin.script.experimental.dependencies.asSuccess import kotlin.script.templates.ScriptTemplateDefinition -import kotlin.test.Ignore import kotlin.test.fail val TIMEOUT_DAEMON_RUNNER_EXIT_MS = 10000L // TODO: remove ignore annotation from tests. -@Ignore +@RunWith(IgnoreAll::class) class CompilerDaemonTest : KotlinIntegrationTestBase() { val kotlinCompilerClientInstance = KotlinCompilerDaemonClient.instantiate(DaemonProtocolVariant.SOCKETS) diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/experimental/unit/ClientSerializationTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/experimental/unit/ClientSerializationTest.kt index 0be9a6e7f45..030141c7b2a 100644 --- a/compiler/tests/org/jetbrains/kotlin/daemon/experimental/unit/ClientSerializationTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/daemon/experimental/unit/ClientSerializationTest.kt @@ -17,7 +17,8 @@ import org.jetbrains.kotlin.daemon.common.experimental.socketInfrastructure.open import org.jetbrains.kotlin.daemon.common.experimental.socketInfrastructure.runWithTimeout import org.jetbrains.kotlin.daemon.common.toRMI import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase -import org.junit.Ignore +import org.jetbrains.kotlin.test.IgnoreAll +import org.junit.runner.RunWith import java.io.ObjectInputStream import java.io.ObjectOutputStream import java.net.InetSocketAddress @@ -39,7 +40,7 @@ class TestServer(val serverPort: Int = 6999) { val testServer = TestServer() -@Ignore +@RunWith(IgnoreAll::class) @Suppress("UNCHECKED_CAST") class ClientSerializationTest : KotlinIntegrationTestBase() { diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/experimental/unit/ConnectionsTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/experimental/unit/ConnectionsTest.kt index 41dab66e541..1b18d581bf1 100644 --- a/compiler/tests/org/jetbrains/kotlin/daemon/experimental/unit/ConnectionsTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/daemon/experimental/unit/ConnectionsTest.kt @@ -24,8 +24,9 @@ import org.jetbrains.kotlin.daemon.common.experimental.walkDaemonsAsync import org.jetbrains.kotlin.daemon.experimental.CompileServiceServerSideImpl import org.jetbrains.kotlin.daemon.loggerCompatiblePath import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase +import org.jetbrains.kotlin.test.IgnoreAll import org.jetbrains.kotlin.test.KotlinTestUtils -import org.junit.Ignore +import org.junit.runner.RunWith import java.io.ByteArrayOutputStream import java.io.File import java.io.IOException @@ -35,7 +36,7 @@ import java.util.logging.LogManager import java.util.logging.Logger import kotlin.concurrent.schedule -@Ignore +@RunWith(IgnoreAll::class) class ConnectionsTest : KotlinIntegrationTestBase() { val kotlinCompilerClient = KotlinCompilerDaemonClient.instantiate(DaemonProtocolVariant.SOCKETS)