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

Build: fix API differences between 201 and 202 in idea performance tests

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-11-17 16:14:05 +03:00
parent 2a053c214d
commit 4779092ba5
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/gradleRoutines.kt
+3 -4
View File
@@ -12,16 +12,15 @@ import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
import com.intellij.openapi.externalSystem.util.ExternalSystemUtil import com.intellij.openapi.externalSystem.util.ExternalSystemUtil
import com.intellij.openapi.project.DumbService import com.intellij.openapi.project.DumbService
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.ProjectRootManager
import org.gradle.util.GradleVersion import org.gradle.util.GradleVersion
import org.jetbrains.plugins.gradle.service.project.open.setupGradleSettings import org.jetbrains.plugins.gradle.service.project.open.setupGradleProjectSettings
import org.jetbrains.plugins.gradle.settings.GradleProjectSettings import org.jetbrains.plugins.gradle.settings.GradleProjectSettings
import org.jetbrains.plugins.gradle.settings.GradleSettings import org.jetbrains.plugins.gradle.settings.GradleSettings
import org.jetbrains.plugins.gradle.util.GradleConstants import org.jetbrains.plugins.gradle.util.GradleConstants
import org.jetbrains.plugins.gradle.util.GradleLog import org.jetbrains.plugins.gradle.util.GradleLog
import org.jetbrains.plugins.gradle.util.suggestGradleVersion import org.jetbrains.plugins.gradle.util.suggestGradleVersion
import java.io.File import java.io.File
import kotlin.test.assertNotNull import java.nio.file.Paths
fun refreshGradleProject(projectPath: String, project: Project) { fun refreshGradleProject(projectPath: String, project: Project) {
_importProject(File(projectPath).absolutePath, project) _importProject(File(projectPath).absolutePath, project)
@@ -42,7 +41,7 @@ private fun _importProject(projectPath: String, project: Project) {
GradleSettings.getInstance(project).gradleVmOptions = GradleSettings.getInstance(project).gradleVmOptions =
"-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${System.getProperty("user.dir")}" "-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${System.getProperty("user.dir")}"
setupGradleSettings(project, gradleProjectSettings, projectPath, gradleVersion) gradleProjectSettings.setupGradleProjectSettings(Paths.get(projectPath))
gradleProjectSettings.gradleJvm = GRADLE_JDK_NAME gradleProjectSettings.gradleJvm = GRADLE_JDK_NAME
GradleSettings.getInstance(project).getLinkedProjectSettings(projectPath)?.let { linkedProjectSettings -> GradleSettings.getInstance(project).getLinkedProjectSettings(projectPath)?.let { linkedProjectSettings ->
idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/projectRoutines.kt
+2 -3
View File
@@ -21,7 +21,6 @@ import com.intellij.openapi.fileEditor.FileDocumentManager
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.project.ex.ProjectManagerEx import com.intellij.openapi.project.ex.ProjectManagerEx
import com.intellij.openapi.startup.StartupManager import com.intellij.openapi.startup.StartupManager
import com.intellij.platform.PlatformProjectOpenProcessor
import com.intellij.psi.PsiDocumentManager import com.intellij.psi.PsiDocumentManager
import com.intellij.psi.impl.PsiDocumentManagerBase import com.intellij.psi.impl.PsiDocumentManagerBase
import com.intellij.testFramework.ExtensionTestUtil import com.intellij.testFramework.ExtensionTestUtil
@@ -70,7 +69,7 @@ fun dispatchAllInvocationEvents() {
} }
fun loadProjectWithName(path: String, name: String): Project? = fun loadProjectWithName(path: String, name: String): Project? =
PlatformProjectOpenProcessor.openExistingProject(Paths.get(path), Paths.get(path), OpenProjectTask(projectName = name)) ProjectManagerEx.getInstanceEx().openProject(Paths.get(path), OpenProjectTask(projectName = name))
fun TestApplicationManager.closeProject(project: Project) { fun TestApplicationManager.closeProject(project: Project) {
val name = project.name val name = project.name
@@ -114,4 +113,4 @@ fun replaceWithCustomHighlighter(parentDisposable: Disposable, fromImplementatio
if (filteredExtensions.size < extensions.size) { if (filteredExtensions.size < extensions.size) {
ExtensionTestUtil.maskExtensions(pointName, filteredExtensions + listOf(point), parentDisposable) ExtensionTestUtil.maskExtensions(pointName, filteredExtensions + listOf(point), parentDisposable)
} }
} }