Author: jjankovi Date: 2011-11-30 10:46:38 -0500 (Wed, 30 Nov 2011) New Revision: 36787 Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIRefactorWizard.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/DynamicWebProjectWizard.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/JSFWebProjectWizard.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/SpecifyBeanDialogWizard.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/XHTMLDialogWizard.java Log: SpecifyBeanDialogWizard created Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-11-30 15:46:17 UTC (rev 36786) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-11-30 15:46:38 UTC (rev 36787) @@ -50,7 +50,7 @@ * JAVA=1.6,/space/java/sdk/jdk1.6.0_22 * * - * Suite duration: aprox. 28min + * Suite duration: aprox. 25min * * @author Lukas Jungmann * @author Jaroslav Jankovic Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.java 2011-11-30 15:46:17 UTC (rev 36786) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/CDIWizardHelper.java 2011-11-30 15:46:38 UTC (rev 36787) @@ -62,6 +62,10 @@ public void createCDIComponentWithContent(CDIWizardType component, String name, String packageName, String necessaryParam, String resource) { createCDIComponent(component, name, packageName, necessaryParam); + if (!bot.activeEditor().getTitle().equals(name + ".java")) { + bot.editorByTitle(name + ".java").show(); + setEd(bot.activeEditor().toTextEditor()); + } editResourceUtil.replaceClassContentByResource(CDIWizardHelper.class. getResourceAsStream(resource), false); } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIRefactorWizard.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIRefactorWizard.java 2011-11-30 15:46:17 UTC (rev 36786) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/CDIRefactorWizard.java 2011-11-30 15:46:38 UTC (rev 36787) @@ -9,6 +9,8 @@ public class CDIRefactorWizard extends Wizard{ private List<String> affectedFiles; + private static final String NAMED_TEXT_LABEL = "@Named Bean Name"; + private static final String RENAME_TEXT_LABEL = "Rename @Named Bean"; public CDIRefactorWizard() { super(new SWTBot().activeShell().widget); @@ -17,7 +19,7 @@ } public CDIRefactorWizard setName(String name) { - setText("@Named Bean Name", name); + setText(NAMED_TEXT_LABEL, name); return this; } @@ -32,7 +34,7 @@ */ public List<String> getAffectedFiles() { String temp = null; - for (SWTBotTreeItem ti : bot().tree().getTreeItem("Rename @Named Bean").getItems()) { + for (SWTBotTreeItem ti : bot().tree().getTreeItem(RENAME_TEXT_LABEL).getItems()) { temp = ti.getText().split("-")[0]; affectedFiles.add(temp.substring(0, temp.length() - 1)); } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/DynamicWebProjectWizard.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/DynamicWebProjectWizard.java 2011-11-30 15:46:17 UTC (rev 36786) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/DynamicWebProjectWizard.java 2011-11-30 15:46:38 UTC (rev 36787) @@ -20,19 +20,24 @@ public class DynamicWebProjectWizard extends Wizard { + private static final String PROJECT_NAME = "Project name:"; + private static final String CDI_PRESET = "Dynamic Web Project " + + "with CDI (Context and Dependency Injection)"; + private static final String CDI_FACET = "CDI (Contexts and Dependency Injection)"; + public DynamicWebProjectWizard() { super(new SWTBot().activeShell().widget); assert "New Dynamic Web Project".equals(getText()); } public DynamicWebProjectWizard setProjectName(String name) { - setText("Project name:", name); + setText(PROJECT_NAME, name); return this; } public DynamicWebProjectWizard setCDIPreset() { bot().comboBoxInGroup("Configuration", 0). - setSelection("Dynamic Web Project with CDI (Context and Dependency Injection)"); + setSelection(CDI_PRESET); return this; } @@ -48,7 +53,7 @@ SWTBot facetsBot = bot.activeShell().bot(); SWTBotTree tree= facetsBot.tree(); for (SWTBotTreeItem ti: tree.getAllItems()) { - if (ti.cell(0).contains("CDI (Contexts and Dependency Injection)")) { + if (ti.cell(0).contains(CDI_FACET)) { ti.check(); break; } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/JSFWebProjectWizard.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/JSFWebProjectWizard.java 2011-11-30 15:46:17 UTC (rev 36786) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/JSFWebProjectWizard.java 2011-11-30 15:46:38 UTC (rev 36787) @@ -17,24 +17,29 @@ public class JSFWebProjectWizard extends Wizard { + private static final String JSF_NEW_PROJECT_LABEL = "New JSF Project"; + private static final String JSF_PROJECT_NAME_LABEL = "Project Name*"; + private static final String JSF_ENV_LABEL = "JSF Environment*"; + private static final String JSF_TEMPL_LABEL = "Template*"; + public JSFWebProjectWizard() { super(new SWTBot().activeShell().widget); - assert ("New JSF Project").equals(getText()); + assert (JSF_NEW_PROJECT_LABEL).equals(getText()); } public JSFWebProjectWizard setName(String name) { - setText("Project Name*", name); + setText(JSF_PROJECT_NAME_LABEL, name); return this; } public JSFWebProjectWizard setEnvironment(JSFEnvironment env) { - setTextInCombobox("JSF Environment*", env.getName()); + setTextInCombobox(JSF_ENV_LABEL, env.getName()); return this; } public JSFWebProjectWizard setJSFTemplate(JSFTemplate template) { - if (canCheckInCombobox("Template*", template.getName())) { - setTextInCombobox("Template*", template.getName()); + if (canCheckInCombobox(JSF_TEMPL_LABEL, template.getName())) { + setTextInCombobox(JSF_TEMPL_LABEL, template.getName()); } return this; } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java 2011-11-30 15:46:17 UTC (rev 36786) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/QuickFixDialogWizard.java 2011-11-30 15:46:38 UTC (rev 36787) @@ -17,9 +17,11 @@ public class QuickFixDialogWizard extends Wizard { + private static final String QUICK_FIX_TITLE = "Quick Fix"; + public QuickFixDialogWizard() { super(new SWTBot().activeShell().widget); - assert ("Quick Fix").equals(getText()); + assert (QUICK_FIX_TITLE).equals(getText()); } public QuickFixDialogWizard setFix(SWTBotTableItem fix) { Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/SpecifyBeanDialogWizard.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/SpecifyBeanDialogWizard.java 2011-11-30 15:46:17 UTC (rev 36786) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/SpecifyBeanDialogWizard.java 2011-11-30 15:46:38 UTC (rev 36787) @@ -1,23 +1,115 @@ package org.jboss.tools.cdi.bot.test.uiutils.wizards; +import java.util.ArrayList; +import java.util.List; + import org.eclipse.swtbot.swt.finder.SWTBot; +import org.jboss.tools.cdi.bot.test.annotations.CDIWizardType; public class SpecifyBeanDialogWizard extends Wizard { + private static final String ADD = "Add >"; + private static final String ADD_ALL = "Add All >>"; + private static final String REMOVE = "< Remove"; + private static final String REMOVE_ALL = "<< Remove All"; + private static final String EDIT_VALUE = "Edit Value..."; + private static final String CREATE_NEW_QUALIFIER = "Create New Qualifier..."; + private List<String> availableQualifiers = null; + private List<String> inBeanQualifiers = null; + public SpecifyBeanDialogWizard() { super(new SWTBot().activeShell().widget); - assert ("Specify CDI Bean for the Injection Point").equals(getText()); + assert ("Specify CDI Bean for the Injection Point").equals(getText()); + availableQualifiers = new ArrayList<String>(); + inBeanQualifiers = new ArrayList<String>(); } + public SpecifyBeanDialogWizard add() { + clickButton(ADD); + return this; + } - /** - * not finished yet, what should be implemented: - * - * 1. gets all qualifier - * 2. select proper qualifier - * 3. add qualifier - * 4. remove qualifier - * 5. create a new qualifier - * - */ + public SpecifyBeanDialogWizard addAll() { + clickButton(ADD_ALL); + return this; + } + + public SpecifyBeanDialogWizard remove() { + clickButton(REMOVE); + return this; + } + + public SpecifyBeanDialogWizard removeAll() { + clickButton(REMOVE_ALL); + return this; + } + + public SpecifyBeanDialogWizard edit() { + clickButton(EDIT_VALUE); + return this; + } + + public CDIWizardBase createNewQualifier(String name, String packageName) { + clickButton(CREATE_NEW_QUALIFIER); + return new CDIWizardBase(CDIWizardType.QUALIFIER); + } + + public boolean canAdd() { + return canClick(ADD); + } + + public boolean canAddAll() { + return canClick(ADD_ALL); + } + + public boolean canRemove() { + return canClick(REMOVE); + } + + public boolean canRemoveAll() { + return canClick(REMOVE_ALL); + } + + public boolean canEdit() { + return canClick(EDIT_VALUE); + } + + public boolean canCreateNewQualifier() { + return canClick(CREATE_NEW_QUALIFIER); + } + + public List<String> getAvailableQualifiers() { + int tableItemsCount = bot().table(0).rowCount(); + for (int i = 0; i < tableItemsCount; i++) { + availableQualifiers.add(bot().table(0).getTableItem(i).getText()); + } + return availableQualifiers; + } + + public List<String> getInBeanQualifiers() { + int tableItemsCount = bot().table(1).rowCount(); + for (int i = 0; i < tableItemsCount; i++) { + inBeanQualifiers.add(bot().table(1).getTableItem(i).getText()); + } + return inBeanQualifiers; + } + + public SpecifyBeanDialogWizard addQualifier(String qualifier) { + return selectAvailableQualifier(qualifier).add(); + } + + public SpecifyBeanDialogWizard removeQualifier(String qualifier) { + return selectInBeanQualifier(qualifier).remove(); + } + + private SpecifyBeanDialogWizard selectAvailableQualifier(String qualifier) { + bot().table(0).select(qualifier); + return this; + } + + private SpecifyBeanDialogWizard selectInBeanQualifier(String qualifier) { + bot().table(1).select(qualifier); + return this; + } + } Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java 2011-11-30 15:46:17 UTC (rev 36786) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/Wizard.java 2011-11-30 15:46:38 UTC (rev 36787) @@ -20,6 +20,11 @@ public class Wizard extends SWTBotShell { + private static final String NEXT = "Next >"; + private static final String BACK = "< Back"; + private static final String CANCEL = "Cancel"; + private static final String FINISH = "Finish"; + public Wizard(Shell shell) { super(shell); assert getText().contains("New "); @@ -41,26 +46,30 @@ } public Wizard back() { - clickButton("< Back"); + clickButton(BACK); return this; } public Wizard next() { - clickButton("Next >"); + clickButton(NEXT); return this; } public void cancel() { - clickButton("Cancel"); + clickButton(CANCEL); } public void finish() { - clickButton("Finish"); + clickButton(FINISH); } public boolean canFinish() { - return canClick("Finish"); + return canClick(FINISH); } + + public boolean canNext() { + return canClick(NEXT); + } protected void checkCheckbox(String text) { bot().checkBoxWithLabel(text).select(); Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/XHTMLDialogWizard.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/XHTMLDialogWizard.java 2011-11-30 15:46:17 UTC (rev 36786) +++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/wizards/XHTMLDialogWizard.java 2011-11-30 15:46:38 UTC (rev 36787) @@ -6,23 +6,28 @@ public class XHTMLDialogWizard extends Wizard { + private static final String XHTML_NEW_PAGE_TITLE = "New XHTML Page"; + private static final String PARENT_FOLDER_LABEL = "Enter or select the parent folder:"; + private static final String FILE_NAME_LABEL = "File name:"; + private static final String XHTML_TEMPL_CHECK_BOX = "Use XHTML Template"; + public XHTMLDialogWizard() { super(new SWTBot().activeShell().widget); - assert ("New XHTML Page").equals(getText()); + assert (XHTML_NEW_PAGE_TITLE).equals(getText()); } public XHTMLDialogWizard setDestination(String destination) { - setText("Enter or select the parent folder:", destination); + setText(PARENT_FOLDER_LABEL, destination); return this; } public XHTMLDialogWizard setName(String nameOfPage) { - setText("File name:", nameOfPage); + setText(FILE_NAME_LABEL, nameOfPage); return this; } public XHTMLDialogWizard checkXHTMLTemplate() { - checkCheckbox("Use XHTML Template"); + checkCheckbox(XHTML_TEMPL_CHECK_BOX); return this; }