From a4f2a4438b44079eb2d24b91c44834e15be2f30f Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Tue, 27 Feb 2024 16:14:06 +0100 Subject: [PATCH] [Test] Move JsBackendDiagnosticsHandler to common test infra ^KT-64393 --- .../backend}/handlers/JsBackendDiagnosticsHandler.kt | 9 +++------ .../kotlin/js/test/fir/AbstractFirPsiJsDiagnosticTest.kt | 3 +-- .../js/test/ir/AbstractDiagnosticsTestWithJsStdLib.kt | 3 +-- .../js/test/ir/AbstractJsBlackBoxCodegenTestBase.kt | 1 + 4 files changed, 6 insertions(+), 10 deletions(-) rename {js/js.tests/test/org/jetbrains/kotlin/js/test => compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend}/handlers/JsBackendDiagnosticsHandler.kt (62%) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsBackendDiagnosticsHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JsBackendDiagnosticsHandler.kt similarity index 62% rename from js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsBackendDiagnosticsHandler.kt rename to compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JsBackendDiagnosticsHandler.kt index 262f687c440..51686264946 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsBackendDiagnosticsHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/JsBackendDiagnosticsHandler.kt @@ -1,16 +1,13 @@ /* - * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2024 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.js.test.handlers +package org.jetbrains.kotlin.test.backend.handlers -import org.jetbrains.kotlin.test.backend.handlers.KlibArtifactHandler -import org.jetbrains.kotlin.test.backend.handlers.checkFullDiagnosticRender -import org.jetbrains.kotlin.test.backend.handlers.reportKtDiagnostics import org.jetbrains.kotlin.test.model.BinaryArtifacts import org.jetbrains.kotlin.test.model.TestModule -import org.jetbrains.kotlin.test.services.* +import org.jetbrains.kotlin.test.services.TestServices class JsBackendDiagnosticsHandler(testServices: TestServices) : KlibArtifactHandler(testServices) { override fun processModule(module: TestModule, info: BinaryArtifacts.KLib) { diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirPsiJsDiagnosticTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirPsiJsDiagnosticTest.kt index b2dc6d4cd37..8deca9193b3 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirPsiJsDiagnosticTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/fir/AbstractFirPsiJsDiagnosticTest.kt @@ -7,16 +7,15 @@ package org.jetbrains.kotlin.js.test.fir import org.jetbrains.kotlin.js.test.JsAdditionalSourceProvider import org.jetbrains.kotlin.js.test.converters.FirJsKlibBackendFacade -import org.jetbrains.kotlin.js.test.handlers.JsBackendDiagnosticsHandler import org.jetbrains.kotlin.platform.js.JsPlatforms import org.jetbrains.kotlin.test.FirParser import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor +import org.jetbrains.kotlin.test.backend.handlers.JsBackendDiagnosticsHandler import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.builders.firHandlersStep import org.jetbrains.kotlin.test.builders.klibArtifactsHandlersStep import org.jetbrains.kotlin.test.directives.ConfigurationDirectives -import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives import org.jetbrains.kotlin.test.directives.configureFirParser import org.jetbrains.kotlin.test.frontend.fir.Fir2IrJsResultsConverter import org.jetbrains.kotlin.test.frontend.fir.FirFrontendFacade diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractDiagnosticsTestWithJsStdLib.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractDiagnosticsTestWithJsStdLib.kt index de281dba9d9..258c0ab6e00 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractDiagnosticsTestWithJsStdLib.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractDiagnosticsTestWithJsStdLib.kt @@ -5,12 +5,11 @@ package org.jetbrains.kotlin.js.test.ir -import org.jetbrains.kotlin.js.test.converters.JsIrBackendFacade import org.jetbrains.kotlin.js.test.converters.JsKlibBackendFacade -import org.jetbrains.kotlin.js.test.handlers.JsBackendDiagnosticsHandler import org.jetbrains.kotlin.platform.js.JsPlatforms import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor +import org.jetbrains.kotlin.test.backend.handlers.JsBackendDiagnosticsHandler import org.jetbrains.kotlin.test.builders.* import org.jetbrains.kotlin.test.directives.ConfigurationDirectives import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsBlackBoxCodegenTestBase.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsBlackBoxCodegenTestBase.kt index 5db34ae1f03..5a47c57c65e 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsBlackBoxCodegenTestBase.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsBlackBoxCodegenTestBase.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor import org.jetbrains.kotlin.test.backend.handlers.IrMangledNameAndSignatureDumpHandler import org.jetbrains.kotlin.test.backend.handlers.JsIrInterpreterDumpHandler +import org.jetbrains.kotlin.test.backend.handlers.JsBackendDiagnosticsHandler import org.jetbrains.kotlin.test.backend.handlers.KlibInterpreterDumpHandler import org.jetbrains.kotlin.test.builders.* import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives