Author: vpakan(a)redhat.com Date: 2012-02-07 14:59:10 -0500 (Tue, 07 Feb 2012) New Revision: 38481 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/RemoveUnknownTemplate.xml trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.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/JBIDE3579Test.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.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 Log: Fixes for 3.3.Beta1 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/RemoveUnknownTemplate.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/RemoveUnknownTemplate.xml 2012-02-07 19:32:48 UTC (rev 38480) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/RemoveUnknownTemplate.xml 2012-02-07 19:59:10 UTC (rev 38481) @@ -16,7 +16,7 @@ <DIV class="__any__tag__caption" style="" title="h:unknowntag" > h:unknowntag </DIV> -<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" > +<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" > </BR> </DIV> <UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" > @@ -43,6 +43,6 @@ </TABLE> </DIV> </DIV> -<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio5.0.0.M3/studio/plugins/org.jboss.tools.vpe_3.3.0.v20110901-0136-H11-M3/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 78px ! important;" > +<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/eclipse/eclipse/plugins/org.jboss.tools.vpe_3.3.0.v20120205-0530-H776-Beta1/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 78px ! important;" > </IMG> </BODY> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml 2012-02-07 19:32:48 UTC (rev 38480) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/SetTemplateForUnknownTag.xml 2012-02-07 19:59:10 UTC (rev 38481) @@ -16,7 +16,7 @@ <B class="__any__tag__caption" style="color: black; font-family: Arial;" title="h:unknowntag" > myValue </B> -<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" > +<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" > </BR> </B> <UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" > @@ -43,6 +43,6 @@ </TABLE> </DIV> </DIV> -<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio5.0.0.M3/studio/plugins/org.jboss.tools.vpe_3.3.0.v20110901-0136-H11-M3/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 77px ! important;" > +<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/eclipse/eclipse/plugins/org.jboss.tools.vpe_3.3.0.v20120205-0530-H776-Beta1/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 77px ! important;" > </IMG> </BODY> \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml 2012-02-07 19:32:48 UTC (rev 38480) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/templates/UnknownTemplate.xml 2012-02-07 19:59:10 UTC (rev 38481) @@ -9,14 +9,14 @@ <DIV title="f:view" > <H1 style="-moz-user-modify: read-write;" title="h1" > <SPAN class="vpe-text" title="h:outputText value: #{Message.header}" > - Hello Demo Application +Hello Demo Application </SPAN> </H1> <DIV style="-moz-user-modify: read-only; border: 1px solid green;" title="h:unknowntag" > <DIV class="__any__tag__caption" style="" title="h:unknowntag" > h:unknowntag </DIV> -<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" > +<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" > </BR> </DIV> <UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" > @@ -43,6 +43,6 @@ </TABLE> </DIV> </DIV> -<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio5.0.0.M3/studio/plugins/org.jboss.tools.vpe_3.3.0.v20110901-0136-H11-M3/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 17px ! important;" > +<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/eclipse/eclipse/plugins/org.jboss.tools.vpe_3.3.0.v20120205-0530-H776-Beta1/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 17px ! important;" > </IMG> </BODY> \ 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/cssdialog/jbide/JBIDE3148and4441Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java 2012-02-07 19:32:48 UTC (rev 38480) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java 2012-02-07 19:59:10 UTC (rev 38481) @@ -20,11 +20,9 @@ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); SWTBotTree tree = innerBot.tree(); try { - tree.expandNode(JBT_TEST_PROJECT_NAME). //$NON-NLS-1$ - getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$ - bot.editorByTitle(CSS_FILE_NAME+".css").setFocus(); //$NON-NLS-1$ - bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$//$NON-NLS-2$ - bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ + tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent"). //$NON-NLS-1$ + getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$ + bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().setText("@CHARSET \"UTF-8\";"); } catch (WidgetNotFoundException e) { tree.getTreeItem(JBT_TEST_PROJECT_NAME).select(); //$NON-NLS-1$ open.newObject(ActionItem.NewObject.WebCSS.LABEL); @@ -41,7 +39,6 @@ eclipseEditor.save(); eclipseEditor.contextMenu("Open CSS Dialog").click(); //$NON-NLS-1$ //Test edit attrs of the first Class - bot.shell("CSS Class").activate(); //$NON-NLS-1$ bot.comboBoxWithLabel("Style class:").setSelection(CSS_CLASS_NAME); //$NON-NLS-1$ bot.tabItem("Text/Font").activate(); //$NON-NLS-1$ 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 2012-02-07 19:32:48 UTC (rev 38480) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java 2012-02-07 19:59:10 UTC (rev 38481) @@ -20,11 +20,9 @@ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); SWTBotTree tree = innerBot.tree(); try { - tree.expandNode(JBT_TEST_PROJECT_NAME). //$NON-NLS-1$ - getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$ - bot.editorByTitle(CSS_FILE_NAME+".css").setFocus(); //$NON-NLS-1$ - bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$ //$NON-NLS-2$ - bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$//$NON-NLS-2$ + tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent"). //$NON-NLS-1$ + getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$ + bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().setText("@CHARSET \"UTF-8\";"); } catch (WidgetNotFoundException e) { tree.getTreeItem(JBT_TEST_PROJECT_NAME).select(); //$NON-NLS-1$ open.newObject(ActionItem.NewObject.WebCSS.LABEL); Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java 2012-02-07 19:32:48 UTC (rev 38480) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java 2012-02-07 19:59:10 UTC (rev 38481) @@ -20,11 +20,9 @@ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); SWTBotTree tree = innerBot.tree(); try { - tree.expandNode(JBT_TEST_PROJECT_NAME). //$NON-NLS-1$ - getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$ - bot.editorByTitle(CSS_FILE_NAME+".css").setFocus(); //$NON-NLS-1$ - bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$//$NON-NLS-2$ - bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ + tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent"). //$NON-NLS-1$ + getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$ + bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().setText("@CHARSET \"UTF-8\";"); } catch (WidgetNotFoundException e) { tree.getTreeItem(JBT_TEST_PROJECT_NAME).select(); //$NON-NLS-1$ open.newObject(ActionItem.NewObject.WebCSS.LABEL); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java 2012-02-07 19:32:48 UTC (rev 38480) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java 2012-02-07 19:59:10 UTC (rev 38481) @@ -17,11 +17,9 @@ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); SWTBotTree tree = innerBot.tree(); try { - tree.expandNode(JBT_TEST_PROJECT_NAME). //$NON-NLS-1$ - getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$ - bot.editorByTitle(CSS_FILE_NAME+".css").setFocus(); //$NON-NLS-1$ - bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$//$NON-NLS-2$ - bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ + tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent"). //$NON-NLS-1$ + getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$ + bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().setText("@CHARSET \"UTF-8\";"); } catch (WidgetNotFoundException e) { tree.getTreeItem(JBT_TEST_PROJECT_NAME).select(); //$NON-NLS-1$ open.newObject(ActionItem.NewObject.WebCSS.LABEL); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ 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 2012-02-07 19:32:48 UTC (rev 38480) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java 2012-02-07 19:59:10 UTC (rev 38481) @@ -14,17 +14,14 @@ private static String CSS_CLASS_NAME = "cssclass"; //$NON-NLS-1$ public void testJBIDE4391(){ - //Test Create new CSS file SWTBot innerBot= bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); SWTBotTree tree = innerBot.tree(); try { - tree.expandNode(JBT_TEST_PROJECT_NAME). //$NON-NLS-1$ - getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$ - bot.editorByTitle(CSS_FILE_NAME+".css").setFocus(); //$NON-NLS-1$ - bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$ //$NON-NLS-2$ - bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ + tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent"). //$NON-NLS-1$ + getNode(CSS_FILE_NAME+".css").doubleClick(); //$NON-NLS-1$ + bot.editorByTitle(CSS_FILE_NAME+".css").toTextEditor().setText("@CHARSET \"UTF-8\";"); } catch (WidgetNotFoundException e) { tree.getTreeItem(JBT_TEST_PROJECT_NAME).select(); //$NON-NLS-1$ open.newObject(ActionItem.NewObject.WebCSS.LABEL);; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ @@ -40,7 +37,6 @@ eclipseEditor.contextMenu("Open CSS Dialog").click(); //$NON-NLS-1$ //Test incorrect attribute - bot.shell("CSS Class").activate(); //$NON-NLS-1$ bot.comboBoxWithLabel("Style class:").setSelection(CSS_CLASS_NAME); //$NON-NLS-1$ bot.tabItem("Text/Font").activate(); //$NON-NLS-1$ @@ -50,7 +46,6 @@ 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$ - } @Override 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 2012-02-07 19:32:48 UTC (rev 38480) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/CodeCompletionTest.java 2012-02-07 19:59:10 UTC (rev 38481) @@ -347,7 +347,7 @@ editor.save(); bot.sleep(Timing.time1S()); Assertions.assertSourceEditorContains(editor.getText(), - textToInsert + useCodeAssist + "}" + textToInsertAtEnd, + textToInsert + useCodeAssist + "}\"" + textToInsertAtEnd, FACELETS_TEST_PAGE); } /**