js: cleanup 'public', property access syntax

This commit is contained in:
Dmitry Jemerov
2016-01-07 18:15:19 +01:00
parent 33ef7ad024
commit d6a11b839b
84 changed files with 643 additions and 654 deletions
@@ -28,7 +28,7 @@ import java.io.File
import java.util.ArrayList
import java.util.LinkedHashMap
public abstract class MultipleModulesTranslationTest(main: String) : BasicTest(main) {
abstract class MultipleModulesTranslationTest(main: String) : BasicTest(main) {
private val MAIN_MODULE_NAME: String = "main"
private var dependencies: Map<String, List<String>>? = null
@@ -86,7 +86,7 @@ public abstract class MultipleModulesTranslationTest(main: String) : BasicTest(m
private fun readModuleDependencies(testDataDir: String): Map<String, List<String>> {
val dependenciesTxt = upsearchFile(testDataDir, "dependencies.txt")
assert(dependenciesTxt.isFile()) { "moduleDependencies should not be null" }
assert(dependenciesTxt.isFile) { "moduleDependencies should not be null" }
val result = LinkedHashMap<String, List<String>>()
for (line in dependenciesTxt.readLines()) {
@@ -105,7 +105,7 @@ public abstract class MultipleModulesTranslationTest(main: String) : BasicTest(m
var dir: File? = File(startingDir)
var file = File(dir, name)
while (dir != null && dir.isDirectory() && !file.isFile()) {
while (dir != null && dir.isDirectory && !file.isFile) {
dir = dir.parentFile
file = File(dir, name)
}
@@ -18,4 +18,4 @@ package org.jetbrains.kotlin.js.test.semantics
import org.jetbrains.kotlin.js.test.SingleFileTranslationTest
public abstract class AbstractReifiedTest : SingleFileTranslationTest("reified/")
abstract class AbstractReifiedTest : SingleFileTranslationTest("reified/")
@@ -20,34 +20,34 @@ import org.jetbrains.kotlin.js.test.AbstractSingleFileTranslationWithDirectivesT
import org.jetbrains.kotlin.js.test.MultipleModulesTranslationTest
import org.jetbrains.kotlin.js.test.SingleFileTranslationTest
public abstract class AbstractBlackBoxTest(d: String) : SingleFileTranslationTest(d) {
abstract class AbstractBlackBoxTest(d: String) : SingleFileTranslationTest(d) {
override fun doTest(filename: String) = checkBlackBoxIsOkByPath(filename)
}
public abstract class AbstractBridgeTest : AbstractBlackBoxTest("bridges/")
abstract class AbstractBridgeTest : AbstractBlackBoxTest("bridges/")
public abstract class AbstractCallableReferenceTest(main: String) : SingleFileTranslationTest("callableReference/" + main)
abstract class AbstractCallableReferenceTest(main: String) : SingleFileTranslationTest("callableReference/" + main)
public abstract class AbstractCompanionObjectTest : SingleFileTranslationTest("objectIntrinsics/")
abstract class AbstractCompanionObjectTest : SingleFileTranslationTest("objectIntrinsics/")
public abstract class AbstractDynamicTest : SingleFileTranslationTest("dynamic/")
abstract class AbstractDynamicTest : SingleFileTranslationTest("dynamic/")
public abstract class AbstractFunctionExpressionTest : AbstractBlackBoxTest("functionExpression/")
abstract class AbstractFunctionExpressionTest : AbstractBlackBoxTest("functionExpression/")
public abstract class AbstractInlineEvaluationOrderTest : AbstractSingleFileTranslationWithDirectivesTest("inlineEvaluationOrder/")
abstract class AbstractInlineEvaluationOrderTest : AbstractSingleFileTranslationWithDirectivesTest("inlineEvaluationOrder/")
public abstract class AbstractInlineJsStdlibTest : AbstractSingleFileTranslationWithDirectivesTest("inlineStdlib/")
abstract class AbstractInlineJsStdlibTest : AbstractSingleFileTranslationWithDirectivesTest("inlineStdlib/")
public abstract class AbstractInlineJsTest : AbstractSingleFileTranslationWithDirectivesTest("inline/")
abstract class AbstractInlineJsTest : AbstractSingleFileTranslationWithDirectivesTest("inline/")
public abstract class AbstractJsCodeTest : AbstractSingleFileTranslationWithDirectivesTest("jsCode/")
abstract class AbstractJsCodeTest : AbstractSingleFileTranslationWithDirectivesTest("jsCode/")
public abstract class AbstractLabelTest : AbstractSingleFileTranslationWithDirectivesTest("labels/")
abstract class AbstractLabelTest : AbstractSingleFileTranslationWithDirectivesTest("labels/")
public abstract class AbstractMultiModuleTest : MultipleModulesTranslationTest("multiModule/")
abstract class AbstractMultiModuleTest : MultipleModulesTranslationTest("multiModule/")
public abstract class AbstractInlineMultiModuleTest : MultipleModulesTranslationTest("inlineMultiModule/")
abstract class AbstractInlineMultiModuleTest : MultipleModulesTranslationTest("inlineMultiModule/")
public abstract class AbstractReservedWordTest : SingleFileTranslationTest("reservedWords/")
abstract class AbstractReservedWordTest : SingleFileTranslationTest("reservedWords/")
public abstract class AbstractSecondaryConstructorTest : AbstractBlackBoxTest("secondaryConstructors/")
abstract class AbstractSecondaryConstructorTest : AbstractBlackBoxTest("secondaryConstructors/")