Author: rhopp Date: 2012-04-25 04:59:47 -0400 (Wed, 25 Apr 2012) New Revision: 40473 Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml trunk/central/tests/org.jboss.tools.central.test.ui.bot/requirements.properties 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-25 08:41:41 UTC (rev 40472) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml 2012-04-25 08:59:47 UTC (rev 40473) @@ -13,11 +13,21 @@ <packaging>eclipse-test-plugin</packaging> <properties> - <jbosstools.test.jbossas.home>${requirement.build.root}/jboss-as-web-7.0.2.Final</jbosstools.test.jbossas.home> + <additionalSystemProperties></additionalSystemProperties> + <jbosstools.test.jbossas.home>${requirement.build.root}/jboss-as-7.1.1.Final</jbosstools.test.jbossas.home> <!-- for debugging ucomment and comment next line <systemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y -Djbosstools.test.jbossas.home=${jbosstools.test.jbossas.home} -Dswtbot.test.properties.file=${swtbot.properties}</systemProperties> --> - <systemProperties>-Djbosstools.test.jbossas.home=${jbosstools.test.jbossas.home} -Dswtbot.test.properties.file=${swtbot.properties}</systemProperties> + <systemProperties>${additionalSystemProperties} -Djbosstools.test.jbossas.home=${jbosstools.test.jbossas.home} -Dswtbot.test.properties.file=${swtbot.properties}</systemProperties> </properties> + <profiles> + <profile> + <id>debug</id> + <properties> + <additionalSystemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y</additionalSystemProperties> + </properties> + </profile> + </profiles> + <build> <plugins> <plugin> Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/requirements.properties =================================================================== --- trunk/central/tests/org.jboss.tools.central.test.ui.bot/requirements.properties 2012-04-25 08:41:41 UTC (rev 40472) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/requirements.properties 2012-04-25 08:59:47 UTC (rev 40473) @@ -1 +1 @@ -requirements=jbossas-7.0.2.Final \ No newline at end of file +requirements=jbossas-7.1.1.Final \ No newline at end of file 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-25 08:41:41 UTC (rev 40472) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-04-25 08:59:47 UTC (rev 40473) @@ -50,7 +50,9 @@ log.info(bot.activeShell().getText()); bot.hyperlink(IDELabel.JBossCentralEditor.OPENSHIFT_APP).click(); bot.waitForShell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD); - assertTrue("New OpenShift Express Application window should have appeared", bot.shell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD).isActive()); + bot.waitWhile(new NonSystemJobRunsCondition()); + 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 @@ -147,21 +149,33 @@ @Test public void canBeDeployedTest(){ servers.show(); - servers.findServerByName(servers.bot().tree(), "AS-7.0").contextMenu("Add and Remove...").click(); + String serverName = bot.tree().getAllItems()[0].getText().substring(0, bot.tree().getAllItems()[0].getText().indexOf(' ')); + servers.findServerByName(servers.bot().tree(), serverName).contextMenu("Add and Remove...").click(); + bot.shell("Add and Remove...").activate(); for (SWTBotTreeItem treeItem : bot.tree().getAllItems()) { treeItem.select(); bot.clickButton("Add >"); } - bot.clickButton("Finish"); + servers.show(); + log.info("========================================"); + log.info(bot.tree().getAllItems().toString()); bot.waitWhile(new NonSystemJobRunsCondition()); + log.info("Pred getErrorsNode"); assertNull("Errors node should be null", problems.getErrorsNode(bot)); - SWTBotTreeItem serverTreeItem = servers.findServerByName(servers.bot().tree(), "AS-7.0").expand(); + log.info("Za getErrorsNode"); + servers.show(); + bot.waitWhile(new NonSystemJobRunsCondition()); + SWTBotTreeItem serverTreeItem = servers.findServerByName(servers.bot().tree(), serverName).expand(); for (SWTBotTreeItem projectName : projectExplorer.show().bot().tree().getAllItems()) { try{ serverTreeItem.getNode(projectName.getText()+" [Started, Synchronized]"); + log.info("Project: "+projectName.getText()+" is properly deployed."); }catch (WidgetNotFoundException wnfe){ - fail("Project <"+projectName.getText()+"> is not deployed on server correctly"); + //exception for Java EE Web project. It hase 4 projects, multi, multi-ear, multi-ejb and multi-web. + if (!projectName.getText().contains("multi")){ + fail("Project <"+projectName.getText()+"> is not deployed on server correctly"); + } } } }