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

Remove coroutinesPackage from tests, since it is kotlin.coroutines

Browse Source 
anyway.
Simplify createTextForHelpers: remove experimental coroutines version.
This commit is contained in:
Ilmir Usmanov
2021-03-26 20:39:21 +01:00
committed by TeamCityServer
parent c868116535
commit 5617d83c6b
5 changed files with 93 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
+6 -13
View File
@@ -101,17 +101,13 @@ abstract class BasicBoxTest(
fun doTest(filePath: String) {
doTestWithIgnoringByFailFile(filePath, coroutinesPackage = "")
doTestWithIgnoringByFailFile(filePath)
}
fun doTestWithCoroutinesPackageReplacement(filePath: String, coroutinesPackage: String) {
doTestWithIgnoringByFailFile(filePath, coroutinesPackage)
}
fun doTestWithIgnoringByFailFile(filePath: String, coroutinesPackage: String) {
fun doTestWithIgnoringByFailFile(filePath: String) {
val failFile = File("$filePath.fail")
try {
doTest(filePath, "OK", MainCallParameters.noCall(), coroutinesPackage)
doTest(filePath, "OK", MainCallParameters.noCall())
} catch (e: Throwable) {
if (failFile.exists()) {
KotlinTestUtils.assertEqualsToFile(failFile, e.message ?: "")
@@ -121,7 +117,7 @@ abstract class BasicBoxTest(
}
}
open fun doTest(filePath: String, expectedResult: String, mainCallParameters: MainCallParameters, coroutinesPackage: String = "") {
open fun doTest(filePath: String, expectedResult: String, mainCallParameters: MainCallParameters) {
val file = File(filePath)
logger.logFile("Test file", file)
@@ -130,9 +126,6 @@ abstract class BasicBoxTest(
val dceOutputDir = getOutputDir(file, testGroupOutputDirForMinification)
val pirOutputDir = getOutputDir(file, testGroupOutputDirForPir)
var fileContent = KtTestUtil.doLoadFile(file)
if (coroutinesPackage.isNotEmpty()) {
fileContent = fileContent.replace("COROUTINES_PACKAGE", coroutinesPackage)
}
val needsFullIrRuntime = KJS_WITH_FULL_RUNTIME.matcher(fileContent).find() || WITH_RUNTIME.matcher(fileContent).find() || WITH_STDLIB.matcher(fileContent).find()
@@ -157,7 +150,7 @@ abstract class BasicBoxTest(
val propertyLazyInitialization = PROPERTY_LAZY_INITIALIZATION.matcher(fileContent).find()
TestFileFactoryImpl(coroutinesPackage).use { testFactory ->
TestFileFactoryImpl().use { testFactory ->
val inputFiles = TestFiles.createTestFiles(
file.name,
fileContent,
@@ -957,7 +950,7 @@ abstract class BasicBoxTest(
TestCase.assertEquals(expectedResult, result)
}
private inner class TestFileFactoryImpl(val coroutinesPackage: String) : TestFiles.TestFileFactory<TestModule, TestFile>, Closeable {
private inner class TestFileFactoryImpl() : TestFiles.TestFileFactory<TestModule, TestFile>, Closeable {
var testPackage: String? = null
val tmpDir = KtTestUtil.tmpDir("js-tests")
val defaultModule = TestModule(TEST_MODULE, emptyList(), emptyList())
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt
+2 -2
View File
@@ -65,10 +65,10 @@ abstract class BasicIrBoxTest(
private val cachedDependencies = mutableMapOf<String, Collection<String>>()
override fun doTest(filePath: String, expectedResult: String, mainCallParameters: MainCallParameters, coroutinesPackage: String) {
override fun doTest(filePath: String, expectedResult: String, mainCallParameters: MainCallParameters) {
compilationCache.clear()
cachedDependencies.clear()
super.doTest(filePath, expectedResult, mainCallParameters, coroutinesPackage)
super.doTest(filePath, expectedResult, mainCallParameters)
}
override val testChecker get() = if (runTestInNashorn) NashornIrJsTestChecker() else V8IrJsTestChecker