diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index 06f8ae1af14..b62b9701e4e 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -229,10 +229,6 @@ fun Test.setUpJsBoxTests(jsEnabled: Boolean, jsIrEnabled: Boolean) { } exclude("org/jetbrains/kotlin/js/testOld/wasm/semantics/*") - exclude("org/jetbrains/kotlin/js/test/es6/semantics/*") - - if (jsEnabled && !jsIrEnabled) exclude("org/jetbrains/kotlin/js/test/ir/semantics/*") - if (!jsEnabled && jsIrEnabled) include("org/jetbrains/kotlin/js/test/ir/semantics/*") jvmArgs("-da:jdk.nashorn.internal.runtime.RecompilableScriptFunctionData") // Disable assertion which fails due to a bug in nashorn (KT-23637) setUpBoxTests() diff --git a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt index f76173badfd..7f7ecd50a0e 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt @@ -13,8 +13,8 @@ import org.jetbrains.kotlin.js.testOld.compatibility.binary.AbstractJsKlibBinary import org.jetbrains.kotlin.js.testOld.wasm.semantics.AbstractIrCodegenBoxWasmTest import org.jetbrains.kotlin.js.testOld.wasm.semantics.AbstractIrCodegenWasmJsInteropWasmTest import org.jetbrains.kotlin.js.testOld.wasm.semantics.AbstractJsTranslatorWasmTest -import org.jetbrains.kotlin.js.testNew.* -import org.jetbrains.kotlin.js.testNew.AbstractIrJsTypeScriptExportTest +import org.jetbrains.kotlin.js.test.* +import org.jetbrains.kotlin.js.test.AbstractIrJsTypeScriptExportTest import org.jetbrains.kotlin.test.TargetBackend fun main(args: Array) { diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/AbstractJsBlackBoxCodegenTestBase.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsBlackBoxCodegenTestBase.kt similarity index 98% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/AbstractJsBlackBoxCodegenTestBase.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsBlackBoxCodegenTestBase.kt index ec16a001f90..fd9ce886a6b 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/AbstractJsBlackBoxCodegenTestBase.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsBlackBoxCodegenTestBase.kt @@ -3,9 +3,9 @@ * 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.testNew +package org.jetbrains.kotlin.js.test -import org.jetbrains.kotlin.js.testNew.handlers.* +import org.jetbrains.kotlin.js.test.handlers.* import org.jetbrains.kotlin.platform.js.JsPlatforms import org.jetbrains.kotlin.test.Constructor import org.jetbrains.kotlin.test.TargetBackend diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/AbstractJsIrTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsIrTest.kt similarity index 93% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/AbstractJsIrTest.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsIrTest.kt index 15d55835261..8ff3ce4d155 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/AbstractJsIrTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsIrTest.kt @@ -3,12 +3,12 @@ * 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.testNew +package org.jetbrains.kotlin.js.test -import org.jetbrains.kotlin.js.testNew.converters.JsIrBackendFacade -import org.jetbrains.kotlin.js.testNew.converters.JsKlibBackendFacade -import org.jetbrains.kotlin.js.testNew.converters.incremental.RecompileModuleJsIrBackendFacade -import org.jetbrains.kotlin.js.testNew.handlers.* +import org.jetbrains.kotlin.js.test.converters.JsIrBackendFacade +import org.jetbrains.kotlin.js.test.converters.JsKlibBackendFacade +import org.jetbrains.kotlin.js.test.converters.incremental.RecompileModuleJsIrBackendFacade +import org.jetbrains.kotlin.js.test.handlers.* import org.jetbrains.kotlin.parsing.parseBoolean import org.jetbrains.kotlin.test.Constructor import org.jetbrains.kotlin.test.TargetBackend diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/AbstractJsTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsTest.kt similarity index 94% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/AbstractJsTest.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsTest.kt index 74ae86be633..68fdf2611ff 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/AbstractJsTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsTest.kt @@ -3,12 +3,12 @@ * 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.testNew +package org.jetbrains.kotlin.js.test -import org.jetbrains.kotlin.js.testNew.converters.ClassicJsBackendFacade -import org.jetbrains.kotlin.js.testNew.converters.incremental.RecompileModuleJsBackendFacade -import org.jetbrains.kotlin.js.testNew.handlers.* -import org.jetbrains.kotlin.js.testNew.utils.JsIncrementalEnvironmentConfigurator +import org.jetbrains.kotlin.js.test.converters.ClassicJsBackendFacade +import org.jetbrains.kotlin.js.test.converters.incremental.RecompileModuleJsBackendFacade +import org.jetbrains.kotlin.js.test.handlers.* +import org.jetbrains.kotlin.js.test.utils.JsIncrementalEnvironmentConfigurator import org.jetbrains.kotlin.test.Constructor import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.backend.classic.ClassicBackendInput diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/JsAdditionalSourceProvider.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/JsAdditionalSourceProvider.kt similarity index 98% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/JsAdditionalSourceProvider.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/JsAdditionalSourceProvider.kt index ab68030826d..b539914f752 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/JsAdditionalSourceProvider.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/JsAdditionalSourceProvider.kt @@ -3,7 +3,7 @@ * 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.testNew +package org.jetbrains.kotlin.js.test import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.js.JavaScript diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/JsFailingTestSuppressor.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/JsFailingTestSuppressor.kt similarity index 78% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/JsFailingTestSuppressor.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/JsFailingTestSuppressor.kt index 310b9571c4d..58dbbbbded3 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/JsFailingTestSuppressor.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/JsFailingTestSuppressor.kt @@ -3,16 +3,12 @@ * 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.testNew +package org.jetbrains.kotlin.js.test import org.jetbrains.kotlin.test.WrappedException -import org.jetbrains.kotlin.test.backend.classic.ClassicBackendFacade -import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade import org.jetbrains.kotlin.test.model.AfterAnalysisChecker -import org.jetbrains.kotlin.test.model.FrontendKinds import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.moduleStructure -import org.jetbrains.kotlin.test.utils.firTestDataFile class JsFailingTestSuppressor(testServices: TestServices) : AfterAnalysisChecker(testServices) { override fun suppressIfNeeded(failedAssertions: List): List { diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/converters/ClassicJsBackendFacade.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/ClassicJsBackendFacade.kt similarity index 96% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/converters/ClassicJsBackendFacade.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/converters/ClassicJsBackendFacade.kt index 6fd69d5f469..126b5ab1932 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/converters/ClassicJsBackendFacade.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/ClassicJsBackendFacade.kt @@ -3,7 +3,7 @@ * 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.testNew.converters +package org.jetbrains.kotlin.js.test.converters import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.text.StringUtil @@ -15,8 +15,8 @@ import org.jetbrains.kotlin.js.facade.K2JSTranslator import org.jetbrains.kotlin.js.facade.MainCallParameters import org.jetbrains.kotlin.js.facade.TranslationResult import org.jetbrains.kotlin.js.facade.TranslationUnit -import org.jetbrains.kotlin.js.testNew.utils.JsClassicIncrementalDataProvider -import org.jetbrains.kotlin.js.testNew.utils.jsClassicIncrementalDataProvider +import org.jetbrains.kotlin.js.test.utils.JsClassicIncrementalDataProvider +import org.jetbrains.kotlin.js.test.utils.jsClassicIncrementalDataProvider import org.jetbrains.kotlin.serialization.js.ModuleKind import org.jetbrains.kotlin.test.backend.classic.ClassicBackendFacade import org.jetbrains.kotlin.test.backend.classic.ClassicBackendInput diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/converters/JsIrBackendFacade.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsIrBackendFacade.kt similarity index 97% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/converters/JsIrBackendFacade.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsIrBackendFacade.kt index e71b15c86c7..b4dcbbadf46 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/converters/JsIrBackendFacade.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsIrBackendFacade.kt @@ -3,7 +3,7 @@ * 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.testNew.converters +package org.jetbrains.kotlin.js.test.converters import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig import org.jetbrains.kotlin.backend.common.serialization.signature.IdSignatureDescriptor @@ -22,10 +22,10 @@ import org.jetbrains.kotlin.ir.util.IrMessageLogger import org.jetbrains.kotlin.ir.util.SymbolTable import org.jetbrains.kotlin.js.config.ErrorTolerancePolicy import org.jetbrains.kotlin.js.config.JSConfigurationKeys -import org.jetbrains.kotlin.js.testNew.handlers.JsBoxRunner.Companion.TEST_FUNCTION -import org.jetbrains.kotlin.js.testNew.utils.esModulesSubDir -import org.jetbrains.kotlin.js.testNew.utils.extractTestPackage -import org.jetbrains.kotlin.js.testNew.utils.jsIrIncrementalDataProvider +import org.jetbrains.kotlin.js.test.handlers.JsBoxRunner.Companion.TEST_FUNCTION +import org.jetbrains.kotlin.js.test.utils.esModulesSubDir +import org.jetbrains.kotlin.js.test.utils.extractTestPackage +import org.jetbrains.kotlin.js.test.utils.jsIrIncrementalDataProvider import org.jetbrains.kotlin.library.uniqueName import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi2ir.Psi2IrConfiguration diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/converters/JsKlibBackendFacade.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsKlibBackendFacade.kt similarity index 96% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/converters/JsKlibBackendFacade.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsKlibBackendFacade.kt index 53c67c2944d..6d2bc83f4b9 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/converters/JsKlibBackendFacade.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/JsKlibBackendFacade.kt @@ -3,7 +3,7 @@ * 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.testNew.converters +package org.jetbrains.kotlin.js.test.converters import org.jetbrains.kotlin.config.CommonConfigurationKeys import org.jetbrains.kotlin.config.languageVersionSettings @@ -12,8 +12,8 @@ import org.jetbrains.kotlin.ir.backend.js.* import org.jetbrains.kotlin.ir.util.IrMessageLogger import org.jetbrains.kotlin.js.config.ErrorTolerancePolicy import org.jetbrains.kotlin.js.config.JSConfigurationKeys -import org.jetbrains.kotlin.js.testNew.utils.JsIrIncrementalDataProvider -import org.jetbrains.kotlin.js.testNew.utils.jsIrIncrementalDataProvider +import org.jetbrains.kotlin.js.test.utils.JsIrIncrementalDataProvider +import org.jetbrains.kotlin.js.test.utils.jsIrIncrementalDataProvider import org.jetbrains.kotlin.library.KotlinAbiVersion import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.test.backend.ir.IrBackendFacade diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/converters/incremental/CommonRecompileModuleJsBackendFacade.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/incremental/CommonRecompileModuleJsBackendFacade.kt similarity index 98% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/converters/incremental/CommonRecompileModuleJsBackendFacade.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/converters/incremental/CommonRecompileModuleJsBackendFacade.kt index 1d5f0f03cdc..5b7abe22831 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/converters/incremental/CommonRecompileModuleJsBackendFacade.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/incremental/CommonRecompileModuleJsBackendFacade.kt @@ -3,7 +3,7 @@ * 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.testNew.converters.incremental +package org.jetbrains.kotlin.js.test.converters.incremental import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.TestInfrastructureInternals diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/converters/incremental/RecompileModuleJsBackendFacade.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/incremental/RecompileModuleJsBackendFacade.kt similarity index 90% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/converters/incremental/RecompileModuleJsBackendFacade.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/converters/incremental/RecompileModuleJsBackendFacade.kt index 11bac89a716..aca9c459ee1 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/converters/incremental/RecompileModuleJsBackendFacade.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/incremental/RecompileModuleJsBackendFacade.kt @@ -3,10 +3,10 @@ * 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.testNew.converters.incremental +package org.jetbrains.kotlin.js.test.converters.incremental -import org.jetbrains.kotlin.js.testNew.converters.ClassicJsBackendFacade -import org.jetbrains.kotlin.js.testNew.utils.jsClassicIncrementalDataProvider +import org.jetbrains.kotlin.js.test.converters.ClassicJsBackendFacade +import org.jetbrains.kotlin.js.test.utils.jsClassicIncrementalDataProvider import org.jetbrains.kotlin.test.Constructor import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.backend.classic.ClassicBackendInput diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/converters/incremental/RecompileModuleJsIrBackendFacade.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/incremental/RecompileModuleJsIrBackendFacade.kt similarity index 82% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/converters/incremental/RecompileModuleJsIrBackendFacade.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/converters/incremental/RecompileModuleJsIrBackendFacade.kt index 82b3cb83161..51a1e476113 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/converters/incremental/RecompileModuleJsIrBackendFacade.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/converters/incremental/RecompileModuleJsIrBackendFacade.kt @@ -3,12 +3,12 @@ * 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.testNew.converters.incremental +package org.jetbrains.kotlin.js.test.converters.incremental -import org.jetbrains.kotlin.js.testNew.converters.JsIrBackendFacade -import org.jetbrains.kotlin.js.testNew.converters.JsKlibBackendFacade -import org.jetbrains.kotlin.js.testNew.utils.JsIrIncrementalDataProvider -import org.jetbrains.kotlin.js.testNew.utils.jsIrIncrementalDataProvider +import org.jetbrains.kotlin.js.test.converters.JsIrBackendFacade +import org.jetbrains.kotlin.js.test.converters.JsKlibBackendFacade +import org.jetbrains.kotlin.js.test.utils.JsIrIncrementalDataProvider +import org.jetbrains.kotlin.js.test.utils.jsIrIncrementalDataProvider import org.jetbrains.kotlin.test.* import org.jetbrains.kotlin.test.backend.ir.IrBackendInput import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/AbstractJsArtifactsCollector.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/AbstractJsArtifactsCollector.kt similarity index 95% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/AbstractJsArtifactsCollector.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/AbstractJsArtifactsCollector.kt index 3e0cccde871..92d65a6ecd6 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/AbstractJsArtifactsCollector.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/AbstractJsArtifactsCollector.kt @@ -3,7 +3,7 @@ * 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.testNew.handlers +package org.jetbrains.kotlin.js.test.handlers import org.jetbrains.kotlin.test.backend.handlers.JsBinaryArtifactHandler import org.jetbrains.kotlin.test.model.BinaryArtifacts diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsArtifactsDumpHandler.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsArtifactsDumpHandler.kt similarity index 98% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsArtifactsDumpHandler.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsArtifactsDumpHandler.kt index a759a43e923..3176c2c6d78 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsArtifactsDumpHandler.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsArtifactsDumpHandler.kt @@ -3,7 +3,7 @@ * 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.testNew.handlers +package org.jetbrains.kotlin.js.test.handlers import org.jetbrains.kotlin.test.backend.handlers.JsBinaryArtifactHandler import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsAstHandler.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsAstHandler.kt similarity index 98% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsAstHandler.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsAstHandler.kt index 566541944c7..1fac85a75b9 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsAstHandler.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsAstHandler.kt @@ -3,7 +3,7 @@ * 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.testNew.handlers +package org.jetbrains.kotlin.js.test.handlers import org.jetbrains.kotlin.js.backend.ast.JsExpressionStatement import org.jetbrains.kotlin.js.backend.ast.JsNullLiteral diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsBoxRunner.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsBoxRunner.kt similarity index 97% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsBoxRunner.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsBoxRunner.kt index adb6b66dc05..eb046fbe4b8 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsBoxRunner.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsBoxRunner.kt @@ -3,10 +3,10 @@ * 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.testNew.handlers +package org.jetbrains.kotlin.js.test.handlers import org.jetbrains.kotlin.js.testOld.engines.ExternalTool -import org.jetbrains.kotlin.js.testNew.utils.* +import org.jetbrains.kotlin.js.test.utils.* import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.configuration.JsEnvironmentConfigurator diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsDtsHandler.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsDtsHandler.kt similarity index 97% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsDtsHandler.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsDtsHandler.kt index 4ae7fc9681a..63eb5d8c681 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsDtsHandler.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsDtsHandler.kt @@ -3,7 +3,7 @@ * 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.testNew.handlers +package org.jetbrains.kotlin.js.test.handlers import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.backend.handlers.JsBinaryArtifactHandler diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsIrRecompiledArtifactsIdentityHandler.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsIrRecompiledArtifactsIdentityHandler.kt similarity index 85% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsIrRecompiledArtifactsIdentityHandler.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsIrRecompiledArtifactsIdentityHandler.kt index 15199e70d5f..46eee5d3479 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsIrRecompiledArtifactsIdentityHandler.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsIrRecompiledArtifactsIdentityHandler.kt @@ -3,20 +3,12 @@ * 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.testNew.handlers +package org.jetbrains.kotlin.js.test.handlers -import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.kotlin.js.parser.sourcemaps.SourceMapParser -import org.jetbrains.kotlin.js.parser.sourcemaps.SourceMapSuccess import org.jetbrains.kotlin.test.backend.handlers.JsBinaryArtifactHandler import org.jetbrains.kotlin.test.model.BinaryArtifacts.Js import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.TestServices -import org.jetbrains.kotlin.test.services.assertions -import java.io.ByteArrayOutputStream -import java.io.File -import java.io.PrintStream -import java.nio.charset.Charset class JsIrRecompiledArtifactsIdentityHandler(testServices: TestServices) : JsBinaryArtifactHandler(testServices) { override fun processModule(module: TestModule, info: Js) { diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsMinifierRunner.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsMinifierRunner.kt similarity index 96% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsMinifierRunner.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsMinifierRunner.kt index 374a91ec620..163f8ce1b3c 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsMinifierRunner.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsMinifierRunner.kt @@ -3,16 +3,16 @@ * 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.testNew.handlers +package org.jetbrains.kotlin.js.test.handlers import org.jetbrains.kotlin.js.dce.DeadCodeElimination import org.jetbrains.kotlin.js.dce.InputFile import org.jetbrains.kotlin.js.dce.InputResource import org.jetbrains.kotlin.js.engine.loadFiles -import org.jetbrains.kotlin.js.testNew.utils.extractTestPackage -import org.jetbrains.kotlin.js.testNew.utils.getOnlyJsFilesForRunner -import org.jetbrains.kotlin.js.testNew.utils.getTestModuleName -import org.jetbrains.kotlin.js.testNew.utils.testWithModuleSystem +import org.jetbrains.kotlin.js.test.utils.extractTestPackage +import org.jetbrains.kotlin.js.test.utils.getOnlyJsFilesForRunner +import org.jetbrains.kotlin.js.test.utils.getTestModuleName +import org.jetbrains.kotlin.js.test.utils.testWithModuleSystem import org.jetbrains.kotlin.js.testOld.* import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives import org.jetbrains.kotlin.test.services.TestServices diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsPrefixPostfixHandler.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsPrefixPostfixHandler.kt similarity index 96% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsPrefixPostfixHandler.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsPrefixPostfixHandler.kt index bb885b21ba8..35de1178a25 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsPrefixPostfixHandler.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsPrefixPostfixHandler.kt @@ -3,7 +3,7 @@ * 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.testNew.handlers +package org.jetbrains.kotlin.js.test.handlers import org.jetbrains.kotlin.test.backend.handlers.JsBinaryArtifactHandler import org.jetbrains.kotlin.test.model.BinaryArtifacts diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsRecompiledArtifactsIdentityHandler.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsRecompiledArtifactsIdentityHandler.kt similarity index 98% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsRecompiledArtifactsIdentityHandler.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsRecompiledArtifactsIdentityHandler.kt index e42643f1ec1..2f8577b779d 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsRecompiledArtifactsIdentityHandler.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsRecompiledArtifactsIdentityHandler.kt @@ -3,7 +3,7 @@ * 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.testNew.handlers +package org.jetbrains.kotlin.js.test.handlers import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.js.parser.sourcemaps.SourceMapParser diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsSourceMapHandler.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsSourceMapHandler.kt similarity index 98% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsSourceMapHandler.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsSourceMapHandler.kt index 3f63a7264ce..056edc8a4fd 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsSourceMapHandler.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsSourceMapHandler.kt @@ -3,7 +3,7 @@ * 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.testNew.handlers +package org.jetbrains.kotlin.js.test.handlers import com.google.gwt.dev.js.ThrowExceptionOnErrorReporter import org.jetbrains.kotlin.js.backend.JsToStringGenerationVisitor diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsTranslationResultHandler.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsTranslationResultHandler.kt similarity index 97% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsTranslationResultHandler.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsTranslationResultHandler.kt index 78dec19abc3..8cb3858d98e 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsTranslationResultHandler.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsTranslationResultHandler.kt @@ -3,7 +3,7 @@ * 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.testNew.handlers +package org.jetbrains.kotlin.js.test.handlers import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport import org.jetbrains.kotlin.cli.common.messages.MessageRenderer diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsWrongModuleHandler.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsWrongModuleHandler.kt similarity index 94% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsWrongModuleHandler.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsWrongModuleHandler.kt index fde56299b0f..fdf67098694 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/JsWrongModuleHandler.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/JsWrongModuleHandler.kt @@ -3,9 +3,9 @@ * 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.testNew.handlers +package org.jetbrains.kotlin.js.test.handlers -import org.jetbrains.kotlin.js.testNew.utils.getTestChecker +import org.jetbrains.kotlin.js.test.utils.getTestChecker import org.jetbrains.kotlin.test.backend.handlers.JsBinaryArtifactHandler import org.jetbrains.kotlin.test.model.BinaryArtifacts import org.jetbrains.kotlin.test.model.TestModule diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/MainCallWithArgumentsHandler.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/MainCallWithArgumentsHandler.kt similarity index 85% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/MainCallWithArgumentsHandler.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/MainCallWithArgumentsHandler.kt index 080b1b73ae9..c4abe6d2217 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/MainCallWithArgumentsHandler.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/MainCallWithArgumentsHandler.kt @@ -3,10 +3,10 @@ * 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.testNew.handlers +package org.jetbrains.kotlin.js.test.handlers -import org.jetbrains.kotlin.js.testNew.utils.getOnlyJsFilesForRunner -import org.jetbrains.kotlin.js.testNew.utils.getTestChecker +import org.jetbrains.kotlin.js.test.utils.getOnlyJsFilesForRunner +import org.jetbrains.kotlin.js.test.utils.getTestChecker import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.moduleStructure diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/NodeJsGeneratorHandler.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/NodeJsGeneratorHandler.kt similarity index 95% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/NodeJsGeneratorHandler.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/NodeJsGeneratorHandler.kt index 87b1d739b25..b032d746529 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/handlers/NodeJsGeneratorHandler.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/handlers/NodeJsGeneratorHandler.kt @@ -3,11 +3,11 @@ * 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.testNew.handlers +package org.jetbrains.kotlin.js.test.handlers import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.kotlin.js.testNew.utils.extractTestPackage -import org.jetbrains.kotlin.js.testNew.utils.getOnlyJsFilesForRunner +import org.jetbrains.kotlin.js.test.utils.extractTestPackage +import org.jetbrains.kotlin.js.test.utils.getOnlyJsFilesForRunner import org.jetbrains.kotlin.test.TargetBackend import org.jetbrains.kotlin.test.directives.CodegenTestDirectives import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/utils/JsIncrementalDataProvider.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/JsIncrementalDataProvider.kt similarity index 97% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/utils/JsIncrementalDataProvider.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/utils/JsIncrementalDataProvider.kt index ce535799f8a..6dde5b88bc3 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/utils/JsIncrementalDataProvider.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/JsIncrementalDataProvider.kt @@ -3,7 +3,7 @@ * 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.testNew.utils +package org.jetbrains.kotlin.js.test.utils import org.jetbrains.kotlin.incremental.js.TranslationResultValue import org.jetbrains.kotlin.test.model.TestModule diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/utils/JsIncrementalEnvironmentConfigurator.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/JsIncrementalEnvironmentConfigurator.kt similarity index 91% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/utils/JsIncrementalEnvironmentConfigurator.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/utils/JsIncrementalEnvironmentConfigurator.kt index 89bf8a19ffd..e5eaa167eb1 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/utils/JsIncrementalEnvironmentConfigurator.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/JsIncrementalEnvironmentConfigurator.kt @@ -3,14 +3,12 @@ * 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.testNew.utils +package org.jetbrains.kotlin.js.test.utils import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.incremental.js.IncrementalDataProviderImpl import org.jetbrains.kotlin.incremental.js.IncrementalResultsConsumerImpl import org.jetbrains.kotlin.js.config.JSConfigurationKeys -import org.jetbrains.kotlin.test.TargetBackend -import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.services.EnvironmentConfigurator import org.jetbrains.kotlin.test.services.TestServices diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/utils/JsIrIncrementalDataProvider.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/JsIrIncrementalDataProvider.kt similarity index 99% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/utils/JsIrIncrementalDataProvider.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/utils/JsIrIncrementalDataProvider.kt index a20f27e5e2f..8b6263ede1c 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/utils/JsIrIncrementalDataProvider.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/JsIrIncrementalDataProvider.kt @@ -3,7 +3,7 @@ * 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.testNew.utils +package org.jetbrains.kotlin.js.test.utils import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.ir.backend.js.ic.* diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/utils/RunnerUtils.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/RunnerUtils.kt similarity index 97% rename from js/js.tests/test/org/jetbrains/kotlin/js/testNew/utils/RunnerUtils.kt rename to js/js.tests/test/org/jetbrains/kotlin/js/test/utils/RunnerUtils.kt index 43ffec5588c..fe1bb3fa465 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/testNew/utils/RunnerUtils.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/RunnerUtils.kt @@ -3,12 +3,12 @@ * 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.testNew.utils +package org.jetbrains.kotlin.js.test.utils import org.jetbrains.kotlin.js.JavaScript import org.jetbrains.kotlin.js.config.JSConfigurationKeys -import org.jetbrains.kotlin.js.testNew.JsAdditionalSourceProvider -import org.jetbrains.kotlin.js.testNew.handlers.JsBoxRunner.Companion.TEST_FUNCTION +import org.jetbrains.kotlin.js.test.JsAdditionalSourceProvider +import org.jetbrains.kotlin.js.test.handlers.JsBoxRunner.Companion.TEST_FUNCTION import org.jetbrains.kotlin.js.testOld.* import org.jetbrains.kotlin.psi.KtNamedFunction import org.jetbrains.kotlin.serialization.js.ModuleKind diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/BoxJsTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/BoxJsTestGenerated.java similarity index 99% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/BoxJsTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/BoxJsTestGenerated.java index 22da6bb7f95..4e7c08ed9df 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/BoxJsTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/BoxJsTestGenerated.java @@ -3,7 +3,7 @@ * 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.testNew; +package org.jetbrains.kotlin.js.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/IrBoxJsTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrBoxJsTestGenerated.java similarity index 99% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/IrBoxJsTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrBoxJsTestGenerated.java index 06c2da39082..12fbfdb51a8 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/IrBoxJsTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrBoxJsTestGenerated.java @@ -3,7 +3,7 @@ * 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.testNew; +package org.jetbrains.kotlin.js.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/IrCodegenWasmJsInteropJsTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrCodegenWasmJsInteropJsTestGenerated.java similarity index 98% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/IrCodegenWasmJsInteropJsTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrCodegenWasmJsInteropJsTestGenerated.java index f0aa1a7107e..70c986e6f11 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/IrCodegenWasmJsInteropJsTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrCodegenWasmJsInteropJsTestGenerated.java @@ -3,7 +3,7 @@ * 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.testNew; +package org.jetbrains.kotlin.js.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/IrJsCodegenBoxErrorTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsCodegenBoxErrorTestGenerated.java similarity index 99% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/IrJsCodegenBoxErrorTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsCodegenBoxErrorTestGenerated.java index ec11d4bed45..3e1078c95d7 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/IrJsCodegenBoxErrorTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsCodegenBoxErrorTestGenerated.java @@ -3,7 +3,7 @@ * 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.testNew; +package org.jetbrains.kotlin.js.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsCodegenBoxTestGenerated.java similarity index 99% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/IrJsCodegenBoxTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsCodegenBoxTestGenerated.java index 21de9ceb5d6..ca481be0121 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/IrJsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsCodegenBoxTestGenerated.java @@ -3,7 +3,7 @@ * 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.testNew; +package org.jetbrains.kotlin.js.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/IrJsCodegenInlineTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsCodegenInlineTestGenerated.java similarity index 99% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/IrJsCodegenInlineTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsCodegenInlineTestGenerated.java index 58901c4560c..5f80883cde1 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/IrJsCodegenInlineTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsCodegenInlineTestGenerated.java @@ -3,7 +3,7 @@ * 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.testNew; +package org.jetbrains.kotlin.js.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/IrJsTypeScriptExportTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsTypeScriptExportTestGenerated.java similarity index 99% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/IrJsTypeScriptExportTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsTypeScriptExportTestGenerated.java index 1798a514784..5d779e0ff1e 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/IrJsTypeScriptExportTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/IrJsTypeScriptExportTestGenerated.java @@ -3,7 +3,7 @@ * 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.testNew; +package org.jetbrains.kotlin.js.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/JsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java similarity index 99% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/JsCodegenBoxTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java index 8d73c36cc30..f5c55da5dac 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java @@ -3,7 +3,7 @@ * 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.testNew; +package org.jetbrains.kotlin.js.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/JsCodegenInlineTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenInlineTestGenerated.java similarity index 99% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/JsCodegenInlineTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenInlineTestGenerated.java index a7f925f8a99..cc8cf46c4cb 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/JsCodegenInlineTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenInlineTestGenerated.java @@ -3,7 +3,7 @@ * 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.testNew; +package org.jetbrains.kotlin.js.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/JsLegacyPrimitiveArraysBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsLegacyPrimitiveArraysBoxTestGenerated.java similarity index 99% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/JsLegacyPrimitiveArraysBoxTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsLegacyPrimitiveArraysBoxTestGenerated.java index f8cf5dc3066..02605dce8a3 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/JsLegacyPrimitiveArraysBoxTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsLegacyPrimitiveArraysBoxTestGenerated.java @@ -3,7 +3,7 @@ * 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.testNew; +package org.jetbrains.kotlin.js.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/MultiModuleOrderTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/MultiModuleOrderTestGenerated.java similarity index 97% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/MultiModuleOrderTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/MultiModuleOrderTestGenerated.java index 1bf10632cc9..a8faf88f35d 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/MultiModuleOrderTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/MultiModuleOrderTestGenerated.java @@ -3,7 +3,7 @@ * 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.testNew; +package org.jetbrains.kotlin.js.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/OutputPrefixPostfixTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/OutputPrefixPostfixTestGenerated.java similarity index 97% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/OutputPrefixPostfixTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/OutputPrefixPostfixTestGenerated.java index 1956c1f7d79..087b5d492cd 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/OutputPrefixPostfixTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/OutputPrefixPostfixTestGenerated.java @@ -3,7 +3,7 @@ * 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.testNew; +package org.jetbrains.kotlin.js.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/SourceMapGenerationSmokeTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/SourceMapGenerationSmokeTestGenerated.java similarity index 97% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/SourceMapGenerationSmokeTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/SourceMapGenerationSmokeTestGenerated.java index bee07b9608b..0dd80f51815 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/SourceMapGenerationSmokeTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/SourceMapGenerationSmokeTestGenerated.java @@ -3,7 +3,7 @@ * 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.testNew; +package org.jetbrains.kotlin.js.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/WebDemoExamplesTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/WebDemoExamplesTestGenerated.java similarity index 99% rename from js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/WebDemoExamplesTestGenerated.java rename to js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/WebDemoExamplesTestGenerated.java index 02745fffe5d..21c1d566d18 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/testNew/WebDemoExamplesTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/WebDemoExamplesTestGenerated.java @@ -3,7 +3,7 @@ * 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.testNew; +package org.jetbrains.kotlin.js.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil;