Author: rhopp Date: 2012-10-01 06:56:39 -0400 (Mon, 01 Oct 2012) New Revision: 44168 Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/BaseFunctionalityTest.java trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java Log: maintenance of tests. Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/BaseFunctionalityTest.java =================================================================== --- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/BaseFunctionalityTest.java 2012-10-01 10:52:25 UTC (rev 44167) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/BaseFunctionalityTest.java 2012-10-01 10:56:39 UTC (rev 44168) @@ -1,6 +1,17 @@ package org.jboss.tools.central.test.ui.bot; +import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.allOf; +import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.widgetOfType; +import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withStyle; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.ToolItem; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarPushButton; +import org.hamcrest.Matcher; +import org.jboss.tools.central.editors.xpl.TextSearchControl; +import org.jboss.tools.ui.bot.ext.SWTBotFactory; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.gen.ActionItem.Perspective; import org.jboss.tools.ui.bot.ext.types.IDELabel; @@ -18,6 +29,7 @@ public static void setup(){ open.perspective(Perspective.JAVA.LABEL); util.closeAllEditors(false); + bot.menu("Help").menu(IDELabel.JBossCentralEditor.JBOSS_CENTRAL).click(); } /** * Tests whether JBoss central is accessible from Help menu @@ -41,7 +53,15 @@ assertTrue("JBoss Central is not active",bot.editorByTitle(IDELabel.JBossCentralEditor.JBOSS_CENTRAL).isActive()); } + /*@SuppressWarnings({"unchecked", "rawtypes"}) + public void testSearch(){ + Matcher matcher = allOf(widgetOfType(TextSearchControl.class)); + TextSearchControl textSearchControl = (TextSearchControl) bot.editorByTitle("JBoss Central").bot().widget(matcher); + System.out.println(textSearchControl.getText()); + System.out.println("tes"); + }*/ + //TODO Refactor search Test // @Test // public void testSearch(){ 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-10-01 10:52:25 UTC (rev 44167) +++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-10-01 10:56:39 UTC (rev 44168) @@ -27,7 +27,7 @@ //TODO When testing new build try it with type=ServerType.EAP !!!! -@Require(clearProjects=false,server=(a)org.jboss.tools.ui.bot.ext.config.Annotations.Server(type=ServerType.ALL)) +@Require(clearProjects=false,server=(a)org.jboss.tools.ui.bot.ext.config.Annotations.Server(type=ServerType.EAP)) public class CreateProjectsWithServerTest extends SWTTestExt{ @BeforeClass @@ -107,7 +107,7 @@ assertTrue("New Dynamic Web Project should have appeared", bot.shell(IDELabel.JBossCentralEditor.NEW_DYNAMIC_WEB_PROJECT).isActive()); bot.activeShell().close(); //Openshift app - log.info(bot.activeShell().getText()); + bot.hyperlink(IDELabel.JBossCentralEditor.OPENSHIFT_APP).click(); bot.waitForShell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD); bot.waitWhile(new NonSystemJobRunsCondition()); @@ -115,6 +115,7 @@ bot.waitWhile(new NonSystemJobRunsCondition()); bot.activeShell().close(); bot.waitWhile(new NonSystemJobRunsCondition()); + bot.hyperlink(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click(); SWTBotShell projectExampleShell = bot.waitForShell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE); assertTrue("Project Example window should have appeared", bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).isActive()); @@ -249,13 +250,13 @@ SWTBotWizard wizard = new SWTBotWizard(bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).widget); wizard.next(); if (wizard.canNext()){ - bot.comboBox(2).setSelection(1); - try{ + // bot.comboBox(2).setSelection(1); + /*try{ bot.link(); fail("There is something wrong with maven repo. Message: \n"+bot.link().getText()); }catch (WidgetNotFoundException ex){ //everything fine - } + }*/ wizard.next(); } wizard.finishWithWait();