From 741a681c524a8dab3ecd93a9ecf1fa4f209d2b4a Mon Sep 17 00:00:00 2001
From: "Maxim.Kolmakov" <maxim.kolmakov@jetbrains.com>
Date: Fri, 9 Jun 2017 18:02:34 +0200
Subject: [PATCH] [gui-test] Reuse invokeAction from GuiTestCase

---
 .../src/com/intellij/testGuiFramework/impl/GuiTestCase.kt   | 6 +-----
 .../com/intellij/testGuiFramework/tests/SimpleGitTest.java  | 6 +++---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCase.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCase.kt
index da6b0bf95da4..40a253395583 100644
--- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCase.kt
+++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCase.kt
@@ -112,10 +112,6 @@ open class GuiTestCase : GuiTestBase() {
     func(dialog(title, timeout))
   }
 
-  fun message(title: String? = null, timeout: Long = defaultTimeout, func: JDialogFixture.() -> Unit) {
-    func(dialog(title, timeout))
-  }
-
   fun simpleProject(func: IdeFrameFixture.() -> Unit) {
     func(importSimpleProject())
   }
@@ -227,7 +223,7 @@ open class GuiTestCase : GuiTestBase() {
 
   fun shortcut(keyStroke: String) = GuiTestUtil.invokeActionViaShortcut(myRobot, keyStroke)
 
-//  fun invokeAction(actionName: String) = GuiTestUtil.invokeAction(myRobot, actionName)
+  fun invokeAction(actionName: String) = GuiTestUtil.invokeAction(myRobot, actionName)
 
   fun screenshot(component: Component, screenshotName: String): Unit {
 
diff --git a/plugins/git4idea/tests/com/intellij/testGuiFramework/tests/SimpleGitTest.java b/plugins/git4idea/tests/com/intellij/testGuiFramework/tests/SimpleGitTest.java
index 8416ce716bbe..edb29d63964d 100644
--- a/plugins/git4idea/tests/com/intellij/testGuiFramework/tests/SimpleGitTest.java
+++ b/plugins/git4idea/tests/com/intellij/testGuiFramework/tests/SimpleGitTest.java
@@ -48,7 +48,7 @@ public class SimpleGitTest extends GitGuiTestCase {
     projectPane.selectByPath(projectName, "src");
 
     //invoke "New..." action
-    invokeAction(myRobot, "NewElement");
+    invokeAction("NewElement");
     //select first element (Java class)
     myRobot.pressAndReleaseKey(KeyEvent.VK_ENTER);
 
@@ -67,13 +67,13 @@ public class SimpleGitTest extends GitGuiTestCase {
           () -> currentFileFixture.getVcsStatus().equals(FileStatus.UNKNOWN),
           THIRTY_SEC_TIMEOUT);
 
-    invokeAction(myRobot, "ChangesView.AddUnversioned");
+    invokeAction("ChangesView.AddUnversioned");
 
     pause("Wait when file will be marked as added",
           () -> currentFileFixture.getVcsStatus().equals(FileStatus.ADDED),
           THIRTY_SEC_TIMEOUT);
 
-    invokeAction(myRobot, "CheckinProject");
+    invokeAction("CheckinProject");
 
     JDialogFixture commitJDialogFixture = JDialogFixture.find(myRobot, VcsBundle.message("commit.dialog.title"));
     myRobot.enterText("initial commit");