MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[gui-test] fix close project

Browse Source
This commit is contained in:
Sergey Karashevich
2018-08-20 17:17:53 +03:00
parent 514cd443e6
commit 808fde86e5
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testGuiFramework/src/com/intellij/testGuiFramework/fixtures/IdeFrameFixture.java
+1 -1
View File
@@ -371,7 +371,7 @@ public class IdeFrameFixture extends ComponentFixture<IdeFrameFixture, IdeFrameI
MouseEvent fakeMainMenuMouseEvent =
new MouseEvent(jMenuBar, MouseEvent.MOUSE_CLICKED, System.currentTimeMillis(), 0, MouseInfo.getPointerInfo().getLocation().x,
MouseInfo.getPointerInfo().getLocation().y, 1, false);
DumbService.getInstance(getProject()).runReadActionInSmartMode(() -> actionManager.tryToExecute(mainMenuAction, fakeMainMenuMouseEvent, null, ActionPlaces.MAIN_MENU, true));
DumbService.getInstance(getProject()).smartInvokeLater(() -> actionManager.tryToExecute(mainMenuAction, fakeMainMenuMouseEvent, null, ActionPlaces.MAIN_MENU, true));
}
/**
platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestRule.kt
+1 -5
View File
@@ -6,7 +6,6 @@ import com.intellij.ide.GeneralSettings
import com.intellij.ide.impl.ProjectUtil
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.TransactionGuard
import com.intellij.openapi.project.DumbService
import com.intellij.openapi.project.Project
import com.intellij.openapi.project.ProjectManager
import com.intellij.openapi.util.io.FileUtil
@@ -176,9 +175,8 @@ class GuiTestRule : TestRule {
private fun tearDownProject() {
if (myProjectPath != null) {
val ideFrameFixture = IdeFrameFixture.find(robot(), myProjectPath, null)
ideFrameFixture.waitForStartingIndexing()
if (ideFrameFixture.target().isShowing) {
DumbService.getInstance(ideFrameFixture.project).repeatUntilPassesInSmartMode { ideFrameFixture.closeProject() }
ideFrameFixture.closeProject()
}
FileUtilRt.delete(myProjectPath!!)
}
@@ -186,9 +184,7 @@ class GuiTestRule : TestRule {
try {
val ideFrameFixture = IdeFrameFixture.find(robot(), null, null, 2)
if (ideFrameFixture.target().isShowing)
DumbService.getInstance(ideFrameFixture.project).repeatUntilPassesInSmartMode {
ideFrameFixture.closeProject()
}
}
catch (e: ComponentLookupException) {
// do nothing because ideFixture is already closed