From jbosstools-commits at lists.jboss.org Fri Jul 31 08:35:28 2009 Content-Type: multipart/mixed; boundary="===============0440129820487037396==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r16927 - in workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test: src/org/jboss/tools/vpe/ui/bot/test and 1 other directories. Date: Fri, 31 Jul 2009 08:35:28 -0400 Message-ID: <200907311235.n6VCZS0Z012909@svn01.web.mwc.hst.phx2.redhat.com> --===============0440129820487037396== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yzhishko Date: 2009-07-31 08:35:28 -0400 (Fri, 31 Jul 2009) New Revision: 16927 Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideBorderF= orUnknownTag.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideResourc= eBundlesUsageasELExpressions.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowBorderF= orUnknownTag.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowResourc= eBundlesUsageasELExpressions.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/v= pe/ui/bot/test/editor/BorderForUnknownTagsTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/v= pe/ui/bot/test/editor/ChangeEditorTabForTheFirstOpenPageTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/v= pe/ui/bot/test/editor/ShowResourceBundlesUsageasELexpressionsTest.java Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/v= pe/ui/bot/test/VPEAllTests.java Log: Some tests were written for preference dialog of VPE Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideBor= derForUnknownTag.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideBorder= ForUnknownTag.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideBorder= ForUnknownTag.xml 2009-07-31 12:35:28 UTC (rev 16927) @@ -0,0 +1,41 @@ + + +
+ + + + +
+
+

+ +Hello Demo Application + +

+
+tagunknown
+ +
+
    +
  • +Error Messages +
  • +
+
+ +Name: + + + + + + + + + +
+
+
+
+
+
Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideRes= ourceBundlesUsageasELExpressions.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideResour= ceBundlesUsageasELExpressions.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideResour= ceBundlesUsageasELExpressions.xml 2009-07-31 12:35:28 UTC (rev 16927) @@ -0,0 +1,37 @@ + + +
+ + + + +
+
+

+ +Hello Demo Application + +

+
    +
  • +Error Messages +
  • +
+
+ +Name: + + + + + + + + + +
+
+
+
+
+
\ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowBor= derForUnknownTag.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowBorder= ForUnknownTag.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowBorder= ForUnknownTag.xml 2009-07-31 12:35:28 UTC (rev 16927) @@ -0,0 +1,41 @@ + + +
+ + + + +
+
+

+ +Hello Demo Application + +

+
+tagunknown
+ +
+
    +
  • +Error Messages +
  • +
+
+ +Name: + + + + + + + + + +
+
+
+
+
+
\ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowRes= ourceBundlesUsageasELExpressions.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowResour= ceBundlesUsageasELExpressions.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowResour= ceBundlesUsageasELExpressions.xml 2009-07-31 12:35:28 UTC (rev 16927) @@ -0,0 +1,37 @@ + + +
+ + + + +
+
+

+ +#{Message.header} + +

+
    +
  • +Error Messages +
  • +
+
+ +#{Message.prompt_message} + + + + + + + + + +
+
+
+
+
+
\ No newline at end of file Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/= tools/vpe/ui/bot/test/VPEAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/= vpe/ui/bot/test/VPEAllTests.java 2009-07-31 07:52:50 UTC (rev 16926) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/= vpe/ui/bot/test/VPEAllTests.java 2009-07-31 12:35:28 UTC (rev 16927) @@ -5,7 +5,11 @@ import junit.framework.TestSuite; import org.eclipse.swtbot.swt.finder.SWTBotTestCase; import org.jboss.tools.vpe.ui.bot.test.editor.BlockCommentTest; +import org.jboss.tools.vpe.ui.bot.test.editor.BorderForUnknownTagsTest; +import org.jboss.tools.vpe.ui.bot.test.editor.ChangeEditorTabForTheFirstOp= enPageTest; +import org.jboss.tools.vpe.ui.bot.test.editor.ShowResourceBundlesUsageasEL= expressionsTest; import org.jboss.tools.vpe.ui.bot.test.editor.ToggleCommentTest; +import org.jboss.tools.vpe.ui.bot.test.editor.VerificationOfNameSpaces; 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; @@ -20,6 +24,10 @@ suite.addTestSuite(BlockCommentTest.class); suite.addTestSuite(JBIDE4306Test.class); suite.addTestSuite(JBIDE4556Test.class); + suite.addTestSuite(ChangeEditorTabForTheFirstOpenPageTest.class); + suite.addTestSuite(VerificationOfNameSpaces.class); + suite.addTestSuite(BorderForUnknownTagsTest.class); + suite.addTestSuite(ShowResourceBundlesUsageasELexpressionsTest.class); return new TestSetup(suite); } } Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/too= ls/vpe/ui/bot/test/editor/BorderForUnknownTagsTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/= vpe/ui/bot/test/editor/BorderForUnknownTagsTest.java = (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/= vpe/ui/bot/test/editor/BorderForUnknownTagsTest.java 2009-07-31 12:35:28 UT= C (rev 16927) @@ -0,0 +1,122 @@ +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.SWTBotCheckBox; +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 BorderForUnknownTagsTest extends VPEAutoTestCase{ + + private static String textEditor; + private static SWTBotEclipseEditor editor; + + public void testBorderForUnknownTags() throws Throwable{ + = + //Test open page + = + SWTBot innerBot =3D bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bo= t(); + SWTBotTree tree =3D innerBot.tree(); + try { + tree.expandNode(projectProperties.getProperty("JSFProjectName")) + .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).double= Click(); + } catch (Exception e) { + } + = + editor =3D bot.editorByTitle(TEST_PAGE).toTextEditor(); + textEditor =3D editor.getText(); + = + //Test insert unknown tag + = + editor.navigateTo(12, 52); + editor.insertText(""); + = + //Test default Show Border value + = + bot.toolbarButtonWithTooltip("Preferences").click(); + bot.shell("Preferences (Filtered)").activate(); + SWTBotCheckBox checkBox =3D bot.checkBox("Show Border for Unknown Tags"); + if (!checkBox.isChecked()) { + checkBox.click(); + } + bot.button("OK").click(); + = + //Test check VPE content + = + checkVPE("ShowBorderForUnknownTag.xml"); + = + //Test hide border for unknown tag + = + selectBorder(); + checkVPE("HideBorderForUnknownTag.xml"); + = + //Test restore previous state + = + selectBorder(); + checkVPE("ShowBorderForUnknownTag.xml"); + = + } + = + @Override + protected void closeUnuseDialogs() { + try { + bot.shell("Preferences (Filtered)").close(); + } catch (Exception e) { + } + } + + @Override + protected boolean isUnuseDialogOpened() { + boolean isOpened =3D false; + try { + bot.shell("Preferences (Filtered)").activate(); + isOpened =3D true; + } catch (Exception e) { + } + return isOpened; + } + + private void checkVPE(String testPage) throws Throwable{ + editor.selectLine(9); + if (!"".equals(editor.getTextOnCurrentLine().trim(= ))) { + editor.insertText(""); + } + editor.save(); + waitForJobs(); + performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE)); + } + + private void selectBorder(){ + bot.toolbarButtonWithTooltip("Preferences").click(); + bot.shell("Preferences (Filtered)").activate(); + bot.checkBox("Show Border for Unknown Tags").click(); + bot.button("OK").click(); + } + = + @Override + protected void tearDown() throws Exception { + + //Restore page state before tests + = + try { + bot.toolbarButtonWithTooltip("Preferences").click(); + bot.shell("Preferences (Filtered)").activate(); + SWTBotCheckBox checkBox =3D bot.checkBox("Show Border for Unknown Tags"= ); + if (!checkBox.isChecked()) { + checkBox.click(); + } + bot.button("OK").click(); + } catch (Exception e) { + } + 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/too= ls/vpe/ui/bot/test/editor/ChangeEditorTabForTheFirstOpenPageTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/= vpe/ui/bot/test/editor/ChangeEditorTabForTheFirstOpenPageTest.java = (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/= vpe/ui/bot/test/editor/ChangeEditorTabForTheFirstOpenPageTest.java 2009-07-= 31 12:35:28 UTC (rev 16927) @@ -0,0 +1,7 @@ +package org.jboss.tools.vpe.ui.bot.test.editor; + +import org.jboss.tools.vpe.ui.bot.test.jbide.JBIDE4306Test; + +public class ChangeEditorTabForTheFirstOpenPageTest extends JBIDE4306Test{ + +} Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/too= ls/vpe/ui/bot/test/editor/ShowResourceBundlesUsageasELexpressionsTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/= vpe/ui/bot/test/editor/ShowResourceBundlesUsageasELexpressionsTest.java = (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/= vpe/ui/bot/test/editor/ShowResourceBundlesUsageasELexpressionsTest.java 200= 9-07-31 12:35:28 UTC (rev 16927) @@ -0,0 +1,113 @@ +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.SWTBotCheckBox; +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 ShowResourceBundlesUsageasELexpressionsTest extends VPEAutoTe= stCase{ + + private static String textEditor; + private static SWTBotEclipseEditor editor; + + public void testShowResourceBundlesUsageasELexpressions() throws Throwabl= e{ + = + //Test open page + = + SWTBot innerBot =3D bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bo= t(); + SWTBotTree tree =3D innerBot.tree(); + try { + tree.expandNode(projectProperties.getProperty("JSFProjectName")) + .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).double= Click(); + } catch (Exception e) { + } + = + editor =3D bot.editorByTitle(TEST_PAGE).toTextEditor(); + textEditor =3D editor.getText(); + = + //Test default Show Border value + = + bot.toolbarButtonWithTooltip("Preferences").click(); + bot.shell("Preferences (Filtered)").activate(); + SWTBotCheckBox checkBox =3D bot.checkBox("Show Resource Bundles Usage as= EL Expressions"); + if (checkBox.isChecked()) { + checkBox.click(); + } + bot.button("OK").click(); + + //Test check VPE content with resource bundles + = + selectELExpressions(); + checkVPE("ShowResourceBundlesUsageasELExpressions.xml"); + = + //Test check VPE content without resource bundles + = + selectELExpressions(); + checkVPE("HideResourceBundlesUsageasELExpressions.xml"); + = + } + = + @Override + protected void closeUnuseDialogs() { + try { + bot.shell("Preferences (Filtered)").close(); + } catch (Exception e) { + } + } + + @Override + protected boolean isUnuseDialogOpened() { + boolean isOpened =3D false; + try { + bot.shell("Preferences (Filtered)").activate(); + isOpened =3D true; + } catch (Exception e) { + } + return isOpened; + } + = + @Override + protected void tearDown() throws Exception { + + //Restore page state before tests + = + try { + bot.toolbarButtonWithTooltip("Preferences").click(); + bot.shell("Preferences (Filtered)").activate(); + SWTBotCheckBox checkBox =3D bot.checkBox("Show Resource Bundles Usage a= s EL Expressions"); + if (checkBox.isChecked()) { + checkBox.click(); + } + bot.button("OK").click(); + } catch (Exception e) { + } + 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 checkVPE(String testPage) throws Throwable{ + editor.selectLine(9); + if (!"".equals(editor.getTextOnCurrentLine().trim(= ))) { + editor.insertText(""); + } + editor.save(); + waitForJobs(); + performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE)); + } + = + private void selectELExpressions(){ + bot.toolbarButtonWithTooltip("Preferences").click(); + bot.shell("Preferences (Filtered)").activate(); + bot.checkBox("Show Resource Bundles Usage as EL Expressions").click(); + bot.button("OK").click(); + } + = +} --===============0440129820487037396==--