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

Run tests in read action and not in EDT thread

Browse Source 
Otherwise test will fail because of runInReadActionWithWriteActionPriority call in EDT
This commit is contained in:
Nikolay Krasko
2017-01-24 19:08:18 +03:00
committed by Dmitry Jemerov
parent 82a2a705fb
commit bcf29e6fbf
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractBeforeExtractFunctionInsertionTest.kt
+12 -4
View File
@@ -16,16 +16,20 @@
package org.jetbrains.kotlin.idea.debugger package org.jetbrains.kotlin.idea.debugger
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.runReadAction
import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.FileUtil
import com.intellij.testFramework.LightCodeInsightTestCase import com.intellij.testFramework.LightCodeInsightTestCase
import com.intellij.testFramework.LightPlatformCodeInsightTestCase import com.intellij.testFramework.LightPlatformCodeInsightTestCase
import org.jetbrains.kotlin.idea.refactoring.getLineNumber import org.jetbrains.kotlin.idea.refactoring.getLineNumber
import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinCodeFragmentFactory import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinCodeFragmentFactory
import org.jetbrains.kotlin.idea.debugger.evaluate.addDebugExpressionIntoTmpFileForExtractFunction import org.jetbrains.kotlin.idea.debugger.evaluate.addDebugExpressionIntoTmpFileForExtractFunction
import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.psi.KtExpressionCodeFragment import org.jetbrains.kotlin.psi.KtExpressionCodeFragment
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestUtils
import java.io.File import java.io.File
import java.util.concurrent.Callable
abstract class AbstractBeforeExtractFunctionInsertionTest : LightCodeInsightTestCase() { abstract class AbstractBeforeExtractFunctionInsertionTest : LightCodeInsightTestCase() {
@@ -42,10 +46,14 @@ abstract class AbstractBeforeExtractFunctionInsertionTest : LightCodeInsightTest
val allText = fragmentFile.text val allText = fragmentFile.text
val fragmentText = if (imports.isBlank()) allText else allText.substringAfter(imports, allText) val fragmentText = if (imports.isBlank()) allText else allText.substringAfter(imports, allText)
val expressionList = addDebugExpressionIntoTmpFileForExtractFunction( val expressionList = ApplicationManager.getApplication().executeOnPooledThread(Callable<List<KtExpression>> {
myFile as KtFile, runReadAction {
KtExpressionCodeFragment(getProject(), "fragment.kt", fragmentText, imports, elementAt), addDebugExpressionIntoTmpFileForExtractFunction(
line) myFile as KtFile,
KtExpressionCodeFragment(getProject(), "fragment.kt", fragmentText, imports, elementAt),
line)
}
}).get()
KotlinTestUtils.assertEqualsToFile(File(path + ".after"), expressionList.first().containingFile.text) KotlinTestUtils.assertEqualsToFile(File(path + ".after"), expressionList.first().containingFile.text)
} }