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

[TEST] Introduce test-infrastructure-utils module and extract common test utilities here

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-12-02 16:00:43 +03:00
parent 1c91b74ff0
commit c8f3a4802e
189 changed files with 791 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpCompilerTestDataTest.kt
+2 -2
View File
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.kotlinp.test
import com.intellij.openapi.Disposable
import com.intellij.openapi.util.Disposer
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.util.KtTestUtil
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
@@ -21,7 +21,7 @@ class KotlinpCompilerTestDataTest(private val file: File) {
@Test
fun doTest() {
val tmpdir = KotlinTestUtils.tmpDirForTest(this::class.java.simpleName, file.nameWithoutExtension)
val tmpdir = KtTestUtil.tmpDirForTest(this::class.java.simpleName, file.nameWithoutExtension)
val disposable = TestDisposable()
try {
libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt
+2 -1
View File
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.test.ConfigurationKind
import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.TestJdkKind
import org.jetbrains.kotlin.test.util.KtTestUtil
import java.io.File
import kotlin.test.fail
@@ -76,7 +77,7 @@ private fun compile(file: File, disposable: Disposable, tmpdir: File, forEachOut
AbstractLoadJavaTest.updateConfigurationWithDirectives(content, configuration)
val environment = KotlinCoreEnvironment.createForTests(disposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
setupLanguageVersionSettingsForCompilerTests(content, environment)
val ktFile = KotlinTestUtils.createFile(file.name, content, environment.project)
val ktFile = KtTestUtil.createFile(file.name, content, environment.project)
GenerationUtils.compileFileTo(ktFile, environment, tmpdir)
for (outputFile in tmpdir.walkTopDown().sortedBy { it.nameWithoutExtension }) {