diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/abstractClassesForGeneratedIrTests.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/abstractClassesForGeneratedIrTests.kt index 802be7d6aff..cc00cde4995 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/abstractClassesForGeneratedIrTests.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/abstractClassesForGeneratedIrTests.kt @@ -1,14 +1,13 @@ /* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 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.ir.semantics -import org.jetbrains.kotlin.js.test.BasicBoxTest import org.jetbrains.kotlin.js.test.BasicIrBoxTest -abstract class AbstractIrBoxJsTest : BasicIrBoxTest(BasicBoxTest.TEST_DATA_DIR_PATH + "box/", "irBox/") +abstract class AbstractIrBoxJsTest : BasicIrBoxTest(TEST_DATA_DIR_PATH + "box/", "irBox/") abstract class AbstractIrJsCodegenBoxTest : BasicIrBoxTest( "compiler/testData/codegen/box/", @@ -16,7 +15,7 @@ abstract class AbstractIrJsCodegenBoxTest : BasicIrBoxTest( ) abstract class AbstractIrWasmBoxJsTest : BasicIrBoxTest( - BasicBoxTest.TEST_DATA_DIR_PATH + "wasmBox/", + TEST_DATA_DIR_PATH + "wasmBox/", "irWasmBox/" ) @@ -25,7 +24,7 @@ abstract class BorrowedIrInlineTest(relativePath: String) : BasicIrBoxTest( "codegen/irBoxInline/$relativePath" ) { init { - additionalCommonFileDirectories += BasicBoxTest.TEST_DATA_DIR_PATH + relativePath + "/_commonFiles/" + additionalCommonFileDirectories += TEST_DATA_DIR_PATH + relativePath + "/_commonFiles/" } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/abstractClassesForGeneratedTests.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/abstractClassesForGeneratedTests.kt index ead38e5cbf2..7c93b793f4f 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/abstractClassesForGeneratedTests.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/abstractClassesForGeneratedTests.kt @@ -1,19 +1,18 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 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.semantics import org.jetbrains.kotlin.js.test.BasicBoxTest -import org.jetbrains.kotlin.js.test.BasicIrBoxTest abstract class BorrowedInlineTest(relativePath: String) : BasicBoxTest( - "compiler/testData/codegen/boxInline/$relativePath", - "codegen/boxInline/$relativePath" + "compiler/testData/codegen/boxInline/$relativePath", + "codegen/boxInline/$relativePath" ) { init { - additionalCommonFileDirectories += BasicBoxTest.TEST_DATA_DIR_PATH + relativePath + "/_commonFiles/" + additionalCommonFileDirectories += TEST_DATA_DIR_PATH + relativePath + "/_commonFiles/" } } @@ -36,26 +35,26 @@ abstract class AbstractJsInlineContractsTests : BorrowedInlineTest("contracts/") abstract class AbstractJsInlineMultiModuleTests : BorrowedInlineTest("multiModule/") abstract class AbstractBoxJsTest : BasicBoxTest( - BasicBoxTest.TEST_DATA_DIR_PATH + "box/", - "box/" + TEST_DATA_DIR_PATH + "box/", + "box/" ) { override val runMinifierByDefault: Boolean = true } abstract class AbstractJsCodegenBoxTest : BasicBoxTest( - "compiler/testData/codegen/box/", - "codegen/box/" + "compiler/testData/codegen/box/", + "codegen/box/" ) abstract class AbstractJsLegacyPrimitiveArraysBoxTest : BasicBoxTest( - "compiler/testData/codegen/box/arrays/", - "codegen/box/arrays-legacy-primitivearrays/", - typedArraysEnabled = false + "compiler/testData/codegen/box/arrays/", + "codegen/box/arrays-legacy-primitivearrays/", + typedArraysEnabled = false ) abstract class AbstractSourceMapGenerationSmokeTest : BasicBoxTest( - BasicBoxTest.TEST_DATA_DIR_PATH + "sourcemap/", - "sourcemap/", - generateSourceMap = true, - generateNodeJsRunner = false + TEST_DATA_DIR_PATH + "sourcemap/", + "sourcemap/", + generateSourceMap = true, + generateNodeJsRunner = false ) \ No newline at end of file