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

Fix tests by using relative paths

Browse Source 
LightTempDirTestFixtureImpl.findOrCreateChildDir can work only with relative paths
This commit is contained in:
Nikolay Krasko
2016-03-14 18:33:46 +03:00
parent 2081d8f458
commit 00d06fccb6
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/PluginTestCaseBase.java
+2 -1
View File
@@ -25,7 +25,8 @@ import org.jetbrains.kotlin.test.KotlinTestUtils;
import java.io.File;
public class PluginTestCaseBase {
public static final String TEST_DATA_PROJECT_RELATIVE = "/idea/testData";
public static final String TEST_DATA_DIR = "idea/testData";
public static final String TEST_DATA_PROJECT_RELATIVE = "/" + TEST_DATA_DIR;
private PluginTestCaseBase() {
}
idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt
+1 -1
View File
@@ -30,7 +30,7 @@ import com.intellij.openapi.roots.ModifiableRootModel
import com.intellij.openapi.roots.ContentEntry
class HighlightingWithDependentLibrariesTest : KotlinLightCodeInsightFixtureTestCase() {
private val TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/highlightingWithDependentLibraries"
private val TEST_DATA_PATH = PluginTestCaseBase.TEST_DATA_DIR + "/highlightingWithDependentLibraries"
override fun getProjectDescriptor() = object : KotlinLightProjectDescriptor() {
override fun configureModule(module: Module, model: ModifiableRootModel) {
idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/BuiltInDecompilerTest.kt
+1 -1
View File
@@ -59,7 +59,7 @@ class BuiltInDecompilerTest : AbstractBuiltInDecompilerTest() {
}
class BuiltInDecompilerForWrongAbiVersionTest : AbstractBuiltInDecompilerTest() {
override fun getTestDataPath() = PluginTestCaseBase.getTestDataPathBase() + "/decompiler/builtins/"
override fun getTestDataPath() = PluginTestCaseBase.TEST_DATA_DIR + "/decompiler/builtins/"
override fun configureAndBuildFileStub(packageFqName: String): PsiFileStub<*> {
myFixture.configureByFile(testDataPath + BuiltInSerializerProtocol.getBuiltInsFilePath(FqName(packageFqName)))
idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInJavaTest.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
import org.jetbrains.kotlin.psi.KtDeclaration
import org.junit.Assert
private val FILE_WITH_KOTLIN_CODE = PluginTestCaseBase.getTestDataPathBase() + "/resolve/referenceInJava/dependency/dependencies.kt"
private val FILE_WITH_KOTLIN_CODE = PluginTestCaseBase.TEST_DATA_DIR + "/resolve/referenceInJava/dependency/dependencies.kt"
abstract class AbstractReferenceResolveInJavaTest : AbstractReferenceResolveTest() {
override fun doTest(path: String) {