From 5e3daf315fcdb33281d7cbc587abb3089f688495 Mon Sep 17 00:00:00 2001 From: Sergey Karashevich Date: Tue, 30 Aug 2016 13:59:26 +0300 Subject: [PATCH] gui-tests-framework: GitGuiTest and scripting parts --- .../tests/gui/fixtures/IdeFrameFixture.java | 7 +- .../tests/gui/fixtures/LIstPopupFixture.java | 117 ++++++++++++++++++ .../gui/fixtures/MessageDialogFixture.java | 22 ++-- .../tests/gui/framework/GuiTestCase.java | 5 + .../tests/gui/framework/GuiTests.java | 10 +- .../gui/framework/IdeTestApplication.java | 1 + .../tests/gui/framework/ScriptingAPI.kt | 3 +- .../tests/gui/script/ScriptInterface.kt | 24 ---- .../tests/gui/script/ScriptRecorder.kt | 14 ++- .../com/intellij/tests/gui/test/GitGuiTest.kt | 82 ++++++++++++ .../com/intellij/tests/gui/test/GitTest.kt | 54 -------- .../gui/{ => test}/JavaEEProjectTest.java | 3 +- .../tests/gui/{ => test}/JavaProjectTest.kt | 11 +- .../tests/gui/{ => test}/NewProjectTest.java | 9 +- .../{ => test}/SimpleApplicationImportTest.kt | 2 +- 15 files changed, 259 insertions(+), 105 deletions(-) create mode 100644 community-tests/src/com/intellij/tests/gui/fixtures/LIstPopupFixture.java delete mode 100644 community-tests/src/com/intellij/tests/gui/script/ScriptInterface.kt create mode 100644 community-tests/src/com/intellij/tests/gui/test/GitGuiTest.kt delete mode 100644 community-tests/src/com/intellij/tests/gui/test/GitTest.kt rename community-tests/src/com/intellij/tests/gui/{ => test}/JavaEEProjectTest.java (97%) rename community-tests/src/com/intellij/tests/gui/{ => test}/JavaProjectTest.kt (89%) rename community-tests/src/com/intellij/tests/gui/{ => test}/NewProjectTest.java (91%) rename community-tests/src/com/intellij/tests/gui/{ => test}/SimpleApplicationImportTest.kt (96%) diff --git a/community-tests/src/com/intellij/tests/gui/fixtures/IdeFrameFixture.java b/community-tests/src/com/intellij/tests/gui/fixtures/IdeFrameFixture.java index edaa5e18d9f5..0e4551c65500 100644 --- a/community-tests/src/com/intellij/tests/gui/fixtures/IdeFrameFixture.java +++ b/community-tests/src/com/intellij/tests/gui/fixtures/IdeFrameFixture.java @@ -86,11 +86,12 @@ public class IdeFrameFixture extends ComponentFixture matcher = new GenericTypeMatcher(IdeFrameImpl.class) { @Override protected boolean isMatching(@NotNull IdeFrameImpl frame) { Project project = frame.getProject(); + if (projectPath == null && project != null) return true; if (project != null && toSystemIndependentName(projectPath.getPath()).equals(project.getBasePath())) { return projectName == null || projectName.equals(project.getName()); } @@ -98,7 +99,7 @@ public class IdeFrameFixture extends ComponentFixture frames = robot.finder().findAll(matcher); @@ -107,7 +108,7 @@ public class IdeFrameFixture extends ComponentFixture { + + private static final Logger LOG = Logger.getInstance("#com.intellij.tests.gui.fixtures.ListPopupFixture"); + + private JBList myJBList; + private Robot myRobot; + + private ListPopupFixture(JBList jbList, Robot robot) { + super(ListPopupFixture.class, robot, jbList); + + myJBList = jbList; + myRobot = robot; + } + + public static ListPopupFixture findListPopup(Robot robot) { + + pause(new Condition("Find list popup") { + @Override + public boolean test() { + final JBList jblist = getList(robot); + return jblist != null; + } + }, SHORT_TIMEOUT); + + final JBList jblist = getList(robot); + Assert.assertNotNull(jblist); + + return new ListPopupFixture(jblist, robot); + } + + private static JBList getList(Robot robot) { + return robot.finder().find(new GenericTypeMatcher(JBList.class) { + @Override + protected boolean isMatching(@Nonnull JBList list) { + Container parent = list.getRootPane().getParent(); + if (parent == null) return false; + if (parent instanceof JWindow && ((JWindow)parent).getType() == Window.Type.POPUP) { + return true; + } + return false; + } + }); + } + + public void assertContainsAction(String actionName) { + boolean assertion = false; + ListModel listModel = myJBList.getModel(); + for (int i = 0; i < myJBList.getItemsCount(); i++) { + Object elementAt = listModel.getElementAt(i); + if (elementAt instanceof PopupFactoryImpl.ActionItem) { + if (((PopupFactoryImpl.ActionItem)elementAt).getText().toLowerCase().contains(actionName.toLowerCase())) assertion = true; + } + } + + if (!assertion) LOG.error("Unable to find action \"" + actionName + "\" in popupList"); + assert assertion; + } + + public void invokeAction(String actionName) { + int actionIndex = -1; + ListModel listModel = myJBList.getModel(); + for (int i = 0; i < myJBList.getItemsCount(); i++) { + Object elementAt = listModel.getElementAt(i); + if (elementAt instanceof PopupFactoryImpl.ActionItem) { + if (((PopupFactoryImpl.ActionItem)elementAt).getText().toLowerCase().contains(actionName.toLowerCase())) actionIndex = i; + } + } + + if (actionIndex == -1) { + LOG.error("Unable to find action \"" + actionName + "\" in popupMenu"); + } else { + final Rectangle cellBounds = myJBList.getCellBounds(actionIndex, actionIndex); + + final Point locationOnScreen = myJBList.getLocationOnScreen(); + final Point point = + new Point(locationOnScreen.x + cellBounds.x + cellBounds.width / 2, + locationOnScreen.y + cellBounds.y + cellBounds.height / 2); + robot().click(point, MouseButton.LEFT_BUTTON, 1); + } + } +} diff --git a/community-tests/src/com/intellij/tests/gui/fixtures/MessageDialogFixture.java b/community-tests/src/com/intellij/tests/gui/fixtures/MessageDialogFixture.java index 556fdf449ba6..a69294bff09e 100644 --- a/community-tests/src/com/intellij/tests/gui/fixtures/MessageDialogFixture.java +++ b/community-tests/src/com/intellij/tests/gui/fixtures/MessageDialogFixture.java @@ -36,19 +36,19 @@ class MessageDialogFixture extends IdeaDialogFixture implements M JDialog dialog = waitUntilFound(robot, new GenericTypeMatcher(JDialog.class) { @Override protected boolean isMatching(@NotNull JDialog dialog) { - if (!title.equals(dialog.getTitle()) || !dialog.isShowing()) { + if (!title.equals(dialog.getTitle()) || !dialog.isShowing()) { + return false; + } + DialogWrapper wrapper = getDialogWrapperFrom(dialog, DialogWrapper.class); + if (wrapper != null) { + String typeName = Messages.class.getName() + "$MessageDialog"; + if (typeName.equals(wrapper.getClass().getName())) { + wrapperRef.set(wrapper); + return true; + } + } return false; } - DialogWrapper wrapper = getDialogWrapperFrom(dialog, DialogWrapper.class); - if (wrapper != null) { - String typeName = Messages.class.getName() + "$MessageDialog"; - if (typeName.equals(wrapper.getClass().getName())) { - wrapperRef.set(wrapper); - return true; - } - } - return false; - } }); return new MessageDialogFixture(robot, dialog, wrapperRef.get()); } diff --git a/community-tests/src/com/intellij/tests/gui/framework/GuiTestCase.java b/community-tests/src/com/intellij/tests/gui/framework/GuiTestCase.java index 94f936d0075a..25f89ff6996e 100644 --- a/community-tests/src/com/intellij/tests/gui/framework/GuiTestCase.java +++ b/community-tests/src/com/intellij/tests/gui/framework/GuiTestCase.java @@ -387,6 +387,11 @@ public abstract class GuiTestCase { return IdeFrameFixture.find(myRobot, projectPath, null); } + + protected IdeFrameFixture findIdeFrame(){ + return IdeFrameFixture.find(myRobot, null, null); + } + protected void refreshFiles() { execute(new GuiTask() { @Override diff --git a/community-tests/src/com/intellij/tests/gui/framework/GuiTests.java b/community-tests/src/com/intellij/tests/gui/framework/GuiTests.java index b5ee7c75f877..3661c497f2fb 100644 --- a/community-tests/src/com/intellij/tests/gui/framework/GuiTests.java +++ b/community-tests/src/com/intellij/tests/gui/framework/GuiTests.java @@ -50,6 +50,7 @@ import org.fest.swing.exception.WaitTimedOutError; import org.fest.swing.fixture.ContainerFixture; import org.fest.swing.fixture.DialogFixture; import org.fest.swing.fixture.JListFixture; +import org.fest.swing.fixture.JTextComponentFixture; import org.fest.swing.timing.Condition; import org.fest.swing.timing.Pause; import org.fest.swing.timing.Timeout; @@ -61,6 +62,7 @@ import org.jetbrains.annotations.Nullable; import javax.annotation.Nonnull; import javax.swing.*; +import javax.swing.text.JTextComponent; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -612,7 +614,7 @@ public final class GuiTests { Collection labels = robot.finder().findAll(container, new GenericTypeMatcher(JLabel.class) { @Override protected boolean isMatching(@Nonnull JLabel label) { - return label.getLabelFor().equals(textField); + return (label.getLabelFor() != null && label.getLabelFor().equals(textField)); } }); if (labels != null && !labels.isEmpty()) return labels.iterator().next(); @@ -752,5 +754,11 @@ public final class GuiTests { return jdkBundle.getLocation().getAbsolutePath() + homeSubPath; } + @NotNull + public static JTextComponentFixture findTextField(@NotNull Robot robot, @NotNull final String labelText) { + return new JTextComponentFixture(robot, robot.finder().findByLabel(labelText, JTextComponent.class)); + } + + } diff --git a/community-tests/src/com/intellij/tests/gui/framework/IdeTestApplication.java b/community-tests/src/com/intellij/tests/gui/framework/IdeTestApplication.java index 396618646eeb..daff795dd207 100644 --- a/community-tests/src/com/intellij/tests/gui/framework/IdeTestApplication.java +++ b/community-tests/src/com/intellij/tests/gui/framework/IdeTestApplication.java @@ -28,6 +28,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.PathManager; import com.intellij.openapi.application.impl.ApplicationImpl; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.util.registry.Registry; import com.intellij.util.SystemProperties; import com.intellij.util.lang.UrlClassLoader; import com.intellij.util.text.StringTokenizer; diff --git a/community-tests/src/com/intellij/tests/gui/framework/ScriptingAPI.kt b/community-tests/src/com/intellij/tests/gui/framework/ScriptingAPI.kt index 292c099cc8b7..77617837f138 100644 --- a/community-tests/src/com/intellij/tests/gui/framework/ScriptingAPI.kt +++ b/community-tests/src/com/intellij/tests/gui/framework/ScriptingAPI.kt @@ -1,6 +1,5 @@ package com.intellij.tests.gui.framework -import com.intellij.openapi.ui.JBPopupMenu import com.intellij.tests.gui.fixtures.WelcomeFrameFixture import com.intellij.ui.components.JBList import org.fest.swing.core.Robot @@ -11,6 +10,8 @@ import java.awt.Container /** We presume that IDEA is already started, shows "Welcome dialog" and we could create a new project + + !!UNFINISHED!! **/ diff --git a/community-tests/src/com/intellij/tests/gui/script/ScriptInterface.kt b/community-tests/src/com/intellij/tests/gui/script/ScriptInterface.kt deleted file mode 100644 index 9168419dc709..000000000000 --- a/community-tests/src/com/intellij/tests/gui/script/ScriptInterface.kt +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.tests.gui.script - -/** - * Created by jetbrains on 15/08/16. - */ - -interface ScriptInterface{ - fun script() -} \ No newline at end of file diff --git a/community-tests/src/com/intellij/tests/gui/script/ScriptRecorder.kt b/community-tests/src/com/intellij/tests/gui/script/ScriptRecorder.kt index dd9fc9eb4a33..c57807e2d10b 100644 --- a/community-tests/src/com/intellij/tests/gui/script/ScriptRecorder.kt +++ b/community-tests/src/com/intellij/tests/gui/script/ScriptRecorder.kt @@ -17,7 +17,11 @@ package com.intellij.tests.gui.script import com.intellij.internal.inspector.UiDropperActionExtension import com.intellij.openapi.actionSystem.AnAction +import com.intellij.tests.gui.framework.GuiTests +import org.fest.swing.core.BasicRobot +import org.fest.swing.core.Robot import java.awt.Component +import java.awt.Container import javax.swing.* /** @@ -59,7 +63,11 @@ class ScriptRecorder() : AnAction(), UiDropperActionExtension { is JButton -> write(Templates.findAndClickButton(cmp.text)) is com.intellij.ui.components.labels.ActionLink -> write(Templates.clickActionLink(cmp.text)) is JTextField -> { - write(Templates.findJTextField()) + val label = getLabel(currentContextComponent as Container, cmp) + if (label == null) + write(Templates.findJTextField()) + else + write(Templates.findJTextFieldByLabel(label.text)) } is com.intellij.ui.components.JBList -> { val itemName = e.dataContext.getData("ItemName") as String @@ -72,6 +80,10 @@ class ScriptRecorder() : AnAction(), UiDropperActionExtension { } private fun isPopupList(cmp: Component) = cmp.javaClass.name.toLowerCase().contains("listpopup") + private fun getLabel(container: Container, jTextField: JTextField): JLabel? { + val robot = BasicRobot.robotWithCurrentAwtHierarchyWithoutScreenLock() + return GuiTests.findBoundedLabel(container, jTextField, robot) + } fun checkContext(cmp: Component) { cmp as JComponent diff --git a/community-tests/src/com/intellij/tests/gui/test/GitGuiTest.kt b/community-tests/src/com/intellij/tests/gui/test/GitGuiTest.kt new file mode 100644 index 000000000000..d24040ad0416 --- /dev/null +++ b/community-tests/src/com/intellij/tests/gui/test/GitGuiTest.kt @@ -0,0 +1,82 @@ +/* + * Copyright 2000-2016 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.tests.gui.test + +import com.intellij.dvcs.ui.CloneDvcsDialog +import com.intellij.dvcs.ui.DvcsBundle +import com.intellij.openapi.project.DumbService +import com.intellij.openapi.vcs.VcsBundle +import com.intellij.tests.gui.BelongsToTestGroups +import com.intellij.tests.gui.fixtures.* +import com.intellij.tests.gui.framework.GuiTestCase +import com.intellij.tests.gui.framework.GuiTests +import com.intellij.tests.gui.framework.TestGroup +import com.intellij.ui.EditorComboBox +import org.fest.swing.edt.GuiActionRunner +import org.fest.swing.edt.GuiTask +import org.fest.swing.fixture.DialogFixture +import org.fest.swing.fixture.JTextComponentFixture +import org.junit.Test +import javax.swing.text.JTextComponent + +/** + * Created by karashevich on 18/06/16. + */ +@BelongsToTestGroups(TestGroup.PROJECT) +class GitGuiTest : GuiTestCase() { + + @Test + fun testGitImport(){ + val vcsName = "Git" + val gitPath = "https://github.com/karashevich/test.git" + + val welcomeFrame = WelcomeFrameFixture.find(myRobot) + welcomeFrame.checkoutFrom() + ListPopupFixture.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) { + val labelText = DvcsBundle.message("clone.repository.url", vcsName) + val editorComboBox = myRobot.finder().findByLabel(this.target(), labelText, EditorComboBox::class.java) + GuiActionRunner.execute(object : GuiTask() { + @Throws(Throwable::class) + override fun executeInEDT() { + editorComboBox.text = gitPath + } + }) + GuiTests.findAndClickButton(this, DvcsBundle.getString("clone.button")) + } + MessagesFixture.findByTitle(myRobot, welcomeFrame.target(), VcsBundle.message("checkout.title")).clickYes() + val dialog1 = com.intellij.tests.gui.fixtures.DialogFixture.find(myRobot, "Import Project") + with (dialog1) { + GuiTests.findAndClickButton(this, "Next") + val textField = GuiTests.findTextField(myRobot, "Project name:").click() + GuiTests.findAndClickButton(this, "Next") + GuiTests.findAndClickButton(this, "Next") + GuiTests.findAndClickButton(this, "Finish") + } + val ideFrame = findIdeFrame() + val projectView = ideFrame.projectView + val paneFixture = projectView.selectProjectPane() + + ToolWindowFixture.showToolwindowStripes(myRobot) + + //prevent from ProjectLeak (if the project is closed during the indexing + DumbService.getInstance(ideFrame.project).waitForSmartMode() + + } +} + diff --git a/community-tests/src/com/intellij/tests/gui/test/GitTest.kt b/community-tests/src/com/intellij/tests/gui/test/GitTest.kt deleted file mode 100644 index 578f68466d1c..000000000000 --- a/community-tests/src/com/intellij/tests/gui/test/GitTest.kt +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.tests.gui.test - -import com.intellij.dvcs.ui.CloneDvcsDialog -import com.intellij.dvcs.ui.DvcsBundle -import com.intellij.tests.gui.BelongsToTestGroups -import com.intellij.tests.gui.fixtures.IdeaDialogFixture -import com.intellij.tests.gui.fixtures.JBPopupFixture -import com.intellij.tests.gui.fixtures.WelcomeFrameFixture -import com.intellij.tests.gui.framework.GuiTestCase -import com.intellij.tests.gui.framework.GuiTests -import com.intellij.tests.gui.framework.TestGroup -import org.fest.swing.fixture.DialogFixture -import org.fest.swing.fixture.JTextComponentFixture -import org.junit.Test -import javax.swing.text.JTextComponent - -/** - * Created by karashevich on 18/06/16. - */ -@BelongsToTestGroups(TestGroup.PROJECT) -class GitTest : GuiTestCase() { - - @Test - fun testGitImport(){ - val vcsName = "Git" - val gitPath = "https://github.com/karashevich/test.git" - - WelcomeFrameFixture.find(myRobot).checkoutFrom() - JBPopupFixture.findContextMenu(myRobot).invokeAction(vcsName) - - val cloneVcsDialog = DialogFixture(IdeaDialogFixture.find(myRobot, CloneDvcsDialog::class.java).dialog) - val labelText = DvcsBundle.message("clone.repository.url", vcsName) - val urlTextField = JTextComponentFixture(myRobot, myRobot.finder().findByLabel(labelText, JTextComponent::class.java)) - urlTextField.setText(gitPath) - GuiTests.findAndClickButton(cloneVcsDialog, DvcsBundle.getString("clone.button")) - - } -} - diff --git a/community-tests/src/com/intellij/tests/gui/JavaEEProjectTest.java b/community-tests/src/com/intellij/tests/gui/test/JavaEEProjectTest.java similarity index 97% rename from community-tests/src/com/intellij/tests/gui/JavaEEProjectTest.java rename to community-tests/src/com/intellij/tests/gui/test/JavaEEProjectTest.java index 9e7df1f9ddf0..03a1a0729a27 100644 --- a/community-tests/src/com/intellij/tests/gui/JavaEEProjectTest.java +++ b/community-tests/src/com/intellij/tests/gui/test/JavaEEProjectTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.tests.gui; +package com.intellij.tests.gui.test; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.progress.ProgressManager; @@ -21,6 +21,7 @@ import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectBundle; import com.intellij.openapi.project.ProjectUtil; +import com.intellij.tests.gui.BelongsToTestGroups; import com.intellij.tests.gui.fixtures.ActionLinkFixture; import com.intellij.tests.gui.fixtures.ProjectViewFixture; import com.intellij.tests.gui.fixtures.ToolWindowFixture; diff --git a/community-tests/src/com/intellij/tests/gui/JavaProjectTest.kt b/community-tests/src/com/intellij/tests/gui/test/JavaProjectTest.kt similarity index 89% rename from community-tests/src/com/intellij/tests/gui/JavaProjectTest.kt rename to community-tests/src/com/intellij/tests/gui/test/JavaProjectTest.kt index f3a23d3f5b80..67f29036c932 100644 --- a/community-tests/src/com/intellij/tests/gui/JavaProjectTest.kt +++ b/community-tests/src/com/intellij/tests/gui/test/JavaProjectTest.kt @@ -13,18 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.tests.gui +package com.intellij.tests.gui.test -import com.intellij.tests.gui.fixtures.ActionLinkFixture +import com.intellij.tests.gui.BelongsToTestGroups import com.intellij.tests.gui.fixtures.DialogFixtures.CreateDialogFixture import com.intellij.tests.gui.fixtures.EditorFixture import com.intellij.tests.gui.fixtures.JBPopupFixture -import com.intellij.tests.gui.framework.* -import com.intellij.ui.components.JBList +import com.intellij.tests.gui.framework.GuiTestCase +import com.intellij.tests.gui.framework.TestGroup +import com.intellij.tests.gui.framework.clickListItem +import com.intellij.tests.gui.framework.createNewProject import org.junit.Ignore import org.junit.Test import java.io.File -import javax.swing.JTextField import javax.swing.text.JTextComponent /** diff --git a/community-tests/src/com/intellij/tests/gui/NewProjectTest.java b/community-tests/src/com/intellij/tests/gui/test/NewProjectTest.java similarity index 91% rename from community-tests/src/com/intellij/tests/gui/NewProjectTest.java rename to community-tests/src/com/intellij/tests/gui/test/NewProjectTest.java index 3a69b7db36f9..029c03d59127 100644 --- a/community-tests/src/com/intellij/tests/gui/NewProjectTest.java +++ b/community-tests/src/com/intellij/tests/gui/test/NewProjectTest.java @@ -13,13 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.tests.gui; +package com.intellij.tests.gui.test; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.project.ProjectBundle; +import com.intellij.tests.gui.BelongsToTestGroups; import com.intellij.tests.gui.fixtures.ProjectViewFixture; import com.intellij.tests.gui.fixtures.newProjectWizard.NewProjectWizardFixture; -import com.intellij.tests.gui.framework.*; +import com.intellij.tests.gui.framework.GuiTestCase; +import com.intellij.tests.gui.framework.GuiTests; +import com.intellij.tests.gui.framework.IdeGuiTest; +import com.intellij.tests.gui.framework.TestGroup; import org.junit.Ignore; import org.junit.Test; @@ -49,7 +53,6 @@ public class NewProjectTest extends GuiTestCase { Date date = new Date(); String projectName = "smoke-test-project-" + dateFormat.format(date); - findWelcomeFrame().createNewProject(); NewProjectWizardFixture newProjectWizard = findNewProjectWizard(); diff --git a/community-tests/src/com/intellij/tests/gui/SimpleApplicationImportTest.kt b/community-tests/src/com/intellij/tests/gui/test/SimpleApplicationImportTest.kt similarity index 96% rename from community-tests/src/com/intellij/tests/gui/SimpleApplicationImportTest.kt rename to community-tests/src/com/intellij/tests/gui/test/SimpleApplicationImportTest.kt index 599ad2ac2a6c..056c1792fefc 100644 --- a/community-tests/src/com/intellij/tests/gui/SimpleApplicationImportTest.kt +++ b/community-tests/src/com/intellij/tests/gui/test/SimpleApplicationImportTest.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.tests.gui +package com.intellij.tests.gui.test import com.intellij.tests.gui.BelongsToTestGroups import com.intellij.tests.gui.framework.GuiTestCase