Author: lzoubek(a)redhat.com Date: 2011-08-26 09:14:04 -0400 (Fri, 26 Aug 2011) New Revision: 34336 Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/AbstractSeamTestBase.java trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/SeamAllBotTests.java trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateActions.java trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateForms.java trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/misc/GotoComponent.java trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/validate/ELExprValidator.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java Log: fixed seam ui bot tests to run with ReqAware suite + on JBDS M3 (label changes) Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/AbstractSeamTestBase.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/AbstractSeamTestBase.java 2011-08-26 10:18:36 UTC (rev 34335) +++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/AbstractSeamTestBase.java 2011-08-26 13:14:04 UTC (rev 34336) @@ -7,8 +7,18 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.Timing; +import org.jboss.tools.ui.bot.ext.config.Annotations.DB; +import org.jboss.tools.ui.bot.ext.config.Annotations.Require; +import org.jboss.tools.ui.bot.ext.config.Annotations.Seam; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +@Require( + server=@Server(), + seam=@Seam(), + db=@DB(), + perspective="Seam 2", + clearProjects=false) public abstract class AbstractSeamTestBase extends SWTTestExt { public static final String testProjectName = "SeamPrj"; @@ -27,7 +37,7 @@ /**Creates any Seam Action, Form etc. */ public void createSeamUnit(String unitType, String type){ - bot.menu("File").menu("New").menu("Seam " +unitType).click(); + bot.menu("File").menu("New").menu("Seam 2 " +unitType).click(); SWTBotShell shell = bot.activeShell(); bot.textWithLabel("Seam Project:").setText(testProjectName + type); if ("Entity".equals(unitType)) { Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/SeamAllBotTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/SeamAllBotTests.java 2011-08-26 10:18:36 UTC (rev 34335) +++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/SeamAllBotTests.java 2011-08-26 13:14:04 UTC (rev 34336) @@ -23,14 +23,11 @@ */ @RunWith(RequirementAwareSuite.class) -(a)ExcludeCategory(WARTests.class) @Suite.SuiteClasses({ - //CreateServerRuntimes.class, - //CreateSeamRuntimes.class, CreateSeamProjects.class, - //ReverseEngineering.class, - //ComponentsValidator.class, - //ELExprValidator.class, + ReverseEngineering.class, + ComponentsValidator.class, + ELExprValidator.class, CreateForms.class, CreateActions.class, CreateConversations.class, @@ -39,13 +36,5 @@ DeleteSeamProjects.class }) public class SeamAllBotTests { - - /* - @Parameters - public static List<Properties[]> data() { - return TestControl.getParameters(); - - } - */ } \ No newline at end of file Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateActions.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateActions.java 2011-08-26 10:18:36 UTC (rev 34335) +++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateActions.java 2011-08-26 13:14:04 UTC (rev 34336) @@ -1,6 +1,5 @@ package org.jboss.tools.seam.ui.bot.test.create; -import java.util.Properties; import org.jboss.tools.seam.ui.bot.test.AbstractSeamTestBase; import org.jboss.tools.seam.ui.bot.test.EARTests; Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateForms.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateForms.java 2011-08-26 10:18:36 UTC (rev 34335) +++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateForms.java 2011-08-26 13:14:04 UTC (rev 34336) @@ -1,7 +1,5 @@ package org.jboss.tools.seam.ui.bot.test.create; -import java.util.Properties; - import org.jboss.tools.seam.ui.bot.test.AbstractSeamTestBase; import org.jboss.tools.seam.ui.bot.test.EARTests; import org.jboss.tools.seam.ui.bot.test.TestControl; Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java 2011-08-26 10:18:36 UTC (rev 34335) +++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/create/CreateSeamProjects.java 2011-08-26 13:14:04 UTC (rev 34336) @@ -2,27 +2,14 @@ import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellCloses; -import java.util.Properties; - -import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotBrowser; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.seam.ui.bot.test.AbstractSeamTestBase; import org.jboss.tools.seam.ui.bot.test.EARTests; import org.jboss.tools.seam.ui.bot.test.TestControl; import org.jboss.tools.seam.ui.bot.test.WARTests; -import org.jboss.tools.ui.bot.ext.SWTBotExt; import org.jboss.tools.ui.bot.ext.SWTJBTExt; -import org.jboss.tools.ui.bot.ext.SWTOpenExt; import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.jboss.tools.ui.bot.ext.SWTUtilExt; -import org.jboss.tools.ui.bot.ext.config.Annotations.DB; -import org.jboss.tools.ui.bot.ext.config.TestConfigurator; -import org.jboss.tools.ui.bot.ext.config.Annotations.Require; -import org.jboss.tools.ui.bot.ext.config.Annotations.Seam; -import org.jboss.tools.ui.bot.ext.config.Annotations.Server; -import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.parts.SWTBotBrowserExt; import org.jboss.tools.ui.bot.ext.parts.SWTBotRadioExt; @@ -32,14 +19,11 @@ import org.junit.experimental.categories.Category; -//@SWTBotTestRequires(server=@Server(state=ServerState.NotRunning),perspective=&quot;Seam&quot;,seam=(a)Seam()) -@Require(server=@Server,perspective="Seam",seam=@Seam(),db=@DB) public class CreateSeamProjects extends AbstractSeamTestBase { protected static final String VALIDATION = "Validation"; protected static final String DEPLOY_SOURCE = "Deploying datasource to server"; protected static final String REG_IN_SERVER = "Register in server"; - protected static final String CONN_PROFILE = "hsqldb18_internal"; public CreateSeamProjects() { @@ -76,7 +60,7 @@ protected void createSeamProject(String type) { SWTJBTBot bot = new SWTJBTBot(); - bot.menu("File").menu("New").menu("Seam Web Project").click(); + bot.menu("File").menu("New").menu("Seam 2 Web Project").click(); bot.textWithLabel("Project name:").setText(AbstractSeamTestBase.testProjectName + type); bot.comboBoxInGroup("Target runtime").setSelection(SWTTestExt.configuredState.getServer().name); bot.comboBoxInGroup("Target Server").setSelection(SWTTestExt.configuredState.getServer().name); @@ -87,9 +71,9 @@ bot.button("Next >").click(); bot.button("Next >").click(); bot.button("Next >").click(); - bot.comboBoxWithLabel("Seam Runtime:").setSelection(SWTTestExt.configuredState.getSeam().name); + bot.comboBoxWithLabel("Seam 2 Runtime:").setSelection(SWTTestExt.configuredState.getSeam().name); new SWTBotRadioExt(bot.radio(type).widget).clickWithoutDeselectionEvent(); - bot.comboBoxWithLabel("Connection profile:").setSelection(CONN_PROFILE); + bot.comboBoxWithLabel("Connection profile:").setSelection(SWTTestExt.configuredState.getDB().name); SWTBotShell seamPrjShell = bot.activeShell(); bot.button("Finish").click(); Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/misc/GotoComponent.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/misc/GotoComponent.java 2011-08-26 10:18:36 UTC (rev 34335) +++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/misc/GotoComponent.java 2011-08-26 13:14:04 UTC (rev 34336) @@ -31,7 +31,7 @@ private void testGotoComponent(String type) { SWTJBTBot bot = new SWTJBTBot(); - bot.menu("Navigate").menu("Open Seam Component").click(); + bot.menu("Navigate").menu("Open Seam 2 Component").click(); bot.text().setText("authenticator"); SWTBotTableItem tabItem = bot.table().getTableItem("authenticator - " + AbstractSeamTestBase.testProjectName + type + ((type == TestControl.TYPE_EAR) ? "-ejb" : "")); Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/validate/ELExprValidator.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/validate/ELExprValidator.java 2011-08-26 10:18:36 UTC (rev 34335) +++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/src/org/jboss/tools/seam/ui/bot/test/validate/ELExprValidator.java 2011-08-26 13:14:04 UTC (rev 34336) @@ -30,7 +30,7 @@ private void testELExpr(String type) { SWTBotEclipseEditor editor = projectExplorer.openFile(testProjectName + type, - "Web Resources : WebContent", "home.xhtml").toTextEditor(); + "Web Resources", "home.xhtml").toTextEditor(); // add correct expression int idx = 0; Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2011-08-26 10:18:36 UTC (rev 34335) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2011-08-26 13:14:04 UTC (rev 34336) @@ -8931,7 +8931,7 @@ * represents item : JBoss Tools->Web->Seam */ public static final IPreference LABEL = new IPreference() { - public String getName() { return "Seam";} + public String getName() { return "Seam 2";} public List<String> getGroupPath() { List<String> l = new Vector<String>(); l.add("JBoss Tools");