Author: vpakan(a)redhat.com Date: 2011-07-22 02:26:32 -0400 (Fri, 22 Jul 2011) New Revision: 33127 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/OpenOnTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java Log: Added Open On and Code Completion tests for JSF2 Composite Component Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-07-22 00:14:35 UTC (rev 33126) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-07-22 06:26:32 UTC (rev 33127) @@ -10,13 +10,17 @@ ******************************************************************************/ package org.jboss.tools.jsf.ui.bot.test.smoke; +import java.awt.event.KeyEvent; import java.util.LinkedList; import java.util.List; import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase; import org.jboss.tools.ui.bot.ext.SWTJBTExt; import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.helper.ContentAssistHelper; +import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; +import org.jboss.tools.ui.bot.ext.helper.OpenOnHelper; import org.jboss.tools.ui.bot.ext.parts.ContentAssistBot; import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt; /** * Test Code Completion functionality of JSF components within xhtml page @@ -25,12 +29,16 @@ */ public class CodeCompletionTest extends JSFAutoTestCase{ private SWTBotEditorExt editor; + private SWTBotEditorExt compositeComponentDefEditor; + private SWTBotEditorExt compositeComponentContainerEditor; private String originalEditorText; + private String compositeComponentDefEditorText; + private String origCompositeComponentContainerEditorText; /** * Test Code Completion functionality for managed bean */ public void testCodeCompletionOfManagedBean(){ - + initFaceletsPageTest(); String textForSelection = "value=\"#{person.name}\""; List<String> expectedProposals = new LinkedList<String>(); expectedProposals.add("msg"); @@ -56,7 +64,7 @@ * Test Code Completion functionality for resource */ public void testCodeCompletionOfResource(){ - + initFaceletsPageTest(); ContentAssistBot contentAssist = editor.contentAssist(); String textForSelection = "${msg.prompt}"; // Check content assist for ${ prefix @@ -82,7 +90,7 @@ * Test Code Completion functionality of <input> tag attributes within xhtml page */ public void testCodeCompletionOfInputTagAttributes(){ - + initFaceletsPageTest(); ContentAssistBot contentAssist = editor.contentAssist(); String textForSelection = "action=\"greeting\" value=\"Say Hello\" "; // Check content assist menu content @@ -106,6 +114,7 @@ * Test Code Completion functionality of <input> tag for jsfc attribute within xhtml page */ public void testCodeCompletionOfInputTagForJsfcAttribute(){ + initFaceletsPageTest(); // check jsfc attribute insertion via Content Assist SWTJBTExt.selectTextInSourcePane(SWTTestExt.bot, FACELETS_TEST_PAGE, @@ -160,10 +169,102 @@ editor.getText().contains(expectedInsertedText)); editor.save(); } - - @Override - protected void setUp() throws Exception { - super.setUp(); + /** + * Test Code Completion functionality for Composite Component + */ + public void testCodeCompletionOfCompositeComponent(){ + eclipse.closeAllEditors(); + openPage(JSF2_TEST_PAGE, JSF2_TEST_PROJECT_NAME); + compositeComponentContainerEditor = SWTTestExt.bot.swtBotEditorExtByTitle(FACELETS_TEST_PAGE); + origCompositeComponentContainerEditorText = compositeComponentContainerEditor.getText(); + ContentAssistBot contentAssist = compositeComponentContainerEditor.contentAssist(); + SWTJBTExt.selectTextInSourcePane(SWTTestExt.bot, + JSF2_TEST_PAGE, + "<ez:input ", + 0, + 0, + 0); + String textToInsert = "<ez:"; + compositeComponentContainerEditor.insertText(textToInsert); + SWTJBTExt.selectTextInSourcePane(SWTTestExt.bot, + JSF2_TEST_PAGE, + textToInsert, + textToInsert.length(), + 0, + 0); + // Check content assist menu content for "<ez:" + contentAssist.checkContentAssist("ez:input", true); + bot.sleep(Timing.time2S()); + compositeComponentContainerEditor.save(); + String currentLineText = compositeComponentContainerEditor.getTextOnCurrentLine(); + String expectedInsertedText = "<ez:input value=\"\" action=\"\"></ez:input>"; + if (!currentLineText.toLowerCase().contains(expectedInsertedText.toLowerCase())){ + expectedInsertedText = "<ez:input action=\"\" value=\"\"></ez:input>"; + assertTrue("Inserted text should be " + expectedInsertedText + " but is not.\n" + + "Current line text is " + currentLineText, + currentLineText.toLowerCase().contains(expectedInsertedText.toLowerCase())); + } + // Check content assist menu content for Composite Components attributes + ContentAssistHelper.checkContentAssistContent(SWTTestExt.bot, + JSF2_TEST_PAGE, + expectedInsertedText, + 10, + 0, + getCompositeComponentsAttributesProposalList()); + // Open Composite Component definition file + String compositeComponentFileName = "input.xhtml"; + OpenOnHelper.checkOpenOnFileIsOpened( + SWTTestExt.bot, JSF2_TEST_PAGE, "<ez:input ", 5, + 0, 0, compositeComponentFileName); + compositeComponentDefEditor = SWTTestExt.bot.swtBotEditorExtByTitle(compositeComponentFileName); + compositeComponentDefEditorText = compositeComponentDefEditor.getText(); + textToInsert = "<h:commandButton action=\""; + SWTJBTExt.selectTextInSourcePane(SWTTestExt.bot, + compositeComponentFileName, + textToInsert, + 0, + 0, + 0); + compositeComponentDefEditor.insertText(textToInsert + "\"/> "); // add closing "/> + SWTJBTExt.selectTextInSourcePane(SWTTestExt.bot, + compositeComponentFileName, + textToInsert, + textToInsert.length(), + 0, + 0); + // Check content assist menu content for ""<h:commandButton action="" />" + contentAssist = compositeComponentDefEditor.contentAssist(); + contentAssist.checkContentAssist("cc.attrs", true); + bot.sleep(Timing.time2S()); + compositeComponentDefEditor.save(); + currentLineText = compositeComponentDefEditor.getTextOnCurrentLine(); + expectedInsertedText = "#{cc.attrs}"; + assertTrue("Inserted text should be " + expectedInsertedText + " but is not.\n" + + "Current line text is " + currentLineText, + currentLineText.toLowerCase().contains(expectedInsertedText.toLowerCase())); + compositeComponentDefEditor.insertText("."); + KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_RIGHT); + // Check content assist menu content for Composite Components attributes + ContentAssistHelper.checkContentAssistContent(SWTTestExt.bot, + compositeComponentFileName, + "#{cc.attrs.}", + 11, + 0, + getCompositeComponentsAttributeDefProposalList()); + // check inserting of "submitlabel" content assist + String contentAssistToUse = "submitlabel"; + contentAssist.checkContentAssist(contentAssistToUse, true); + expectedInsertedText = "<h:commandButton action=\"#{cc.attrs." + contentAssistToUse + "}\""; + assertTrue("Editor has to contain text '" + expectedInsertedText + "' but it doesn't\n" + + "Editor Text is\n" + compositeComponentDefEditor.getText(), + compositeComponentDefEditor.getText().toLowerCase().contains(expectedInsertedText.toLowerCase())); + compositeComponentDefEditor.save(); + } + /** + * Initialize test which are using facelets test page + */ + private void initFaceletsPageTest() { + eclipse.closeAllEditors(); openPage(FACELETS_TEST_PAGE,FACELETS_TEST_PROJECT_NAME); editor = SWTTestExt.bot.swtBotEditorExtByTitle(FACELETS_TEST_PAGE); originalEditorText = editor.getText(); @@ -295,6 +396,14 @@ editor.setText(originalEditorText); editor.saveAndClose(); } + if (compositeComponentDefEditor != null){ + compositeComponentDefEditor.setText(compositeComponentDefEditorText); + compositeComponentDefEditor.saveAndClose(); + } + if (compositeComponentContainerEditor != null){ + compositeComponentContainerEditor.setText(origCompositeComponentContainerEditorText); + compositeComponentContainerEditor.saveAndClose(); + } super.tearDown(); } /** @@ -355,4 +464,45 @@ result.add("valueChangeListener"); return result; } + /** + * Returns list of expected Content Assist proposals for Composite Component Attributes + * @return + */ + private static List<String> getCompositeComponentsAttributesProposalList(){ + LinkedList<String> result = new LinkedList<String>(); + + result.add("id"); + result.add("label"); + result.add("rendered"); + result.add("submitlabel"); + return result; + } + + /** + * Returns list of expected Content Assist proposals for Composite Component Attributes + * within file containing Composite Component definition + * @return + */ + private static List<String> getCompositeComponentsAttributeDefProposalList(){ + LinkedList<String> result = new LinkedList<String>(); + + result.add("action"); + result.add("label"); + result.add("onclick"); + result.add("ondblclick"); + result.add("onkeydown"); + result.add("onkeypress"); + result.add("onkeyup"); + result.add("onmousedown"); + result.add("onmousemove"); + result.add("onmouseout"); + result.add("onmouseover"); + result.add("onmouseup"); + result.add("submitlabel"); + result.add("value"); + result.add("\"#{cc.attrs.}\""); + return result; + } + + } \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java 2011-07-22 00:14:35 UTC (rev 33126) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java 2011-07-22 06:26:32 UTC (rev 33127) @@ -146,5 +146,28 @@ openedEditor.close(); } + + /** + * Test Open On functionality for Composite Component + */ + public void testOpenOnForCompositeComponent() { + eclipse.closeAllEditors(); + openPage(JSF2_TEST_PAGE,JSF2_TEST_PROJECT_NAME); + // Check open on for <ez:input + String expectedOpenedFileName = "input.xhtml"; + SWTBotEditor compositeComponentEditor = OpenOnHelper.checkOpenOnFileIsOpened( + SWTTestExt.bot, JSF2_TEST_PAGE, "<ez:input ", 5, + 0, 0, expectedOpenedFileName); + // Check open on for cc.attrs.submitlabel + compositeComponentEditor = OpenOnHelper.checkOpenOnFileIsOpened( + SWTTestExt.bot, expectedOpenedFileName, "value=\"#{cc.attrs.submitlabel}\"", 20, + 0, 0, expectedOpenedFileName); + String selectedText = compositeComponentEditor.toTextEditor().getSelection(); + String expectedSelectedText = "<composite:attribute name=\"submitlabel\"/>"; + assertTrue("Selected text in editor has to be " + expectedSelectedText + + " but it is " + selectedText, + selectedText.equalsIgnoreCase(expectedSelectedText)); + compositeComponentEditor.close(); + } } \ No newline at end of file Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-07-22 00:14:35 UTC (rev 33126) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-07-22 06:26:32 UTC (rev 33127) @@ -399,6 +399,7 @@ public static final String JBOSS_EAP_5_0 = "JBoss Enterprise Middleware"; public static final String JBOSS_EAP_5_x = "JBoss Enterprise Middleware"; public static final String JBOSS_COMMUNITY = "JBoss Community"; + public static final String JBOSS_AS_6_0 = "JBoss Community"; } public static final class ServerRuntimeType { @@ -407,6 +408,7 @@ public static final String JBOSS_EAP_5_0 = "JBoss Enterprise Application Platform 5.0 Runtime"; public static final String JBOSS_EAP_5_x = "JBoss Enterprise Application Platform 5.x Runtime"; public static final String JBOSS_AS_5_1 = "JBoss 5.1 Runtime"; + public static final String JBOSS_AS_6_0 = "JBoss 6.0 Runtime"; } public static final class ServerType { @@ -414,7 +416,7 @@ public static final String JBOSS_EAP_4_3 = "JBoss Enterprise Application Platform 4.3"; public static final String JBOSS_EAP_5_0 = "JBoss Enterprise Application Platform 5.0"; public static final String JBOSS_EAP_5_x = "JBoss Enterprise Application Platform 5.x"; - public static final String JBOSS_AS_5_1 = "JBoss AS 5.1"; + public static final String JBOSS_AS_6_0 = "JBoss 6.0 Runtime"; } public static final class DroolsRuntimeDialog { @@ -675,4 +677,13 @@ public static final String DIAGRAM_TAB_LABEL = "Diagram"; } + + public static class NewJsfProjectDialog{ + + public static final String PROJECT_NAME_LABEL = "Project Name*"; + public static final String JSF_ENVIRONMENT_LABEL = "JSF Environment*"; + public static final String TEMPLATE_LABEL = "Template*"; + public static final String RUNTIME_LABEL = "Runtime*"; + public static final String HOME_DIRECTORY_LABEL = "Home Directory"; + } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2011-07-22 00:14:35 UTC (rev 33126) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2011-07-22 06:26:32 UTC (rev 33127) @@ -48,6 +48,7 @@ protected static final String TEST_PAGE = "inputUserName.jsp"; //$NON-NLS-1$ protected static final String FACELETS_TEST_PAGE = "inputname.xhtml"; //$NON-NLS-1$ protected static String PROJECT_PROPERTIES = "projectProperties.properties"; //$NON-NLS-1$ + protected static String JSF2_TEST_PAGE = "inputname.xhtml"; //$NON-NLS-1$ /** * Variable defines JBoss EAP 4.3 server location on a file system @@ -56,9 +57,14 @@ protected final static String JBOSS_EAP_HOME; protected final static String JBT_TEST_PROJECT_NAME; protected final static String FACELETS_TEST_PROJECT_NAME; + protected final static String JSF2_TEST_PROJECT_NAME; protected final static String JBOSS_SERVER_GROUP; protected final static String JBOSS_SERVER_TYPE; protected final static String JBOSS_SERVER_RUNTIME_TYPE; + protected final static String JBOSS_AS_FOR_JSF2_HOME; + protected final static String JBOSS_AS_FOR_JSF2_SERVER_GROUP; + protected final static String JBOSS_AS_FOR_JSF2_SERVER_TYPE; + protected final static String JBOSS_AS_FOR_JSF2_SERVER_RUNTIME_TYPE; /* (non-Javadoc) * This static block read properties from @@ -101,8 +107,29 @@ JBOSS_SERVER_RUNTIME_TYPE = IDELabel.ServerRuntimeType.JBOSS_EAP_4_3; JBOSS_SERVER_TYPE = IDELabel.ServerType.JBOSS_EAP_4_3; } + // Setup JSF2 project related properties + if (projectProperties.containsKey("JBossASForJSF2")){ + JBOSS_AS_FOR_JSF2_HOME = projectProperties.getProperty("JBossASForJSF2"); + String version = projectProperties.getProperty("JBossASForJSF2Version","6.0"); + if (version.equals("6.0")){ + JBOSS_AS_FOR_JSF2_SERVER_GROUP = IDELabel.ServerGroup.JBOSS_AS_6_0; + JBOSS_AS_FOR_JSF2_SERVER_RUNTIME_TYPE = IDELabel.ServerRuntimeType.JBOSS_AS_6_0; + JBOSS_AS_FOR_JSF2_SERVER_TYPE = IDELabel.ServerType.JBOSS_AS_6_0; + } + else{ + throw new RuntimeException("Unsupported version of JBoss AS runtime for JSF2 [version=" + version + + "location='" + JBOSS_AS_FOR_JSF2_HOME + "' specified."); + } + } + else{ + JBOSS_AS_FOR_JSF2_HOME = JBOSS_EAP_HOME; + JBOSS_AS_FOR_JSF2_SERVER_GROUP = JBOSS_SERVER_GROUP; + JBOSS_AS_FOR_JSF2_SERVER_TYPE = JBOSS_SERVER_TYPE; + JBOSS_AS_FOR_JSF2_SERVER_RUNTIME_TYPE = JBOSS_SERVER_RUNTIME_TYPE; + } JBT_TEST_PROJECT_NAME = projectProperties.getProperty("JSFProjectName"); //$NON-NLS-1$ FACELETS_TEST_PROJECT_NAME = projectProperties.getProperty("FaceletsProjectName"); //$NON-NLS-1$ + JSF2_TEST_PROJECT_NAME = projectProperties.getProperty("JSF2ProjectName"); //$NON-NLS-1$ } /** @@ -131,6 +158,14 @@ } catch (WidgetNotFoundException e) { createFaceletsProject(FACELETS_TEST_PROJECT_NAME); } + /* + * Test JSF2 project + */ + try { + tree.getTreeItem(JSF2_TEST_PROJECT_NAME); + } catch (WidgetNotFoundException e) { + createJSF2Project(JSF2_TEST_PROJECT_NAME); + } } /** @@ -599,4 +634,49 @@ } + /** + * Create JSF2 Project with <b>jsf2ProjectName</b> + * @param jsf2ProjectName - name of created project + */ + protected void createJSF2Project(String jsf2ProjectName){ + open.newObject(ActionItem.NewObject.JBossToolsWebJSFJSFProject.LABEL); + bot.textWithLabel(IDELabel.NewJsfProjectDialog.PROJECT_NAME_LABEL).setText(jsf2ProjectName); + bot.comboBoxWithLabel(IDELabel.NewJsfProjectDialog.JSF_ENVIRONMENT_LABEL) + .setSelection("JSF 2.0");//$NON-NLS-1$ + bot.comboBoxWithLabel(IDELabel.NewJsfProjectDialog.TEMPLATE_LABEL) + .setSelection("JSFKickStartWithoutLibs");//$NON-NLS-1$ + bot.button(IDELabel.Button.NEXT).click(); + try { + bot.comboBoxWithLabel(IDELabel.NewJsfProjectDialog.RUNTIME_LABEL) + .setSelection(JBOSS_AS_FOR_JSF2_SERVER_RUNTIME_TYPE); + delay(); + bot.button(IDELabel.Button.FINISH).click(); + try { + bot.button(IDELabel.Button.YES).click(); + openErrorLog(); + openPackageExplorer(); + } catch (WidgetNotFoundException e) { + } + } catch (Exception e) { + bot.button(0).click(); + SWTBotTree innerTree = bot.tree(); + delay(); + innerTree.expandNode(JBOSS_AS_FOR_JSF2_SERVER_GROUP).select(JBOSS_AS_FOR_JSF2_SERVER_RUNTIME_TYPE); + delay(); + bot.button(IDELabel.Button.NEXT).click(); + bot.textWithLabel(IDELabel.NewJsfProjectDialog.HOME_DIRECTORY_LABEL).setText(JBOSS_AS_FOR_JSF2_HOME); + bot.button(IDELabel.Button.FINISH).click(); + delay(); + bot.button(IDELabel.Button.FINISH).click(); + try { + bot.button(IDELabel.Button.YES).click(); + openErrorLog(); + openPackageExplorer(); + } catch (WidgetNotFoundException e2) { + } + } + waitForBlockingJobsAcomplished(60*1000L, BUILDING_WS); + setException(null); + } + } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/OpenOnTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/OpenOnTest.java 2011-07-22 00:14:35 UTC (rev 33126) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/smoke/OpenOnTest.java 2011-07-22 06:26:32 UTC (rev 33127) @@ -20,17 +20,12 @@ * */ public class OpenOnTest extends VPEEditorTestCase{ - public void testOpenOn() throws Throwable{ - - eclipse.closeAllEditors(); - openPage(); - checkOpenOn(); - - } /** - * Check Open On functionality for jsp page + * Test Open On functionality for jsp page */ - private void checkOpenOn() { + public void testOpenOn() { + eclipse.closeAllEditors(); + openPage(); // Check open on for uri="http://java.sun.com/jsf/html" String expectedOpenedFileName = "html_basic.tld"; SWTBotEditor openedEditor = OpenOnHelper.checkOpenOnFileIsOpened( @@ -67,4 +62,5 @@ expectedOpenedFileName); openedEditor.close(); } + } \ No newline at end of file Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2011-07-22 00:14:35 UTC (rev 33126) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2011-07-22 06:26:32 UTC (rev 33127) @@ -92,7 +92,7 @@ public static final String SETUP_VISUAL_TEMPLATE_FOR_MENU_LABEL = "Setup Visual Template for "; public static final String SELECT_THIS_TAG_MENU_LABEL = "Select This Tag"; public static final String PREFERENCES_MENU_LABEL = "Preferences.."; - public static final String EXTERNALIZE_STRING_MENU_LABEL = "Externalize selected string..."; + public static final String EXTERNALIZE_STRING_MENU_LABEL = "Externalize strings..."; public static final String JSF_MENU_LABEL = "JSF"; public static final String JBOSS_MENU_LABEL = "JBoss";