Author: rhopp Date: 2012-04-27 06:39:14 -0400 (Fri, 27 Apr 2012) New Revision: 40560 Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java Log: Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml =================================================================== --- trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml 2012-04-27 10:36:31 UTC (rev 40559) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml 2012-04-27 10:39:14 UTC (rev 40560) @@ -44,11 +44,11 @@ <artifactId>org.jboss.tools.central.feature.feature.group</artifactId> <version>0.0.0</version> </dependency> - <dependency> + <!--<dependency> <type>p2-installable-unit</type> <artifactId>org.jboss.tools.central.discovery.feature.feature.group</artifactId> <version>0.0.0</version> - </dependency> + </dependency>--> <dependency> <type>p2-installable-unit</type> <artifactId>org.jboss.tools.community.project.examples.feature.feature.group</artifactId> Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java =================================================================== --- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-04-27 10:36:31 UTC (rev 40559) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-04-27 10:39:14 UTC (rev 40560) @@ -12,6 +12,7 @@ import org.jboss.tools.ui.bot.ext.condition.NonSystemJobRunsCondition; import org.jboss.tools.ui.bot.ext.config.Annotations.Require; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; +import org.jboss.tools.ui.bot.ext.gen.ActionItem.Preference; import org.jboss.tools.ui.bot.ext.parts.SWTBotTwistie; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.ui.bot.ext.wizards.SWTBotWizard; @@ -24,6 +25,11 @@ @BeforeClass public static void setup(){ + bot.menu("Window").menu("Preferences").click(); + bot.waitForShell("Preferences"); + bot.tree().getTreeItem("Maven").select(); + bot.checkBox("Download repository index updates on startup").deselect(); + bot.clickButton("OK"); bot.menu("Help").menu(IDELabel.JBossCentralEditor.JBOSS_CENTRAL).click(); util.waitForAll(); } @@ -48,13 +54,16 @@ bot.activeShell().close(); //Openshift app log.info(bot.activeShell().getText()); - bot.hyperlink(IDELabel.JBossCentralEditor.OPENSHIFT_APP).click(); + + //TODO will put back when IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD will be correct + /*bot.hyperlink(IDELabel.JBossCentralEditor.OPENSHIFT_APP).click(); bot.waitForShell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD); bot.waitWhile(new NonSystemJobRunsCondition()); - assertTrue("New OpenShift Application window should have appeared", bot.activeShell().getText().equals(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD)); - //assertTrue("New OpenShift Application window should have appeared", bot.shell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD).isActive()); - bot.activeShell().close(); + assertTrue("New OpenShift Express Application window should have appeared", bot.activeShell().getText().equals(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD)); + //assertTrue("New OpenShift Express Application window should have appeared", bot.shell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD).isActive()); + bot.activeShell().close();*/ + //check Project example and detection of server // formsBot.formTextWithText(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click(); // //bot.hyperlink(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click(); @@ -123,6 +132,8 @@ bot.waitForShell("New"); assertTrue("Shell \"New\" should have appeared", bot.shell("New").isActive()); bot.activeShell().close(); + canBeDeployedTest(); + projectExplorer.deleteAllProjects(); } @Test @@ -140,13 +151,15 @@ checkExample(formsBot, "Login", true, "login.xml"); //Login example ma nejaky divny login.xml cheatsheet checkExample(formsBot, "Kitchensink", true); checkExample(formsBot, "HTML5", true); + canBeDeployedTest(); + projectExplorer.deleteAllProjects(); } /** * Tries to deploy all projects */ - @Test + //@Test public void canBeDeployedTest(){ servers.show(); String serverName = bot.tree().getAllItems()[0].getText().substring(0, bot.tree().getAllItems()[0].getText().indexOf(' '));