Author: yzhishko Date: 2009-08-26 15:21:00 -0400 (Wed, 26 Aug 2009) New Revision: 17281 Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionHelloPage.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionTestPage.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionHelloPage.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionTestPage.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/DumpedTestPage.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideResourceBundlesUsageasELExpressions.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowResourceBundlesUsageasELExpressions.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/PageDesignTestCase.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java Removed: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestLinesToggle.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestToggle.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/CommentTestUntoggle.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/DumpedTestPage.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideBorderForUnknownTag.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideResourceBundlesUsageasELExpressions.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowBorderForUnknownTag.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowNonVisualTags.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowResourceBundlesUsageasELExpressions.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestToggle.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/VerificationOfNameSpaces.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE4306Test.java Modified: workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestUtil.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllTests.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java Log: Modified: workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java =================================================================== --- workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -175,7 +175,7 @@ protected void openPackageExplorer() { try { - bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER); + bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).setFocus(); } catch (WidgetNotFoundException e) { bot.menu("Window").menu("Show View").menu("Other...").click(); SWTBotTree viewTree = bot.tree(); @@ -204,15 +204,15 @@ protected void waitForJobs(){ delay(); - while (!Job.getJobManager().isIdle()) { - Job[] jobs = Job.getJobManager().find(null); - for (Job job : jobs) { - if ("Updating indexes".equals(job.getName())) { - job.cancel(); - } - } - delay(); - } + while (!Job.getJobManager().isIdle()) { + Job[] jobs = Job.getJobManager().find(null); + for (Job job : jobs) { + if ("Updating indexes".equals(job.getName())) { + job.cancel(); + } + } + } + setException(null); } } Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestLinesToggle.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestLinesToggle.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestLinesToggle.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,34 +0,0 @@ -<tests> - <test id="bodyId"> - <DIV ID="bodyId"> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;"> -<SPAN CLASS="vpe-text"> -Hello Demo Application -</SPAN> -</H1> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -Name: -</SPAN> -<!--<h:inputText value="#{user.name}" required="true"> - <f:validateLength maximum="30" minimum="3"/> - </h:inputText>--> -<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> - -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> - </test> -</tests> \ No newline at end of file Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestToggle.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestToggle.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestToggle.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,36 +0,0 @@ -<tests> - <test id="bodyId"> - <DIV ID="bodyId"> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;"> -<SPAN CLASS="vpe-text"> -Hello Demo Application -</SPAN> -</H1> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -Name: -</SPAN> -<SPAN CLASS="vpe-text"> -<SPAN CLASS="vpe-text"> -</SPAN> -<INPUT VALUE="#{user.name}"/> - -</SPAN> -<!--<h:commandButton action="hello" value="Say Hello!" />--> -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> - </test> -</tests> \ No newline at end of file Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/CommentTestUntoggle.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/CommentTestUntoggle.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/CommentTestUntoggle.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,37 +0,0 @@ -<tests> - <test id="bodyId"> - <DIV ID="bodyId"> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;"> -<SPAN CLASS="vpe-text"> -Hello Demo Application -</SPAN> -</H1> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -Name: -</SPAN> -<SPAN CLASS="vpe-text"> -<SPAN CLASS="vpe-text"> -</SPAN> -<INPUT VALUE="#{user.name}"/> - -</SPAN> -<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> - -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> - </test> -</tests> \ No newline at end of file Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/DumpedTestPage.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/DumpedTestPage.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/DumpedTestPage.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,43 +0,0 @@ -<BODY ID="__content__area__"> -<!--This comment is of JBIDE-3396 --> -<DIV STYLE="-moz-user-modify: read-write;"> -<DIV STYLE="display: none; -moz-user-modify: read-only;"> -<H1 STYLE="-moz-user-modify: read-write;"> -Input User Name Page -</H1> -</DIV> -<DIV> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;" > -<SPAN CLASS="vpe-text"> -Hello Demo Application -</SPAN> -</H1> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -Name: -</SPAN> -<SPAN CLASS="vpe-text"> -<SPAN CLASS="vpe-text"> -</SPAN> -<INPUT VALUE="#{user.name}"/> - -</SPAN> -<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> - -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> -</DIV> -</BODY> \ No newline at end of file Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideBorderForUnknownTag.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideBorderForUnknownTag.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideBorderForUnknownTag.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,41 +0,0 @@ -<tests> - <test id="bodyId"> - <DIV ID="bodyId"> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;"> -<SPAN CLASS="vpe-text"> -Hello Demo Application -</SPAN> -</H1> -<DIV CLASS="__any__tag__caption" STYLE="-moz-user-modify: read-only;"> -tagunknown<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> - -</DIV> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -Name: -</SPAN> -<SPAN CLASS="vpe-text"> -<SPAN CLASS="vpe-text"> -</SPAN> -<INPUT VALUE="#{user.name}"/> - -</SPAN> -<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> - -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> - </test> -</tests> Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideResourceBundlesUsageasELExpressions.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideResourceBundlesUsageasELExpressions.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideResourceBundlesUsageasELExpressions.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,37 +0,0 @@ -<tests> - <test id="bodyId"> - <DIV ID="bodyId"> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;"> -<SPAN CLASS="vpe-text"> -Hello Demo Application -</SPAN> -</H1> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -Name: -</SPAN> -<SPAN CLASS="vpe-text"> -<SPAN CLASS="vpe-text"> -</SPAN> -<INPUT VALUE="#{user.name}"/> - -</SPAN> -<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> - -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> - </test> -</tests> \ No newline at end of file Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowBorderForUnknownTag.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowBorderForUnknownTag.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowBorderForUnknownTag.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,41 +0,0 @@ -<tests> - <test id="bodyId"> - <DIV ID="bodyId"> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;"> -<SPAN CLASS="vpe-text"> -Hello Demo Application -</SPAN> -</H1> -<DIV CLASS="__any__tag__caption" STYLE="border: 1px solid green; -moz-user-modify: read-only;"> -tagunknown<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> - -</DIV> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -Name: -</SPAN> -<SPAN CLASS="vpe-text"> -<SPAN CLASS="vpe-text"> -</SPAN> -<INPUT VALUE="#{user.name}"/> - -</SPAN> -<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> - -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> - </test> -</tests> \ No newline at end of file Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowNonVisualTags.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowNonVisualTags.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowNonVisualTags.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,80 +0,0 @@ -<BODY ID="__content__area__"> -<!--This comment is of JBIDE-3396 --> -<SPAN> -<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;"> -jsp:directive.taglib -</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> - -</SPAN> -<SPAN> -<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;"> -jsp:directive.taglib -</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> - -</SPAN> -<SPAN> -<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;"> -f:loadBundle -</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> - -</SPAN> -<DIV STYLE="-moz-user-modify: read-write;"> -<DIV STYLE="display: none; -moz-user-modify: read-only;"> -<SPAN> -<H1 STYLE="-moz-user-modify: read-write;"> -Input User Name Page -</H1> -<SPAN CLASS="vpe-text"> -Input User Name Page -</SPAN> -</SPAN> -</DIV> -<DIV> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;"> -<SPAN CLASS="vpe-text"> -Hello Demo Application -</SPAN> -</H1> -<SPAN> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> - -</SPAN> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -Name: -</SPAN> -<SPAN> -<SPAN CLASS="vpe-text"> -<SPAN CLASS="vpe-text"> -</SPAN> -<INPUT VALUE="#{user.name}"/> - -</SPAN> -<SPAN> -<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;"> -f:validateLength -</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> - -</SPAN> -</SPAN> -<SPAN> -<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> -<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> - -</SPAN> -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> -</DIV> -</BODY> \ No newline at end of file Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowResourceBundlesUsageasELExpressions.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowResourceBundlesUsageasELExpressions.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowResourceBundlesUsageasELExpressions.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,37 +0,0 @@ -<tests> - <test id="bodyId"> - <DIV ID="bodyId"> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;"> -<SPAN CLASS="vpe-text"> -#{Message.header} -</SPAN> -</H1> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -#{Message.prompt_message} -</SPAN> -<SPAN CLASS="vpe-text"> -<SPAN CLASS="vpe-text"> -</SPAN> -<INPUT VALUE="#{user.name}"/> - -</SPAN> -<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> - -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> - </test> -</tests> \ No newline at end of file Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestToggle.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestToggle.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestToggle.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,36 +0,0 @@ -<tests> - <test id="bodyId"> - <DIV ID="bodyId"> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;"> -<SPAN CLASS="vpe-text"> -Hello Demo Application -</SPAN> -</H1> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -Name: -</SPAN> -<SPAN CLASS="vpe-text"> -<SPAN CLASS="vpe-text"> -</SPAN> -<INPUT VALUE="#{user.name}"/> - -</SPAN> -<!-- <h:commandButton action="hello" value="Say Hello!" />--> -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> - </test> -</tests> \ No newline at end of file Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/VerificationOfNameSpaces.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/VerificationOfNameSpaces.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/VerificationOfNameSpaces.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,6 +0,0 @@ -<BODY ID="__content__area__"> -<SPAN CLASS="vpe-text"> -... -</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> - -</BODY> \ No newline at end of file Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestLinesToggle.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,34 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<!--<h:inputText value="#{user.name}" required="true"> + <f:validateLength maximum="30" minimum="3"/> + </h:inputText>--> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestToggle.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,36 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<!--<h:commandButton action="hello" value="Say Hello!" />--> +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/CommentTestUntoggle.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,37 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestToggle.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,36 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<!-- <h:commandButton action="hello" value="Say Hello!" />--> +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/VerificationOfNameSpaces.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,6 @@ +<BODY ID="__content__area__"> +<SPAN CLASS="vpe-text"> +... +</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</BODY> \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionHelloPage.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionHelloPage.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionHelloPage.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,28 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H3 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello +</SPAN> +<SPAN CLASS="vpe-text"> +, +</SPAN> +<SPAN CLASS="vpe-text"> +Any Name +</SPAN> +<SPAN CLASS="vpe-text"> +! +</SPAN> +</H3> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionTestPage.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionTestPage.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionTestPage.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,37 @@ +<tests> + <test id="bodyId"> + <DIV id="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="Any Name"/> + +</SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionHelloPage.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionHelloPage.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionHelloPage.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,28 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H3 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello +</SPAN> +<SPAN CLASS="vpe-text"> +, +</SPAN> +<SPAN CLASS="vpe-text"> +#{user.name} +</SPAN> +<SPAN CLASS="vpe-text"> +! +</SPAN> +</H3> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionTestPage.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionTestPage.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionTestPage.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,37 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/DumpedTestPage.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/DumpedTestPage.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/DumpedTestPage.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/DumpedTestPage.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,43 @@ +<BODY ID="__content__area__"> +<!--This comment is of JBIDE-3396 --> +<DIV STYLE="-moz-user-modify: read-write;"> +<DIV STYLE="display: none; -moz-user-modify: read-only;"> +<H1 STYLE="-moz-user-modify: read-write;"> +Input User Name Page +</H1> +</DIV> +<DIV> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;" > +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> +</DIV> +</BODY> \ No newline at end of file Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideBorderForUnknownTag.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,41 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<DIV CLASS="__any__tag__caption" STYLE="-moz-user-modify: read-only;"> +tagunknown<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</DIV> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideResourceBundlesUsageasELExpressions.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideResourceBundlesUsageasELExpressions.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideResourceBundlesUsageasELExpressions.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideResourceBundlesUsageasELExpressions.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,37 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowBorderForUnknownTag.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,41 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<DIV CLASS="__any__tag__caption" STYLE="border: 1px solid green; -moz-user-modify: read-only;"> +tagunknown<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</DIV> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowNonVisualTags.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,80 @@ +<BODY ID="__content__area__"> +<!--This comment is of JBIDE-3396 --> +<SPAN> +<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;"> +jsp:directive.taglib +</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</SPAN> +<SPAN> +<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;"> +jsp:directive.taglib +</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</SPAN> +<SPAN> +<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;"> +f:loadBundle +</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</SPAN> +<DIV STYLE="-moz-user-modify: read-write;"> +<DIV STYLE="display: none; -moz-user-modify: read-only;"> +<SPAN> +<H1 STYLE="-moz-user-modify: read-write;"> +Input User Name Page +</H1> +<SPAN CLASS="vpe-text"> +Input User Name Page +</SPAN> +</SPAN> +</DIV> +<DIV> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<SPAN> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</SPAN> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<SPAN> +<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;"> +f:validateLength +</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</SPAN> +</SPAN> +<SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> +<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</SPAN> +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> +</DIV> +</BODY> \ No newline at end of file Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowResourceBundlesUsageasELExpressions.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowResourceBundlesUsageasELExpressions.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowResourceBundlesUsageasELExpressions.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowResourceBundlesUsageasELExpressions.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,37 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +#{Message.header} +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +#{Message.prompt_message} +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,3 +1,3 @@ JSFProjectName=JBIDETestProject Apachev6.0=D\:/Java/apache-tomcat-6.0.18 -JBossEap4.3=C\:/jbdevstudioRelease/jboss-eap/jboss-as \ No newline at end of file +JBossEap4.3=C\:/jbdevstudio200ga/jboss-eap/jboss-as \ No newline at end of file Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestUtil.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestUtil.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestUtil.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -11,7 +11,6 @@ package org.jboss.tools.vpe.ui.bot.test; import junit.framework.Assert; -import org.eclipse.swt.widgets.Display; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.VpeEditorPart; @@ -33,11 +32,6 @@ public static VpeController getVpeController(JSPMultiPageEditor part) { VpeEditorPart visualEditor = (VpeEditorPart) part.getVisualEditor(); - while(visualEditor.getController()==null) { - if (!Display.getCurrent().readAndDispatch()) { - Display.getCurrent().sleep(); - } - } return visualEditor.getController(); } Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllTests.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllTests.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllTests.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -7,13 +7,13 @@ import org.jboss.tools.vpe.ui.bot.test.editor.BlockCommentTest; import org.jboss.tools.vpe.ui.bot.test.editor.ToggleCommentTest; import org.jboss.tools.vpe.ui.bot.test.editor.VerificationOfNameSpacesTest; +import org.jboss.tools.vpe.ui.bot.test.editor.pagedesign.AddSubstitutedELExpressionFolderScopeTest; import org.jboss.tools.vpe.ui.bot.test.editor.preferences.AlwaysHideSelectionBarWithoutPromptTest; import org.jboss.tools.vpe.ui.bot.test.editor.preferences.BorderForUnknownTagsTest; import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ChangeEditorTabForTheFirstOpenPageTest; import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowNonVisualTagsTest; import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowResourceBundlesUsageasELexpressionsTest; import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowSelectionTagBarTest; -import org.jboss.tools.vpe.ui.bot.test.jbide.JBIDE4306Test; import org.jboss.tools.vpe.ui.bot.test.jbide.JBIDE4556Test; import org.jboss.tools.vpe.ui.bot.test.palette.CancelTagLibDefenitionTest; import org.jboss.tools.vpe.ui.bot.test.palette.ImportTagsFromTLDFileTest; @@ -25,15 +25,15 @@ suite.addTestSuite(ImportTagsFromTLDFileTest.class); suite.addTestSuite(ToggleCommentTest.class); suite.addTestSuite(BlockCommentTest.class); - suite.addTestSuite(JBIDE4306Test.class); + suite.addTestSuite(ChangeEditorTabForTheFirstOpenPageTest.class); suite.addTestSuite(JBIDE4556Test.class); - suite.addTestSuite(ChangeEditorTabForTheFirstOpenPageTest.class); suite.addTestSuite(VerificationOfNameSpacesTest.class); suite.addTestSuite(BorderForUnknownTagsTest.class); suite.addTestSuite(ShowResourceBundlesUsageasELexpressionsTest.class); suite.addTestSuite(ShowSelectionTagBarTest.class); suite.addTestSuite(AlwaysHideSelectionBarWithoutPromptTest.class); suite.addTestSuite(ShowNonVisualTagsTest.class); + suite.addTestSuite(AddSubstitutedELExpressionFolderScopeTest.class); return new TestSetup(suite); } } Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -29,13 +29,14 @@ protected static Properties projectProperties; protected static final String TEST_PAGE = "inputUserName.jsp"; - public static String PROJECT_PROPERTIES = "projectProperties.properties"; + protected static String PROJECT_PROPERTIES = "projectProperties.properties"; /** * Variable defines JBoss EAP 4.3 server location on a file system */ - public static String JBOSS_EAP_HOME; + protected static String JBOSS_EAP_HOME; + protected static String JBT_TEST_PROJECT_NAME; /* (non-Javadoc) * This static block read properties from @@ -55,6 +56,7 @@ fail("Property file " + PROJECT_PROPERTIES + " was not found"); } JBOSS_EAP_HOME = System.getProperty("jbosstools.test.jboss.home",projectProperties.getProperty("JBossEap4.3")); + JBT_TEST_PROJECT_NAME = projectProperties.getProperty("JSFProjectName"); } /** @@ -68,9 +70,9 @@ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); SWTBotTree tree = innerBot.tree(); try { - tree.getTreeItem(projectProperties.getProperty("JSFProjectName")); + tree.getTreeItem(JBT_TEST_PROJECT_NAME); } catch (WidgetNotFoundException e) { - createJSFProject(projectProperties.getProperty("JSFProjectName")); + createJSFProject(JBT_TEST_PROJECT_NAME); } } @@ -93,6 +95,7 @@ protected void createJSFProject(String jsfProjectName){ bot.menu("File").menu("New").menu("Other...").click(); + bot.shell("New").activate(); SWTBotTree tree = bot.tree(); waitForJobs(); tree.expandNode("JBoss Tools Web").expandNode("JSF").select("JSF Project"); Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -3,39 +3,28 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; -import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; -import org.eclipse.swtbot.swt.finder.SWTBot; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.jboss.tools.ui.bot.test.WidgetVariables; -import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; -public class BlockCommentTest extends VPEAutoTestCase{ +public class BlockCommentTest extends VPEEditorTestCase{ - private static String textEditor; - private static SWTBotEclipseEditor editor; - public void testBlockComment() throws Throwable{ //Test open page - SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); - SWTBotTree tree = innerBot.tree(); - tree.expandNode(projectProperties.getProperty("JSFProjectName")) - .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); + openPage(); - editor = bot.editorByTitle(TEST_PAGE).toTextEditor(); - textEditor = editor.getText(); + setEditor(bot.editorByTitle(TEST_PAGE).toTextEditor()); + setEditorText(getEditor().getText()); //Test add block comment from Source menu - editor.navigateTo(22,22); + getEditor().navigateTo(22,22); bot.menu("Source").menu("Add Block Comment").click(); waitForJobs(); checkVPE("BlockCommentTestToggle.xml"); //Test remove block comment from Source menu - editor.navigateTo(22,22); + getEditor().navigateTo(22,22); bot.menu("Source").menu("Remove Block Comment").click(); waitForJobs(); checkVPE("CommentTestUntoggle.xml"); @@ -43,68 +32,48 @@ //Test add block comment with CTRL+SHIFT+/ hot keys - editor.navigateTo(22,22); + getEditor().navigateTo(22,22); pressBlockCommentHotKeys(); waitForJobs(); checkVPE("BlockCommentTestToggle.xml"); //Test remove block comment with CTRL+SHIFT+\ hot keys - editor.navigateTo(22,22); + getEditor().navigateTo(22,22); pressUnBlockCommentHotKeys(); waitForJobs(); checkVPE("CommentTestUntoggle.xml"); //Test add block comment lines from Source menu - editor.navigateTo(18,22); + getEditor().navigateTo(18,22); bot.menu("Source").menu("Add Block Comment").click(); waitForJobs(); checkVPE("BlockCommentTestLinesToggle.xml"); //Test remove block comment lines from Source menu - editor.navigateTo(18,22); + getEditor().navigateTo(18,22); bot.menu("Source").menu("Remove Block Comment").click(); waitForJobs(); checkVPE("CommentTestUntoggle.xml"); //Test add block comment lines with CTRL+SHIFT+/ hot keys - editor.navigateTo(18,22); + getEditor().navigateTo(18,22); bot.menu("Source").menu("Add Block Comment").click(); waitForJobs(); checkVPE("BlockCommentTestLinesToggle.xml"); //Test remove block comment lines with CTRL+SHIFT+/ hot keys - editor.navigateTo(18,22); + getEditor().navigateTo(18,22); bot.menu("Source").menu("Remove Block Comment").click(); waitForJobs(); checkVPE("CommentTestUntoggle.xml"); } - - @Override - protected void closeUnuseDialogs() { - } - - @Override - protected boolean isUnuseDialogOpened() { - return false; - } - - private void checkVPE(String testPage) throws Throwable{ - editor.selectLine(9); - if (!"<body id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) { - editor.insertText("<body id=\"bodyId\">"); - } - editor.save(); - waitForJobs(); - performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE)); - } - private void pressBlockCommentHotKeys(){ bot.getDisplay().syncExec(new Runnable() { public void run() { @@ -169,20 +138,4 @@ }); } - @Override - protected void tearDown() throws Exception { - - //Restore page state before tests - - editor.setFocus(); - bot.menu("Edit").menu("Select All").click(); - bot.menu("Edit").menu("Delete").click(); - editor.setText(textEditor); - editor.save(); - waitForJobs(); - editor.close(); - super.tearDown(); - } - - } Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -3,32 +3,21 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; -import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; -import org.eclipse.swtbot.swt.finder.SWTBot; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.jboss.tools.ui.bot.test.WidgetVariables; -import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; -public class ToggleCommentTest extends VPEAutoTestCase{ +public class ToggleCommentTest extends VPEEditorTestCase{ - private static String textEditor; - private static SWTBotEclipseEditor editor; - public void testToggleComment() throws Throwable{ //Test open page - SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); - SWTBotTree tree = innerBot.tree(); - tree.expandNode(projectProperties.getProperty("JSFProjectName")) - .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); - - editor = bot.editorByTitle(TEST_PAGE).toTextEditor(); - textEditor = editor.getText(); + openPage(); + + setEditor(bot.editorByTitle(TEST_PAGE).toTextEditor()); + setEditorText(getEditor().getText()); //Test toggle comment from Source menu - editor.navigateTo(22,22); + getEditor().navigateTo(22,22); bot.menu("Source").menu("Toggle Comment").click(); waitForJobs(); checkSelectionBar("#comment"); @@ -36,7 +25,7 @@ //Test untoggle comment from Source menu - editor.navigateTo(22,22); + getEditor().navigateTo(22,22); bot.menu("Source").menu("Toggle Comment").click(); waitForJobs(); checkSelectionBar("h:commandButton"); @@ -44,7 +33,7 @@ //Test toggle comment with CTRL+SHIFT+C hot keys - editor.navigateTo(22,22); + getEditor().navigateTo(22,22); pressToggleCommentHotKeys(); waitForJobs(); checkSelectionBar("#comment"); @@ -52,7 +41,7 @@ //Test untoggle comment with CTRL+SHIFT hot keys - editor.navigateTo(22,22); + getEditor().navigateTo(22,22); pressToggleCommentHotKeys(); waitForJobs(); checkSelectionBar("h:commandButton"); @@ -60,16 +49,6 @@ } - private void checkVPE(String testPage) throws Throwable{ - editor.selectLine(9); - if (!"<body id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) { - editor.insertText("<body id=\"bodyId\">"); - } - editor.save(); - waitForJobs(); - performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE)); - } - private void pressToggleCommentHotKeys(){ bot.getDisplay().syncExec(new Runnable() { public void run() { @@ -102,31 +81,6 @@ }); } - @Override - protected void closeUnuseDialogs() { - - } - - @Override - protected boolean isUnuseDialogOpened() { - return false; - } - - @Override - protected void tearDown() throws Exception { - - //Restore page state before tests - - editor.setFocus(); - bot.menu("Edit").menu("Select All").click(); - bot.menu("Edit").menu("Delete").click(); - editor.setText(textEditor); - editor.save(); - waitForJobs(); - editor.close(); - super.tearDown(); - } - private void checkSelectionBar (String... args){ for (int i = 0; i < args.length; i++) { bot.toolbarButton(args[i]).click(); Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,81 @@ +package org.jboss.tools.vpe.ui.bot.test.editor; + +import java.io.IOException; + +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.Platform; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.ui.bot.test.WidgetVariables; +import org.jboss.tools.vpe.ui.bot.test.Activator; +import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; + +public abstract class VPEEditorTestCase extends VPEAutoTestCase{ + + private String editorText; + private SWTBotEclipseEditor editor; + + String getEditorText() { + return editorText; + } + + void setEditorText(String textEditor) { + this.editorText = textEditor; + } + + SWTBotEclipseEditor getEditor() { + return editor; + } + + void setEditor(SWTBotEclipseEditor editor) { + this.editor = editor; + } + + @Override + protected boolean isUnuseDialogOpened() { + return false; + } + + @Override + protected void closeUnuseDialogs() { + } + + @Override + protected String getPathToResources(String testPage) throws IOException { + return FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"resources/editor/"+testPage; + } + + void openPage(){ + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + tree.expandNode(JBT_TEST_PROJECT_NAME) + .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); + } + + void checkVPE(String testPage) throws Throwable{ + editor.selectLine(9); + if (!"<body id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) { + editor.insertText("<body id=\"bodyId\">"); + } + editor.save(); + waitForJobs(); + performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE)); + } + + @Override + protected void tearDown() throws Exception { + + //Restore page state before tests + + editor.setFocus(); + bot.menu("Edit").menu("Select All").click(); + bot.menu("Edit").menu("Delete").click(); + editor.setText(editorText); + editor.save(); + waitForJobs(); + editor.close(); + super.tearDown(); + } + +} Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,73 +1,37 @@ package org.jboss.tools.vpe.ui.bot.test.editor; -import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; -import org.eclipse.swtbot.swt.finder.SWTBot; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.jboss.tools.ui.bot.test.WidgetVariables; -import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; +public class VerificationOfNameSpacesTest extends VPEEditorTestCase{ -public class VerificationOfNameSpacesTest extends VPEAutoTestCase{ - - private static String textEditor; private static String testText = "<jsp:root\n" + "xmlns:jsp=\"http://java.sun.com/JSP/Page\n" + "xmlns:public=\"http://www.jspcentral.com/tags\"\n" + "version=\"1.2\">\n" + "...\n" + "</jsp:root>"; - private static SWTBotEclipseEditor editor; public void testVerificationOfNameSpaces() throws Throwable{ //Test open page - SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); - SWTBotTree tree = innerBot.tree(); - tree.expandNode(projectProperties.getProperty("JSFProjectName")) - .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); + openPage(); - editor = bot.editorByTitle(TEST_PAGE).toTextEditor(); - textEditor = editor.getText(); + setEditor(bot.editorByTitle(TEST_PAGE).toTextEditor()); + setEditorText(getEditor().getText()); //Test clear source - editor.setFocus(); + getEditor().setFocus(); bot.menu("Edit").menu("Select All").click(); waitForJobs(); bot.menu("Edit").menu("Delete").click(); //Test insert test text - editor.setText(testText); - editor.save(); + getEditor().setText(testText); + getEditor().save(); waitForJobs(); performContentTestByDocument("VerificationOfNameSpaces.xml", bot.multiPageEditorByTitle(TEST_PAGE)); } - @Override - protected void closeUnuseDialogs() { - - } - - @Override - protected boolean isUnuseDialogOpened() { - return false; - } - - @Override - protected void tearDown() throws Exception { - - //Restore page state before tests - - editor.setFocus(); - bot.menu("Edit").menu("Select All").click(); - bot.menu("Edit").menu("Delete").click(); - editor.setText(textEditor); - editor.save(); - waitForJobs(); - editor.close(); - super.tearDown(); - } - } Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,169 @@ +package org.jboss.tools.vpe.ui.bot.test.editor.pagedesign; + +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.ui.bot.test.WidgetVariables; + +public class AddSubstitutedELExpressionFolderScopeTest extends SubstitutedELTestCase{ + + private static final String TEST_PAGE_FOR_FOLDER = "testPage"; + private static final String TEST_FOLDER = "testFolder"; + + //Do not edit this variable as test will fail + private static final String EL_VALUE = "Any Name"; + + public void testAddSubstitutedELExpressionFolderScope() throws Throwable{ + + //Test open page + openPage(); + setEditor(bot.editorByTitle(TEST_PAGE).toTextEditor()); + setEditorText(getEditor().getText()); + + //Test create new folder + + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") + .select(); + + bot.menu("File").menu("New").menu("Folder").click(); + + bot.shell("New Folder").activate(); + bot.textWithLabel("Folder name:").setText(TEST_FOLDER); + bot.button("Finish").click(); + + //Test create page in new folder + + innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") + .getNode(TEST_FOLDER).select(); + + bot.menu("File").menu("New").menu("JSP File").click(); + + bot.shell("New File JSP").activate(); + bot.textWithLabel("Name*").setText(TEST_PAGE_FOR_FOLDER); + bot.button("Finish").click(); + waitForJobs(); + SWTBotEclipseEditor editorForTestPage = bot.editorByTitle(TEST_PAGE_FOR_FOLDER+".jsp").toTextEditor(); + editorForTestPage.setText(getEditorText()); + editorForTestPage.save(); + editorForTestPage.close(); + bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).setFocus(); + bot.editorByTitle(TEST_PAGE).setFocus(); + + //Test open Page Design Options + + bot.toolbarButtonWithTooltip(PAGE_DESIGN).click(); + bot.shell(PAGE_DESIGN).activate(); + + //Test choose Substituted EL tab + + bot.tabItem(SUBSTITUTED_EL).activate(); + + //Clear EL table + clearELTable(bot.table()); + + //Test add EL with folder scope to list + + bot.button("Add").click(); + bot.shell(ADD_EL).activate(); + bot.textWithLabel("El Name*").setText("user.name"); + bot.textWithLabel("Value").setText(EL_VALUE); + bot.radio("Folder: Any Page at the Same Folder").click(); + bot.button("Finish").click(); + + //Test check table with ELs + + bot.shell(PAGE_DESIGN).activate(); + SWTBotTable table = bot.table(); + String elName = table.cell(0, "El Expression"); + String scope = table.cell(0, "Scope"); + String elValue = table.cell(0, "Value"); + assertEquals("user.name",elName); + assertEquals("Folder",scope); + assertEquals(EL_VALUE, elValue); + + //Test close Design Options + + bot.button("OK").click(); + waitForJobs(); + + //Check page content + + checkVPEForTestPage("AddSubstitutedELExpressionTestPage.xml"); + checkVPEForHelloPage("AddSubstitutedELExpressionHelloPage.xml"); + checkVPEForTestPageFolder("RemoveSubstitutedELExpressionTestPage.xml"); + + //Test check the page in the same folder + + + + //Test open Page Design Options + + bot.toolbarButtonWithTooltip(PAGE_DESIGN).click(); + bot.shell(PAGE_DESIGN).activate(); + + //Test choose Substituted EL tab + + bot.tabItem(SUBSTITUTED_EL).activate(); + + //Delete item + + bot.table().select(0); + bot.button("Remove").click(); + bot.button("OK").click(); + + //Check VPE content + + checkVPEForTestPage("RemoveSubstitutedELExpressionTestPage.xml"); + checkVPEForHelloPage("RemoveSubstitutedELExpressionHelloPage.xml"); + checkVPEForTestPageFolder("RemoveSubstitutedELExpressionTestPage.xml"); + } + + @Override + protected void tearDown() throws Exception { + bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).setFocus(); + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") + .getNode(TEST_FOLDER).select(); + bot.menu("Edit").menu("Delete").click(); + bot.shell("Confirm Delete").activate(); + bot.button("OK").click(); + waitForJobs(); + super.tearDown(); + } + + private void checkVPEForTestPageFolder(String testPageFolder) throws Throwable{ + + //Open hello page + + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + tree.expandNode(JBT_TEST_PROJECT_NAME) + .expandNode("WebContent").expandNode(TEST_FOLDER) + .getNode(TEST_PAGE_FOR_FOLDER+".jsp").doubleClick(); + SWTBotEclipseEditor editor = bot.editorByTitle(TEST_PAGE_FOR_FOLDER+".jsp").toTextEditor(); + String editorText = editor.getText(); + editor.selectLine(9); + if (!"<body id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) { + editor.insertText("<body id=\"bodyId\">"); + } + editor.save(); + waitForJobs(); + + //Check page content + + try { + performContentTestByIDs(testPageFolder, bot.multiPageEditorByTitle(TEST_PAGE_FOR_FOLDER+".jsp")); + } catch (Throwable e) { + throw e; + }finally{ + editor.setText(editorText); + editor.saveAndClose(); + openPage(); + } + + } + +} Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/PageDesignTestCase.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/PageDesignTestCase.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/PageDesignTestCase.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,53 @@ +package org.jboss.tools.vpe.ui.bot.test.editor.pagedesign; + +import java.io.IOException; + +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.Platform; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.ui.bot.test.WidgetVariables; +import org.jboss.tools.vpe.ui.bot.test.Activator; +import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; + +public abstract class PageDesignTestCase extends VPEAutoTestCase{ + + final static String PAGE_DESIGN = "Page Design Options"; + + @Override + protected void closeUnuseDialogs() { + try { + bot.shell(PAGE_DESIGN).close(); + } catch (WidgetNotFoundException e) { + } + } + + @Override + protected boolean isUnuseDialogOpened() { + boolean isOpened = false; + try { + bot.shell(PAGE_DESIGN).activate(); + isOpened = true; + } catch (WidgetNotFoundException e) { + } + return isOpened; + } + + void closePage(){ + bot.editorByTitle(TEST_PAGE).close(); + } + + void openPage(){ + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + tree.expandNode(JBT_TEST_PROJECT_NAME) + .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); + } + + @Override + protected String getPathToResources(String testPage) throws IOException { + return FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"resources/pagedesign/"+testPage; + } + +} Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,129 @@ +package org.jboss.tools.vpe.ui.bot.test.editor.pagedesign; + +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.ui.bot.test.WidgetVariables; + +public abstract class SubstitutedELTestCase extends PageDesignTestCase{ + + static final String ADD_EL = "Add EL Reference"; + static final String SUBSTITUTED_EL = "Substituted EL expressions"; + private SWTBotEclipseEditor editor; + private String editorText; + private String textHelloPage; + + + SWTBotEclipseEditor getEditor() { + return editor; + } + + void setEditor(SWTBotEclipseEditor editor) { + this.editor = editor; + } + + String getEditorText() { + return editorText; + } + + void setEditorText(String editorText) { + this.editorText = editorText; + } + + @Override + protected void closeUnuseDialogs() { + try { + bot.shell(ADD_EL).close(); + } catch (WidgetNotFoundException e) { + } + super.closeUnuseDialogs(); + } + + @Override + protected boolean isUnuseDialogOpened() { + boolean isOpened = super.isUnuseDialogOpened(); + try { + bot.shell(ADD_EL).activate(); + isOpened = true; + } catch (WidgetNotFoundException e) { + } + return isOpened; + } + + + void checkVPEForTestPage(String testPage) throws Throwable{ + editor.selectLine(9); + if (!"<body id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) { + editor.insertText("<body id=\"bodyId\">"); + } + editor.save(); + waitForJobs(); + performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE)); + } + + @Override + protected void setUp() throws Exception { + super.setUp(); + } + + @Override + protected void tearDown() throws Exception { + editor.setText(editorText); + editor.save(); + bot.toolbarButtonWithTooltip(PAGE_DESIGN).click(); + bot.shell(PAGE_DESIGN).activate(); + bot.tabItem(SUBSTITUTED_EL).activate(); + clearELTable(bot.table()); + try { + bot.button("OK").click(); + } catch (WidgetNotFoundException e) { + bot.shell(PAGE_DESIGN).close(); + } + super.tearDown(); + } + + void clearELTable(SWTBotTable table){ + try { + while (true) { + table.select(0); + bot.button("Remove").click(); + } + } catch (IllegalArgumentException e) { + } + catch (WidgetNotFoundException e) { + } + } + + void checkVPEForHelloPage(String testHelloPage) throws Throwable{ + + //Open hello page + + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + tree.expandNode(JBT_TEST_PROJECT_NAME) + .expandNode("WebContent").expandNode("pages").getNode("hello.jsp").doubleClick(); + SWTBotEclipseEditor editor = bot.editorByTitle("hello.jsp").toTextEditor(); + textHelloPage = editor.getText(); + editor.selectLine(10); + if (!"<body id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) { + editor.insertText("<body id=\"bodyId\">"); + } + editor.save(); + waitForJobs(); + + //Check page content + + try { + performContentTestByIDs(testHelloPage, bot.multiPageEditorByTitle("hello.jsp")); + } catch (Throwable e) { + throw e; + }finally{ + editor.setText(textHelloPage); + editor.saveAndClose(); + openPage(); + } + } + +} Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,7 +0,0 @@ -package org.jboss.tools.vpe.ui.bot.test.editor.preferences; - -import org.jboss.tools.vpe.ui.bot.test.jbide.JBIDE4306Test; - -public class ChangeEditorTabForTheFirstOpenPageTest extends JBIDE4306Test{ - -} Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java (from rev 17213, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE4306Test.java) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,74 @@ +package org.jboss.tools.vpe.ui.bot.test.editor.preferences; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.jboss.tools.ui.bot.test.WidgetVariables; + +public class ChangeEditorTabForTheFirstOpenPageTest extends PreferencesTestCase{ + + public void testChangeEditorTabForTheFirstOpenPage(){ + + //Test open page on visual/source tab + + openPage(); + + //Test set default source tab + + bot.toolbarButtonWithTooltip("Preferences").click(); + bot.shell("Preferences (Filtered)").activate(); + bot.comboBoxWithLabel("Select the default active editor's tab\nfor files that haven't been previously\nopened in the VPE:").setSelection("Source"); + bot.button("OK").click(); + + //Create and open new page + + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + + innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") + .getNode("pages").select(); + + bot.menu("File").menu("New").menu("JSP File").click(); + bot.shell("New File JSP").activate(); + bot.textWithLabel("Name*").setText("testPage"); + bot.button("Finish").click(); + waitForJobs(); + bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).setFocus(); + + //Check if the tab changed + + WidgetNotFoundException exception = null; + try { + bot.toolbarButtonWithTooltip("Refresh").click(); + } catch (WidgetNotFoundException e) { + exception = e; + } + assertNotNull(exception); + bot.editorByTitle("testPage.jsp").close(); + bot.editorByTitle(TEST_PAGE).setFocus(); + + //Test set default visual/source tab + + bot.toolbarButtonWithTooltip("Preferences").click(); + bot.shell("Preferences (Filtered)").activate(); + bot.comboBoxWithLabel("Select the default active editor's tab\nfor files that haven't been previously\nopened in the VPE:").setSelection("Visual/Source"); + bot.button("OK").click(); + bot.editorByTitle(TEST_PAGE).close(); + } + + @Override + protected void tearDown() throws Exception { + + //Delete test page if it has been created + try { + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") + .expandNode("pages").getNode("testPage.jsp").select(); + bot.menu("Edit").menu("Delete").click(); + bot.shell("Confirm Delete").activate(); + bot.button("OK").click(); + } catch (WidgetNotFoundException e) { + } + waitForJobs(); + super.tearDown(); + } + +} Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,12 +1,17 @@ package org.jboss.tools.vpe.ui.bot.test.editor.preferences; +import java.io.IOException; + +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.Platform; import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.jboss.tools.ui.bot.test.WidgetVariables; +import org.jboss.tools.vpe.ui.bot.test.Activator; import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; -public class PreferencesTestCase extends VPEAutoTestCase{ +public abstract class PreferencesTestCase extends VPEAutoTestCase{ @Override protected void closeUnuseDialogs() { @@ -34,8 +39,13 @@ void openPage(){ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); SWTBotTree tree = innerBot.tree(); - tree.expandNode(projectProperties.getProperty("JSFProjectName")) + tree.expandNode(JBT_TEST_PROJECT_NAME) .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); } + @Override + protected String getPathToResources(String testPage) throws IOException { + return FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"resources/preferences/"+testPage; + } + } Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE4306Test.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE4306Test.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE4306Test.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,53 +0,0 @@ -package org.jboss.tools.vpe.ui.bot.test.jbide; - -import org.eclipse.swtbot.swt.finder.SWTBot; -import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.jboss.tools.ui.bot.test.WidgetVariables; -import org.jboss.tools.vpe.ui.bot.test.editor.preferences.PreferencesTestCase; - -public class JBIDE4306Test extends PreferencesTestCase{ - - public void testJBIDE4306(){ - - //Test open page on visual/source tab - - SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); - SWTBotTree tree = innerBot.tree(); - tree.expandNode(projectProperties.getProperty("JSFProjectName")) - .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); - - //Test set default source tab - - bot.toolbarButtonWithTooltip("Preferences").click(); - bot.shell("Preferences (Filtered)").activate(); - bot.comboBoxWithLabel("Select the default active editor's tab\nfor files that haven't been previously\nopened in the VPE:").setSelection("Source"); - bot.button("OK").click(); - innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); - tree = innerBot.tree(); - bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).setFocus(); - tree.expandNode(projectProperties.getProperty("JSFProjectName")) - .expandNode("WebContent").expandNode("pages").getNode("hello.jsp").doubleClick(); - - //Check if the tab changed - - WidgetNotFoundException exception = null; - try { - bot.toolbarButtonWithTooltip("Refresh").click(); - } catch (WidgetNotFoundException e) { - exception = e; - } - assertNotNull(exception); - bot.editorByTitle("hello.jsp").close(); - bot.editorByTitle(TEST_PAGE).setFocus(); - - //Test set default visual/source tab - - bot.toolbarButtonWithTooltip("Preferences").click(); - bot.shell("Preferences (Filtered)").activate(); - bot.comboBoxWithLabel("Select the default active editor's tab\nfor files that haven't been previously\nopened in the VPE:").setSelection("Visual/Source"); - bot.button("OK").click(); - bot.editorByTitle(TEST_PAGE).close(); - } - -}