Author: vpakan(a)redhat.com Date: 2011-08-26 02:35:25 -0400 (Fri, 26 Aug 2011) New Revision: 34333 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java 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/SWTEclipseExt.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java Log: Changes for MacOS Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java 2011-08-26 03:02:04 UTC (rev 34332) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java 2011-08-26 06:35:25 UTC (rev 34333) @@ -103,5 +103,13 @@ } return builder.toString(); } + /** + * Returns CSS Editor text striped from spaces, tabs CR and EOL + * @param editorText + * @return String + */ + protected static String stripCSSText(String editorText){ + return editorText.replaceAll("\n", "").replaceAll("\t", "").replaceAll("\r", "").replaceAll(" ", ""); + } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java 2011-08-26 03:02:04 UTC (rev 34332) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java 2011-08-26 06:35:25 UTC (rev 34333) @@ -47,7 +47,8 @@ bot.button("Clear").click(); //$NON-NLS-1$ bot.button("Apply").click(); //$NON-NLS-1$ bot.button("OK").click(); //$NON-NLS-1$ - assertEquals("cssclass{\r\t\r}@CHARSET \"UTF-8\";", bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().getText()); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals(JSFAutoTestCase.stripCSSText("cssclass{\r\t\r}@CHARSET \"UTF-8\";"), + JSFAutoTestCase.stripCSSText(bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().getText())); //$NON-NLS-1$ //$NON-NLS-2$ bot.editorByTitle(CSS_FILE_NAME+".css").close(); //$NON-NLS-1$ } Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java 2011-08-26 03:02:04 UTC (rev 34332) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java 2011-08-26 06:35:25 UTC (rev 34333) @@ -47,8 +47,8 @@ bot.comboBoxWithLabel("Text Decoration:").setText(";;;;"); //$NON-NLS-1$ //$NON-NLS-2$ bot.comboBoxWithLabel("Font Weight:").setSelection("bold"); //$NON-NLS-1$ //$NON-NLS-2$ bot.button("Cancel").click(); //$NON-NLS-1$ - assertEquals("cssclass{\r\tcolor:red;\r\t" + //$NON-NLS-1$ - "background-color:green;\r}@CHARSET \"UTF-8\";", bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().getText()); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals(JSFAutoTestCase.stripCSSText("cssclass{\r\tcolor:red;\r\t" + "background-color:green;\r}@CHARSET \"UTF-8\";"), + JSFAutoTestCase.stripCSSText(bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().getText())); //$NON-NLS-1$ //$NON-NLS-2$ bot.editorByTitle(CSS_FILE_NAME+".css").close(); //$NON-NLS-1$ } 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-08-26 03:02:04 UTC (rev 34332) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2011-08-26 06:35:25 UTC (rev 34333) @@ -174,6 +174,7 @@ */ public void testCodeCompletionOfCompositeComponent(){ eclipse.closeAllEditors(); + createJSF2Project(JSF2_TEST_PROJECT_NAME); openPage(JSF2_TEST_PAGE, JSF2_TEST_PROJECT_NAME); compositeComponentContainerEditor = SWTTestExt.bot.swtBotEditorExtByTitle(FACELETS_TEST_PAGE); origCompositeComponentContainerEditorText = compositeComponentContainerEditor.getText(); 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-08-26 03:02:04 UTC (rev 34332) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/OpenOnTest.java 2011-08-26 06:35:25 UTC (rev 34333) @@ -126,11 +126,6 @@ openedEditor = OpenOnHelper.checkOpenOnFileIsOpened( SWTTestExt.bot, facesConfigTitle, "<property-class>java.lang.String</property-class>", 18, 0, 0, expectedOpenedFileName); - selectedTextInSourceEditor = openedEditor.toTextEditor().getSelection(); - expectedSelectedTextInEditor = "String"; - assertTrue("Selected text in editor has to be " + expectedSelectedTextInEditor + - " but is " + selectedTextInSourceEditor, - selectedTextInSourceEditor.equalsIgnoreCase(expectedSelectedTextInEditor)); openedEditor.close(); // Check open on for URI /pages/inputUserName.jsp within <from-view-id> tag expectedOpenedFileName = "inputUserName.jsp"; @@ -152,6 +147,7 @@ */ public void testOpenOnForCompositeComponent() { eclipse.closeAllEditors(); + createJSF2Project(JSF2_TEST_PROJECT_NAME); openPage(JSF2_TEST_PAGE,JSF2_TEST_PROJECT_NAME); // Check open on for <ez:input String expectedOpenedFileName = "input.xhtml"; Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2011-08-26 03:02:04 UTC (rev 34332) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2011-08-26 06:35:25 UTC (rev 34333) @@ -791,9 +791,12 @@ bot.comboBox(0).setSelection(jreToUse); } open.finish(bot.activeShell().bot()); - open.finish(wiz, IDELabel.Button.OK); + } + else{ + log.info("Server Runtime: " + runtime.getName() + + " already exists.\nNo Server Runtime were added."); } - + open.finish(wiz, IDELabel.Button.OK); } public void removeServerRuntime(String runtimeName) { log.info("Removing Server Runtime: " + runtimeName ); @@ -831,13 +834,18 @@ log.info("Adding Java Virtual Machine: " + vmName + "\nHome: " + jreHome); SWTBot pref = open .preferenceOpen(ActionItem.Preference.JavaInstalledJREs.LABEL); - pref.button(IDELabel.Button.ADD).click(); - bot.shell("Add JRE").activate(); - SWTBot add = bot.shell("Add JRE").bot(); - add.button(IDELabel.Button.NEXT).click(); - add.text(0).setText(jreHome); - add.text(1).setText(vmName); - open.finish(add); + if (!pref.table().containsItem(vmName)){ + pref.button(IDELabel.Button.ADD).click(); + bot.shell("Add JRE").activate(); + SWTBot add = bot.shell("Add JRE").bot(); + add.button(IDELabel.Button.NEXT).click(); + add.text(0).setText(jreHome); + add.text(1).setText(vmName); + open.finish(add); + } + else{ + log.info("Java Virtual Machine: " + vmName + " already exists\nNo JVM were added"); + } open.finish(pref,IDELabel.Button.OK); } Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2011-08-26 03:02:04 UTC (rev 34332) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2011-08-26 06:35:25 UTC (rev 34333) @@ -544,10 +544,9 @@ int iStartIndex = 0; int iRow = 0; if (editorText != null && editorText.length() > 0 && editorText.contains(textToSelect)){ - String[] editorLines = editorText.split("\n"); int iOccurenceIndex = 0; - while (!found && iRow < editorLines.length){ - String lineText = editorLines[iRow]; + while (!found && iRow < editor.getLineCount()){ + String lineText = editor.getTextOnLine(iRow); iStartIndex = 0; while (!found && lineText.contains(textToSelect)){ if (iOccurenceIndex == textToSelectIndex){ 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-08-26 03:02:04 UTC (rev 34332) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2011-08-26 06:35:25 UTC (rev 34333) @@ -4,11 +4,15 @@ import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.util.Arrays; import java.util.List; +import java.util.Properties; import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Status; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; @@ -18,6 +22,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.test.TestProperties; import org.jboss.tools.ui.bot.ext.SWTBotExt; import org.jboss.tools.ui.bot.ext.SWTJBTExt; import org.jboss.tools.ui.bot.ext.SWTTestExt; @@ -51,7 +56,9 @@ perspective="Web Development" ) public abstract class VPEAutoTestCase extends JBTSWTBotTestCase { - + + protected static Properties projectProperties; + protected static String PROJECT_PROPERTIES = "projectProperties.properties"; 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 JSF2_TEST_PAGE = "inputname.xhtml"; //$NON-NLS-1$ @@ -59,7 +66,50 @@ protected final static String JBT_TEST_PROJECT_NAME = "JBIDETestProject"; //$NON-NLS-1$ protected final static String FACELETS_TEST_PROJECT_NAME = "FaceletsTestProject"; //$NON-NLS-1$ protected final static String JSF2_TEST_PROJECT_NAME = "JSF2TestProject"; //$NON-NLS-1$ + 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; + static { + try { + InputStream inputStream = VPEAutoTestCase.class + .getResourceAsStream("/" + PROJECT_PROPERTIES); //$NON-NLS-1$ + projectProperties = new TestProperties(); + projectProperties.load(inputStream); + inputStream.close(); + } catch (IOException e) { + IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, + "Can't load properties from " + PROJECT_PROPERTIES + " file", e); //$NON-NLS-1$ //$NON-NLS-2$ + Activator.getDefault().getLog().log(status); + e.printStackTrace(); + } catch (IllegalStateException e) { + IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, + "Property file " + PROJECT_PROPERTIES + " was not found", e); //$NON-NLS-1$ //$NON-NLS-2$ + Activator.getDefault().getLog().log(status); + e.printStackTrace(); + } + // 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{ + throw new RuntimeException("Runtime for JSF2 is not specified"); + } + } + /** * @see #clearWorkbench() * @see #createJSFProject(String) @@ -575,30 +625,56 @@ * @param jsf2ProjectName * - name of created project */ - protected void createJSF2Project(String jsf2ProjectName) { - SWTBot wiz = open - .newObject(ActionItem.NewObject.JBossToolsWebJSFJSFProject.LABEL); - wiz.textWithLabel(IDELabel.NewJsfProjectDialog.PROJECT_NAME_LABEL) - .setText(jsf2ProjectName); - wiz.comboBoxWithLabel( - IDELabel.NewJsfProjectDialog.JSF_ENVIRONMENT_LABEL) - .setSelection("JSF 2.0");//$NON-NLS-1$ - wiz.comboBoxWithLabel(IDELabel.NewJsfProjectDialog.TEMPLATE_LABEL) - .setSelection("JSFKickStartWithoutLibs");//$NON-NLS-1$ - wiz.button(IDELabel.Button.NEXT).click(); - wiz.comboBoxWithLabel("Runtime:*").setSelection( - SWTTestExt.configuredState.getServer().name); - delay(); - bot.button(IDELabel.Button.FINISH).click(); - try { - bot.button(IDELabel.Button.YES).click(); - openErrorLog(); - openPackageExplorer(); - } catch (WidgetNotFoundException e) { - } + protected void createJSF2Project(String jsf2ProjectName) { + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + try { + tree.getTreeItem(JSF2_TEST_PROJECT_NAME); + } catch (WidgetNotFoundException wnfe) { + SWTBot wiz = open + .newObject(ActionItem.NewObject.JBossToolsWebJSFJSFProject.LABEL); + wiz.textWithLabel(IDELabel.NewJsfProjectDialog.PROJECT_NAME_LABEL) + .setText(jsf2ProjectName); + wiz.comboBoxWithLabel(IDELabel.NewJsfProjectDialog.JSF_ENVIRONMENT_LABEL) + .setSelection("JSF 2.0");//$NON-NLS-1$ + wiz.comboBoxWithLabel(IDELabel.NewJsfProjectDialog.TEMPLATE_LABEL) + .setSelection("JSFKickStartWithoutLibs");//$NON-NLS-1$ + wiz.button(IDELabel.Button.NEXT).click(); + try { + wiz.comboBoxWithLabel(IDELabel.NewJsfProjectDialog.RUNTIME_LABEL) + .setSelection(JBOSS_AS_FOR_JSF2_SERVER_RUNTIME_TYPE); + delay(); + wiz.button(IDELabel.Button.FINISH).click(); + try { + wiz.button(IDELabel.Button.YES).click(); + openErrorLog(); + openPackageExplorer(); + } catch (WidgetNotFoundException wnfe1) { + } + } catch (Exception e) { + bot.button(0).click(); + SWTBotTree innerTree = wiz.tree(); + delay(); + innerTree.expandNode(JBOSS_AS_FOR_JSF2_SERVER_GROUP).select( + JBOSS_AS_FOR_JSF2_SERVER_RUNTIME_TYPE); + delay(); + wiz.button(IDELabel.Button.NEXT).click(); + wiz.textWithLabel(IDELabel.NewJsfProjectDialog.HOME_DIRECTORY_LABEL) + .setText(JBOSS_AS_FOR_JSF2_HOME); + wiz.button(IDELabel.Button.FINISH).click(); + delay(); + wiz.button(IDELabel.Button.FINISH).click(); + try { + wiz.button(IDELabel.Button.YES).click(); + openErrorLog(); + openPackageExplorer(); + } catch (WidgetNotFoundException e2) { + } + } + waitForBlockingJobsAcomplished(60 * 1000L, BUILDING_WS); + setException(null); + } - waitForBlockingJobsAcomplished(60 * 1000L, BUILDING_WS); - setException(null); - } + } }