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

Use test path relative to testDataPath in fixture.configureByFile to be complaint with 193, part 3

Browse Source
This commit is contained in:
Vladimir Dolzhenko
2019-10-03 10:39:48 +02:00
parent b3392c792b
commit 55548d9199
56 changed files with 178 additions and 1274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractBreakpointApplicabilityTest.kt
+3 -17
View File
@@ -14,37 +14,23 @@ import org.jetbrains.kotlin.idea.debugger.breakpoints.*
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
import org.jetbrains.kotlin.idea.test.allKotlinFiles
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.KotlinTestUtils
import java.io.File
abstract class AbstractBreakpointApplicabilityTest : KotlinLightCodeInsightFixtureTestCase() {
private companion object {
private const val COMMENT = "///"
}
override fun getTestDataPath(): String {
return PluginTestCaseBase.getTestDataPathBase() + "/debugger/breakpointApplicability/"
}
override fun setUp() {
super.setUp()
myFixture.testDataPath = PluginTestCaseBase.getTestDataPathBase()
}
override fun getProjectDescriptor(): LightProjectDescriptor {
return KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
}
protected fun doTest(path: String) {
myFixture.configureByFile(getPath(path))
val file = File(path)
val ktFile = project.allKotlinFiles().single()
protected fun doTest(unused: String) {
val ktFile = myFixture.configureByFile(fileName()) as KtFile
val actualContents = checkBreakpoints(ktFile, BreakpointChecker())
KotlinTestUtils.assertEqualsToFile(file, actualContents)
KotlinTestUtils.assertEqualsToFile(testDataFile(), actualContents)
}
private fun checkBreakpoints(file: KtFile, checker: BreakpointChecker): String {
idea/jvm-debugger/jvm-debugger-test/test/org/jetbrains/kotlin/idea/debugger/test/AbstractSelectExpressionForDebuggerTest.kt
+5 -8
View File
@@ -5,15 +5,14 @@
package org.jetbrains.kotlin.idea.debugger.test
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.idea.debugger.KotlinEditorTextProvider
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
import org.jetbrains.kotlin.idea.test.invalidateLibraryCache
import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.junit.Assert
abstract class AbstractSelectExpressionForDebuggerTest : LightCodeInsightFixtureTestCase() {
abstract class AbstractSelectExpressionForDebuggerTest : KotlinLightCodeInsightFixtureTestCase() {
override fun setUp() {
super.setUp()
invalidateLibraryCache(project)
@@ -27,8 +26,8 @@ abstract class AbstractSelectExpressionForDebuggerTest : LightCodeInsightFixture
doTest(path, false)
}
fun doTest(path: String, allowMethodCalls: Boolean) {
myFixture.configureByFile(path)
fun doTest(unused: String, allowMethodCalls: Boolean) {
myFixture.configureByFile(fileName())
val elementAt = myFixture.file?.findElementAt(myFixture.caretOffset)!!
val selectedExpression = KotlinEditorTextProvider.findExpressionInner(elementAt, allowMethodCalls)
@@ -44,7 +43,5 @@ abstract class AbstractSelectExpressionForDebuggerTest : LightCodeInsightFixture
Assert.assertEquals("Another expression should be selected", expected, actualResult)
}
override fun getProjectDescriptor(): KotlinLightProjectDescriptor = KotlinLightProjectDescriptor.INSTANCE
override fun getTestDataPath() = PluginTestCaseBase.getTestDataPathBase() + "/debugger/selectExpression"
override fun getProjectDescriptor() = KotlinLightProjectDescriptor.INSTANCE
}