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] revert invokeAction intersection in SimpleGitTest; mute AddActionToolbarTest (cause it Mac dependent)

Browse Source
This commit is contained in:
Sergey Karashevich
2016-12-28 13:38:51 +03:00
parent dc77e568e1
commit 77d0c3f785
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCase.kt
+1 -1
View File
@@ -151,7 +151,7 @@ open class GuiTestCase : GuiTestBase() {
//*********COMMON FUNCTIONS WITHOUT CONTEXT
fun typeText(text: String) = GuiTestUtil.typeText(text, myRobot, 10)
fun invokeAction(keyStroke: String) = GuiTestUtil.invokeActionViaShortcut(myRobot, keyStroke)
fun shortcut(keyStroke: String) = GuiTestUtil.invokeActionViaShortcut(myRobot, keyStroke)
fun ideFrame() = findIdeFrame()!!
platform/testGuiFramework/testSrc/com/intellij/testGuiFramework/tests/SimpleGitTest.java
+3 -3
View File
@@ -48,7 +48,7 @@ public class SimpleGitTest extends GuiTestCase {
projectPane.selectByPath(projectName, "src");
//invoke "New..." action
invokeAction("NewElement");
invokeAction(myRobot, "NewElement");
//select first element (Java class)
myRobot.pressAndReleaseKey(KeyEvent.VK_ENTER);
@@ -66,13 +66,13 @@ public class SimpleGitTest extends GuiTestCase {
() -> currentFileFixture.getVcsStatus().equals(FileStatus.UNKNOWN),
THIRTY_SEC_TIMEOUT);
invokeAction("ChangesView.AddUnversioned");
invokeAction(myRobot, "ChangesView.AddUnversioned");
pause("Wait when file will be marked as added",
() -> currentFileFixture.getVcsStatus().equals(FileStatus.ADDED),
THIRTY_SEC_TIMEOUT);
invokeAction("CheckinProject");
invokeAction(myRobot, "CheckinProject");
JDialogFixture commitJDialogFixture = JDialogFixture.find(myRobot, VcsBundle.message("commit.dialog.title"));
myRobot.enterText("initial commit");
platform/testGuiFramework/testSrc/com/intellij/testGuiFramework/tests/samples/AddActionToolbarInKotlinTest.kt
+3 -2
View File
@@ -17,19 +17,20 @@ package com.intellij.testGuiFramework.tests.samples
import com.intellij.ide.ui.UISettings
import com.intellij.testGuiFramework.impl.GuiTestCase
import org.junit.Ignore
import org.junit.Test
class AddActionToolbarInKotlinTestTest : GuiTestCase() {
@Test
@Test @Ignore
@Throws(Exception::class)
fun testAddActionToolbar() {
simpleProject {
if (!UISettings.getInstance().SHOW_MAIN_TOOLBAR) invokeMenuPath("View", "Toolbar")
invokeAction(keyStroke = "meta comma")
shortcut(keyStroke = "meta comma")
dialog("Preferences") {
jTree("Appearance & Behavior").clickPath("Appearance & Behavior/Menus and Toolbars")