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
compiler/tests/org/jetbrains/kotlin/integration/CompilerFileLimitTest.kt
+2 -2
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.integration
import com.intellij.openapi.util.io.FileUtil
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.util.KtTestUtil
import org.junit.Assert
import java.io.File
@@ -112,5 +112,5 @@ class CompilerFileLimitTest : CompilerSmokeTestBase() {
}
private fun tempDir(markerName: String) = KotlinTestUtils.tmpDir("${CompilerFileLimitTest::class.simpleName}$markerName")
private fun tempDir(markerName: String) = KtTestUtil.tmpDir("${CompilerFileLimitTest::class.simpleName}$markerName")
}
compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTestBase.java
+2 -2
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.integration;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.util.KtTestUtil;
import org.jetbrains.kotlin.utils.StringsKt;
import java.io.File;
@@ -30,7 +30,7 @@ import java.util.Collections;
public abstract class CompilerSmokeTestBase extends KotlinIntegrationTestBase {
@NotNull
protected String getTestDataDir() {
return KotlinTestUtils.getTestDataPathBase() + "/integration/smoke/" + getTestName(true);
return KtTestUtil.getTestDataPathBase() + "/integration/smoke/" + getTestName(true);
}
protected int run(String logName, String... args) throws Exception {