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

Browse Source
This commit is contained in:
Vladimir Dolzhenko
2019-09-29 09:45:42 +02:00
parent 7c80c6ba63
commit 3e2dac6586
8 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/performanceTests/org/jetbrains/kotlin/idea/perf/AbstractPerformanceCompletionHandlerTests.kt
+2 -1
View File
@@ -59,7 +59,8 @@ abstract class AbstractPerformanceCompletionHandlerTests(
super.tearDown()
}
protected open fun doPerfTest(testPath: String) {
protected open fun doPerfTest(unused: String) {
val testPath = testPath()
setUpFixture(testPath)
val tempSettings = CodeStyle.getSettings(project).clone()
idea/performanceTests/org/jetbrains/kotlin/idea/perf/AbstractPerformanceCompletionIncrementalResolveTest.kt
+3 -2
View File
@@ -65,10 +65,11 @@ abstract class AbstractPerformanceCompletionIncrementalResolveTest : KotlinLight
}
}
protected fun doPerfTest(testPath: String) {
protected fun doPerfTest(unused: String) {
val testPath = testPath()
val testName = getTestName(false)
innerPerfTest(testName) {
myFixture.configureByFile(testPath)
myFixture.configureByFile(fileName())
val document = myFixture.editor.document
val beforeMarkerOffset = document.text.indexOf(BEFORE_MARKER)
idea/performanceTests/org/jetbrains/kotlin/idea/perf/AbstractPerformanceHighlightingTest.kt
+2 -2
View File
@@ -54,10 +54,10 @@ abstract class AbstractPerformanceHighlightingTest : KotlinLightCodeInsightFixtu
}
}
protected fun doPerfTest(filePath: String) {
protected fun doPerfTest(unused: String) {
val testName = getTestName(false)
innerPerfTest(testName) {
myFixture.configureByFile(filePath)
myFixture.configureByFile(fileName())
val project = myFixture.project
commitAllDocuments()
idea/performanceTests/org/jetbrains/kotlin/idea/perf/AbstractPerformanceImportTest.kt
+8 -7
View File
@@ -26,12 +26,11 @@ import java.io.File
abstract class AbstractPerformanceImportTest : KotlinLightCodeInsightFixtureTestCase() {
override fun getTestDataPath() = KotlinTestUtils.getHomeDirectory()
override fun getProjectDescriptor(): LightProjectDescriptor = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE
protected abstract fun stats(): Stats
protected fun doPerfTest(testPath: String) {
protected fun doPerfTest(unused: String) {
val testName = getTestName(false)
CodeStyle.setTemporarySettings(project, CodeStyle.getSettings(project).clone())
@@ -41,13 +40,13 @@ abstract class AbstractPerformanceImportTest : KotlinLightCodeInsightFixtureTest
val fixture = myFixture
val dependencySuffixes = listOf(".dependency.kt", ".dependency.java", ".dependency1.kt", ".dependency2.kt")
for (suffix in dependencySuffixes) {
val dependencyPath = testPath.replace(".kt", suffix)
if (File(dependencyPath).exists()) {
val dependencyPath = fileName().replace(".kt", suffix)
if (File(testDataPath, dependencyPath).exists()) {
fixture.configureByFile(dependencyPath)
}
}
fixture.configureByFile(testPath)
fixture.configureByFile(fileName())
var file = fixture.file as KtFile
@@ -84,7 +83,7 @@ abstract class AbstractPerformanceImportTest : KotlinLightCodeInsightFixtureTest
stats().perfTest<Unit, String>(
testName = testName,
setUp = {
fixture.configureByFile(testPath)
fixture.configureByFile(fileName())
file = fixture.file as KtFile
fileText = file.text
@@ -96,7 +95,9 @@ abstract class AbstractPerformanceImportTest : KotlinLightCodeInsightFixtureTest
},
tearDown = {
val log = it.value
KotlinTestUtils.assertEqualsToFile(File("$testPath.after"), fixture.file.text)
val testPath = testPath()
val afterFile = File("$testPath.after")
KotlinTestUtils.assertEqualsToFile(afterFile, fixture.file.text)
if (log != null) {
val logFile = File("$testPath.log")
if (log.isNotEmpty()) {