From 6370197adbbf25d3fa7ceecc7785afa649f82441 Mon Sep 17 00:00:00 2001
From: Sergey Karashevich <sergey.karashevich@jetbrains.com>
Date: Thu, 1 Sep 2016 13:09:44 +0300
Subject: [PATCH] gui-tests-framework: rename ListPopupFixture to
 JBListPopupFixture

---
 .../DialogFixtures/CreateDialogFixture.java        |  1 -
 ...stPopupFixture.java => JBListPopupFixture.java} | 14 +++++++-------
 .../src/com/intellij/tests/gui/test/GitGuiTest.kt  |  2 +-
 .../intellij/tests/gui/test/JavaEEProjectTest.java |  8 ++++----
 4 files changed, 12 insertions(+), 13 deletions(-)
 rename community-tests/src/com/intellij/tests/gui/fixtures/{LIstPopupFixture.java => JBListPopupFixture.java} (89%)

diff --git a/community-tests/src/com/intellij/tests/gui/fixtures/DialogFixtures/CreateDialogFixture.java b/community-tests/src/com/intellij/tests/gui/fixtures/DialogFixtures/CreateDialogFixture.java
index 9445d14d21c4..2041480a7350 100644
--- a/community-tests/src/com/intellij/tests/gui/fixtures/DialogFixtures/CreateDialogFixture.java
+++ b/community-tests/src/com/intellij/tests/gui/fixtures/DialogFixtures/CreateDialogFixture.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.tests.gui.fixtures.DialogFixtures;
 
-import com.intellij.find.impl.FindDialog;
 import com.intellij.ide.actions.CreateFileFromTemplateDialog;
 import com.intellij.tests.gui.fixtures.IdeaDialogFixture;
 import com.intellij.tests.gui.framework.GuiTests;
diff --git a/community-tests/src/com/intellij/tests/gui/fixtures/LIstPopupFixture.java b/community-tests/src/com/intellij/tests/gui/fixtures/JBListPopupFixture.java
similarity index 89%
rename from community-tests/src/com/intellij/tests/gui/fixtures/LIstPopupFixture.java
rename to community-tests/src/com/intellij/tests/gui/fixtures/JBListPopupFixture.java
index 6410ec90f5b3..3f5500f372d5 100644
--- a/community-tests/src/com/intellij/tests/gui/fixtures/LIstPopupFixture.java
+++ b/community-tests/src/com/intellij/tests/gui/fixtures/JBListPopupFixture.java
@@ -34,23 +34,23 @@ import static org.fest.swing.timing.Pause.pause;
 /**
  * Created by jetbrains on 29/08/16.
  */
-public class ListPopupFixture extends JComponentFixture<ListPopupFixture, JBList> {
+public class JBListPopupFixture extends JComponentFixture<JBListPopupFixture, JBList> {
 
-  private static final Logger LOG = Logger.getInstance("#com.intellij.tests.gui.fixtures.ListPopupFixture");
+  private static final Logger LOG = Logger.getInstance("#com.intellij.tests.gui.fixtures.JBListPopupFixture");
 
   private JBList myJBList;
   private Robot myRobot;
 
-  private ListPopupFixture(JBList jbList, Robot robot) {
-    super(ListPopupFixture.class, robot, jbList);
+  private JBListPopupFixture(JBList jbList, Robot robot) {
+    super(JBListPopupFixture.class, robot, jbList);
 
     myJBList = jbList;
     myRobot = robot;
   }
 
-  public static ListPopupFixture findListPopup(Robot robot) {
+  public static JBListPopupFixture findListPopup(Robot robot) {
 
-    pause(new Condition("Find list popup") {
+    pause(new Condition("Find JBList popup") {
       @Override
       public boolean test() {
         final JBList jblist = getList(robot);
@@ -61,7 +61,7 @@ public class ListPopupFixture extends JComponentFixture<ListPopupFixture, JBList
     final JBList jblist = getList(robot);
     Assert.assertNotNull(jblist);
 
-    return new ListPopupFixture(jblist, robot);
+    return new JBListPopupFixture(jblist, robot);
   }
 
   private static JBList getList(Robot robot) {
diff --git a/community-tests/src/com/intellij/tests/gui/test/GitGuiTest.kt b/community-tests/src/com/intellij/tests/gui/test/GitGuiTest.kt
index 8dd548745cae..8d6c0ac58af4 100644
--- a/community-tests/src/com/intellij/tests/gui/test/GitGuiTest.kt
+++ b/community-tests/src/com/intellij/tests/gui/test/GitGuiTest.kt
@@ -43,7 +43,7 @@ class GitGuiTest : GuiTestCase() {
 
     val welcomeFrame = WelcomeFrameFixture.find(myRobot)
     welcomeFrame.checkoutFrom()
-    ListPopupFixture.findListPopup(myRobot).invokeAction(vcsName)
+    JBListPopupFixture.findListPopup(myRobot).invokeAction(vcsName)
 
     val cloneVcsDialog = DialogFixture(myRobot, IdeaDialogFixture.find(myRobot, CloneDvcsDialog::class.java).dialog) //don't miss robot as the first argument or you'll stuck with a deadlock
     with(cloneVcsDialog) {
diff --git a/community-tests/src/com/intellij/tests/gui/test/JavaEEProjectTest.java b/community-tests/src/com/intellij/tests/gui/test/JavaEEProjectTest.java
index 03a1a0729a27..344648bced5f 100644
--- a/community-tests/src/com/intellij/tests/gui/test/JavaEEProjectTest.java
+++ b/community-tests/src/com/intellij/tests/gui/test/JavaEEProjectTest.java
@@ -66,11 +66,11 @@ public class JavaEEProjectTest extends GuiTestCase {
     //select project type and framework
     newProjectWizard.
       selectProjectType("Java").
-      selectFramework("JavaEE Persistence");
+      selectFramework("JavaEE Persistence").
+      clickNext().
+      setProjectName(projectName).
+      clickFinish();
 
-    newProjectWizard.clickNext();
-
-    newProjectWizard.setProjectName(projectName);
     final File locationInFileSystem = newProjectWizard.getLocationInFileSystem();
     newProjectWizard.clickFinish();