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

Revert due to massive flaky tests

Browse Source
This commit is contained in:
Sergey Rostov
2020-05-12 23:01:01 +03:00
parent 5228da2ebc
commit 4daac14008
68 changed files with 1572 additions and 2289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationLoadingTest.kt
+3 -4
View File
@@ -13,7 +13,6 @@ import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.PsiDocumentManager
import com.intellij.psi.PsiFile
import org.jetbrains.kotlin.idea.core.script.*
import org.jetbrains.kotlin.idea.core.script.configuration.CompositeScriptConfigurationManager
import org.jetbrains.kotlin.idea.core.script.configuration.DefaultScriptConfigurationManagerExtensions
import org.jetbrains.kotlin.idea.core.script.configuration.loader.FileContentsDependentConfigurationLoader
import org.jetbrains.kotlin.idea.core.script.configuration.testingBackgroundExecutor
@@ -22,7 +21,7 @@ import org.jetbrains.kotlin.idea.util.application.runWriteAction
import org.jetbrains.kotlin.psi.KtFile
abstract class AbstractScriptConfigurationLoadingTest : AbstractScriptConfigurationTest() {
lateinit var scriptConfigurationManager: CompositeScriptConfigurationManager
lateinit var scriptConfigurationManager: ScriptConfigurationManager
companion object {
private var occurredLoadings = 0
@@ -42,7 +41,7 @@ abstract class AbstractScriptConfigurationLoadingTest : AbstractScriptConfigurat
testScriptConfigurationNotification = true
ApplicationManager.getApplication().isScriptChangesNotifierDisabled = false
scriptConfigurationManager = ServiceManager.getService(project, ScriptConfigurationManager::class.java) as CompositeScriptConfigurationManager
scriptConfigurationManager = ServiceManager.getService(project, ScriptConfigurationManager::class.java)
}
override fun tearDown() {
@@ -104,7 +103,7 @@ abstract class AbstractScriptConfigurationLoadingTest : AbstractScriptConfigurat
protected fun makeChanges(contents: String, file: KtFile = myFile as KtFile) {
changeContents(contents)
scriptConfigurationManager.default.ensureUpToDatedConfigurationSuggested(file)
scriptConfigurationManager.updater.ensureUpToDatedConfigurationSuggested(file)
}
protected fun changeContents(contents: String, file: PsiFile = myFile) {
idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
+1 -4
View File
@@ -226,10 +226,7 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() {
}
runWriteAction {
val jdk = PluginTestCaseBase.jdk(jdkKind)
val projectJdkTable = getProjectJdkTableSafe()
if (jdk !in projectJdkTable.allJdks) {
projectJdkTable.addJdk(jdk, testRootDisposable)
}
getProjectJdkTableSafe().addJdk(jdk, testRootDisposable)
env["javaHome"] = File(jdk.homePath)
}
idea/tests/org/jetbrains/kotlin/idea/script/ScriptConfigurationLoadingTest.kt
+4 -4
View File
@@ -6,10 +6,10 @@
package org.jetbrains.kotlin.idea.script
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners
import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner
import org.junit.runner.RunWith
@RunWith(JUnit3RunnerWithInners::class)
@RunWith(JUnit3WithIdeaConfigurationRunner::class)
class ScriptConfigurationLoadingTest : AbstractScriptConfigurationLoadingTest() {
fun testSimple() {
assertAndLoadInitialConfiguration()
@@ -163,10 +163,10 @@ class ScriptConfigurationLoadingTest : AbstractScriptConfigurationLoadingTest()
fun testLoadingForUsagesSearch() {
assertAndLoadInitialConfiguration()
assertTrue(scriptConfigurationManager.default.ensureLoadedFromCache(listOf(myFile as KtFile)))
assertTrue(scriptConfigurationManager.updater.ensureConfigurationUpToDate(listOf(myFile as KtFile)))
changeContents("A")
assertTrue(scriptConfigurationManager.default.ensureLoadedFromCache(listOf(myFile as KtFile)))
assertFalse(scriptConfigurationManager.updater.ensureConfigurationUpToDate(listOf(myFile as KtFile)))
}
fun testReportsOnAutoApply() {