azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[JS BEs] Minor: fix warnings in abstract classes for generated tests

Browse Source
This commit is contained in:
Zalim Bashorov
2020-03-10 21:50:17 +03:00
parent c664bfc62b
commit fe3a81ebc9
2 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/abstractClassesForGeneratedIrTests.kt
+4 -5
View File
@@ -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. * 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 package org.jetbrains.kotlin.js.test.ir.semantics
import org.jetbrains.kotlin.js.test.BasicBoxTest
import org.jetbrains.kotlin.js.test.BasicIrBoxTest 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( abstract class AbstractIrJsCodegenBoxTest : BasicIrBoxTest(
"compiler/testData/codegen/box/", "compiler/testData/codegen/box/",
@@ -16,7 +15,7 @@ abstract class AbstractIrJsCodegenBoxTest : BasicIrBoxTest(
) )
abstract class AbstractIrWasmBoxJsTest : BasicIrBoxTest( abstract class AbstractIrWasmBoxJsTest : BasicIrBoxTest(
BasicBoxTest.TEST_DATA_DIR_PATH + "wasmBox/", TEST_DATA_DIR_PATH + "wasmBox/",
"irWasmBox/" "irWasmBox/"
) )
@@ -25,7 +24,7 @@ abstract class BorrowedIrInlineTest(relativePath: String) : BasicIrBoxTest(
"codegen/irBoxInline/$relativePath" "codegen/irBoxInline/$relativePath"
) { ) {
init { init {
additionalCommonFileDirectories += BasicBoxTest.TEST_DATA_DIR_PATH + relativePath + "/_commonFiles/" additionalCommonFileDirectories += TEST_DATA_DIR_PATH + relativePath + "/_commonFiles/"
} }
} }
js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/abstractClassesForGeneratedTests.kt
+15 -16
View File
@@ -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. * 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 package org.jetbrains.kotlin.js.test.semantics
import org.jetbrains.kotlin.js.test.BasicBoxTest import org.jetbrains.kotlin.js.test.BasicBoxTest
import org.jetbrains.kotlin.js.test.BasicIrBoxTest
abstract class BorrowedInlineTest(relativePath: String) : BasicBoxTest( abstract class BorrowedInlineTest(relativePath: String) : BasicBoxTest(
"compiler/testData/codegen/boxInline/$relativePath", "compiler/testData/codegen/boxInline/$relativePath",
"codegen/boxInline/$relativePath" "codegen/boxInline/$relativePath"
) { ) {
init { 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 AbstractJsInlineMultiModuleTests : BorrowedInlineTest("multiModule/")
abstract class AbstractBoxJsTest : BasicBoxTest( abstract class AbstractBoxJsTest : BasicBoxTest(
BasicBoxTest.TEST_DATA_DIR_PATH + "box/", TEST_DATA_DIR_PATH + "box/",
"box/" "box/"
) { ) {
override val runMinifierByDefault: Boolean = true override val runMinifierByDefault: Boolean = true
} }
abstract class AbstractJsCodegenBoxTest : BasicBoxTest( abstract class AbstractJsCodegenBoxTest : BasicBoxTest(
"compiler/testData/codegen/box/", "compiler/testData/codegen/box/",
"codegen/box/" "codegen/box/"
) )
abstract class AbstractJsLegacyPrimitiveArraysBoxTest : BasicBoxTest( abstract class AbstractJsLegacyPrimitiveArraysBoxTest : BasicBoxTest(
"compiler/testData/codegen/box/arrays/", "compiler/testData/codegen/box/arrays/",
"codegen/box/arrays-legacy-primitivearrays/", "codegen/box/arrays-legacy-primitivearrays/",
typedArraysEnabled = false typedArraysEnabled = false
) )
abstract class AbstractSourceMapGenerationSmokeTest : BasicBoxTest( abstract class AbstractSourceMapGenerationSmokeTest : BasicBoxTest(
BasicBoxTest.TEST_DATA_DIR_PATH + "sourcemap/", TEST_DATA_DIR_PATH + "sourcemap/",
"sourcemap/", "sourcemap/",
generateSourceMap = true, generateSourceMap = true,
generateNodeJsRunner = false generateNodeJsRunner = false
) )