From 41ce3936fcad7e61879d88a3ec1bed6961f421be Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 19 Apr 2017 22:28:46 +0300 Subject: [PATCH] KJS: move some "static" properties of BasicBoxTest to its companion object --- .../jetbrains/kotlin/js/test/BasicBoxTest.kt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt index 9cd99964f90..505cac8354b 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt @@ -65,16 +65,8 @@ abstract class BasicBoxTest( private val typedArraysEnabled: Boolean = false, private val generateSourceMap: Boolean = false ) : KotlinTestWithEnvironment() { - private val COMMON_FILES_NAME = "_common" - private val COMMON_FILES_DIR = "_commonFiles/" - val MODULE_EMULATION_FILE = TEST_DATA_DIR_PATH + "/moduleEmulation.js" val additionalCommonFileDirectories = mutableListOf() - val TEST_MODULE = "JS_TESTS" - val DEFAULT_MODULE = "main" - val TEST_FUNCTION = "box" - private val OLD_MODULE_SUFFIX = "-old" - fun doTest(filePath: String) { val file = File(filePath) val outputDir = getOutputDir(file) @@ -366,11 +358,20 @@ abstract class BasicBoxTest( companion object { val TEST_DATA_DIR_PATH = "js/js.translator/testData/" + private val COMMON_FILES_NAME = "_common" + private val COMMON_FILES_DIR = "_commonFiles/" + private val MODULE_EMULATION_FILE = TEST_DATA_DIR_PATH + "/moduleEmulation.js" + private val MODULE_KIND_PATTERN = Pattern.compile("^// *MODULE_KIND: *(.+)$", Pattern.MULTILINE) private val NO_MODULE_SYSTEM_PATTERN = Pattern.compile("^// *NO_JS_MODULE_SYSTEM", Pattern.MULTILINE) private val NO_INLINE_PATTERN = Pattern.compile("^// *NO_INLINE *$", Pattern.MULTILINE) private val SKIP_NODE_JS = Pattern.compile("^// *SKIP_NODE_JS *$", Pattern.MULTILINE) + private val TEST_MODULE = "JS_TESTS" + private val DEFAULT_MODULE = "main" + private val TEST_FUNCTION = "box" + private val OLD_MODULE_SUFFIX = "-old" + const val KOTLIN_TEST_INTERNAL = "\$kotlin_test_internal\$" } }