Author: yzhishko Date: 2009-08-04 08:20:51 -0400 (Tue, 04 Aug 2009) New Revision: 16959 Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowNonVisualTagsTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java Removed: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowNonVisualTags.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpaces.java Modified: workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.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/AlwaysHideSelectionBarWithoutPromptTest.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/BorderForUnknownTagsTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowResourceBundlesUsageasELexpressionsTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowSelectionTagBarTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java Log: Tests were updated. Some try/catch blocks were corrected. Modified: workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java =================================================================== --- workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java 2009-08-04 11:39:16 UTC (rev 16958) +++ workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3148and4441Test.java 2009-08-04 12:20:51 UTC (rev 16959) @@ -73,7 +73,7 @@ protected void closeUnuseDialogs() { try { bot.shell("CSS Class").close(); - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } } @@ -83,7 +83,7 @@ try { bot.shell("CSS Class").activate(); isOpened = true; - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } return isOpened; } Modified: workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java =================================================================== --- workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java 2009-08-04 11:39:16 UTC (rev 16958) +++ workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3577Test.java 2009-08-04 12:20:51 UTC (rev 16959) @@ -55,7 +55,7 @@ protected void closeUnuseDialogs() { try { bot.shell("CSS Class").close(); - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } } @@ -65,7 +65,7 @@ try { bot.shell("CSS Class").activate(); isOpened = true; - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } return isOpened; } Modified: workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java =================================================================== --- workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java 2009-08-04 11:39:16 UTC (rev 16958) +++ workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3579Test.java 2009-08-04 12:20:51 UTC (rev 16959) @@ -55,7 +55,7 @@ protected void closeUnuseDialogs() { try { bot.shell("CSS Class").close(); - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } } @@ -65,7 +65,7 @@ try { bot.shell("CSS Class").activate(); isOpened = true; - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } return isOpened; } Modified: workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java =================================================================== --- workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java 2009-08-04 11:39:16 UTC (rev 16958) +++ workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE3920Test.java 2009-08-04 12:20:51 UTC (rev 16959) @@ -45,7 +45,7 @@ protected void closeUnuseDialogs() { try { bot.shell("CSS Class").close(); - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } } @@ -55,7 +55,7 @@ try { bot.shell("CSS Class").activate(); isOpened = true; - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } return isOpened; } Modified: workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java =================================================================== --- workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java 2009-08-04 11:39:16 UTC (rev 16958) +++ workspace/yzhishko/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/JBIDE4391Test.java 2009-08-04 12:20:51 UTC (rev 16959) @@ -56,7 +56,7 @@ protected void closeUnuseDialogs() { try { bot.shell("CSS Class").close(); - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } } @@ -66,7 +66,7 @@ try { bot.shell("CSS Class").activate(); isOpened = true; - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } return isOpened; } 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-04 11:39:16 UTC (rev 16958) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllTests.java 2009-08-04 12:20:51 UTC (rev 16959) @@ -8,11 +8,11 @@ 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.ChangeEditorTabForTheFirstOpenPageTest; -import org.jboss.tools.vpe.ui.bot.test.editor.ShowNonVisualTags; +import org.jboss.tools.vpe.ui.bot.test.editor.ShowNonVisualTagsTest; import org.jboss.tools.vpe.ui.bot.test.editor.ShowResourceBundlesUsageasELexpressionsTest; import org.jboss.tools.vpe.ui.bot.test.editor.ShowSelectionTagBarTest; 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.editor.VerificationOfNameSpacesTest; 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; @@ -28,12 +28,12 @@ suite.addTestSuite(JBIDE4306Test.class); suite.addTestSuite(JBIDE4556Test.class); suite.addTestSuite(ChangeEditorTabForTheFirstOpenPageTest.class); - suite.addTestSuite(VerificationOfNameSpaces.class); + suite.addTestSuite(VerificationOfNameSpacesTest.class); suite.addTestSuite(BorderForUnknownTagsTest.class); suite.addTestSuite(ShowResourceBundlesUsageasELexpressionsTest.class); suite.addTestSuite(ShowSelectionTagBarTest.class); suite.addTestSuite(AlwaysHideSelectionBarWithoutPromptTest.class); - suite.addTestSuite(ShowNonVisualTags.class); + suite.addTestSuite(ShowNonVisualTagsTest.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-04 11:39:16 UTC (rev 16958) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2009-08-04 12:20:51 UTC (rev 16959) @@ -73,16 +73,16 @@ bot.button("Next >").click(); try { bot.comboBoxWithLabel("Runtime*").setSelection("jboss-eap Runtime"); - delay(); + waitForJobs(); bot.button("Finish").click(); try { bot.button("Yes").click(); openErrorLog(); openPackageExplorer(); // openProgressStatus(); - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } - } catch (Exception e) { + } catch (WidgetNotFoundException e) { bot.button(0).click(); SWTBotTree innerTree = bot.tree(); waitForJobs(); @@ -97,7 +97,7 @@ openErrorLog(); openPackageExplorer(); // openProgressStatus(); - } catch (Exception e2) { + } catch (WidgetNotFoundException e2) { } } waitForJobs(); Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/AlwaysHideSelectionBarWithoutPromptTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/AlwaysHideSelectionBarWithoutPromptTest.java 2009-08-04 11:39:16 UTC (rev 16958) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/AlwaysHideSelectionBarWithoutPromptTest.java 2009-08-04 12:20:51 UTC (rev 16959) @@ -83,7 +83,7 @@ protected void closeUnuseDialogs() { try { bot.shell("Preferences (Filtered)").close(); - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } } @@ -93,7 +93,7 @@ try { bot.shell("Preferences (Filtered)").activate(); isOpened = true; - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } return isOpened; } @@ -108,7 +108,7 @@ try { tree.expandNode(projectProperties.getProperty("JSFProjectName")) .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } } @@ -143,7 +143,7 @@ checkBox.click(); } bot.button("OK").click(); - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } super.tearDown(); } 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-04 11:39:16 UTC (rev 16958) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java 2009-08-04 12:20:51 UTC (rev 16959) @@ -5,6 +5,7 @@ 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.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.VPEAutoTestCase; @@ -23,7 +24,7 @@ try { tree.expandNode(projectProperties.getProperty("JSFProjectName")) .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } editor = bot.editorByTitle(TEST_PAGE).toTextEditor(); Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BorderForUnknownTagsTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BorderForUnknownTagsTest.java 2009-08-04 11:39:16 UTC (rev 16958) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BorderForUnknownTagsTest.java 2009-08-04 12:20:51 UTC (rev 16959) @@ -2,6 +2,7 @@ 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.SWTBotCheckBox; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.jboss.tools.ui.bot.test.WidgetVariables; @@ -21,7 +22,7 @@ try { tree.expandNode(projectProperties.getProperty("JSFProjectName")) .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } editor = bot.editorByTitle(TEST_PAGE).toTextEditor(); @@ -62,7 +63,7 @@ protected void closeUnuseDialogs() { try { bot.shell("Preferences (Filtered)").close(); - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } } @@ -72,7 +73,7 @@ try { bot.shell("Preferences (Filtered)").activate(); isOpened = true; - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } return isOpened; } Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowNonVisualTags.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowNonVisualTags.java 2009-08-04 11:39:16 UTC (rev 16958) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowNonVisualTags.java 2009-08-04 12:20:51 UTC (rev 16959) @@ -1,103 +0,0 @@ -package org.jboss.tools.vpe.ui.bot.test.editor; - -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 ShowNonVisualTags extends VPEAutoTestCase{ - - public void testShowNonVisualTags() throws Throwable{ - - //Test open page - - openPage(); - - //Test set default Show Tag value - - bot.toolbarButtonWithTooltip("Preferences").click(); - bot.shell("Preferences (Filtered)").activate(); - SWTBotCheckBox checkBox = bot.checkBox("Show Non-Visual Tags"); - if (checkBox.isChecked()) { - checkBox.click(); - } - bot.button("OK").click(); - checkVPE("DumpedTestPage.xml"); - - //Test Show Non-Visual Tags - - selectShowNonVisual(); - closePage(); - openPage(); - checkVPE("ShowNonVisualTags.xml"); - - //Test Hide Non-Visual Tags - selectShowNonVisual(); - closePage(); - openPage(); - checkVPE("DumpedTestPage.xml"); - - } - - private void checkVPE(String testPage) throws Throwable{ - waitForJobs(); - performContentTestByDocument(testPage, bot.multiPageEditorByTitle(TEST_PAGE)); - } - - @Override - protected void closeUnuseDialogs() { - try { - bot.shell("Preferences (Filtered)").close(); - } catch (Exception e) { - } - } - - @Override - protected boolean isUnuseDialogOpened() { - boolean isOpened = false; - try { - bot.shell("Preferences (Filtered)").activate(); - isOpened = true; - } catch (Exception e) { - } - return isOpened; - } - - @Override - protected void tearDown() throws Exception { - try { - bot.toolbarButtonWithTooltip("Preferences").click(); - bot.shell("Preferences (Filtered)").activate(); - SWTBotCheckBox checkBox = bot.checkBox("Show Non-Visual Tags"); - if (checkBox.isChecked()) { - checkBox.click(); - } - bot.button("OK").click(); - } catch (Exception e) { - } - super.tearDown(); - } - - private void closePage(){ - bot.editorByTitle(TEST_PAGE).close(); - } - - private void openPage(){ - SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); - SWTBotTree tree = innerBot.tree(); - try { - tree.expandNode(projectProperties.getProperty("JSFProjectName")) - .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); - } catch (Exception e) { - } - } - - private void selectShowNonVisual(){ - bot.toolbarButtonWithTooltip("Preferences").click(); - bot.shell("Preferences (Filtered)").activate(); - bot.checkBox("Show Non-Visual Tags").click(); - bot.button("OK").click(); - } - -} Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowNonVisualTagsTest.java (from rev 16941, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowNonVisualTags.java) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowNonVisualTagsTest.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowNonVisualTagsTest.java 2009-08-04 12:20:51 UTC (rev 16959) @@ -0,0 +1,104 @@ +package org.jboss.tools.vpe.ui.bot.test.editor; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +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 ShowNonVisualTagsTest extends VPEAutoTestCase{ + + public void testShowNonVisualTags() throws Throwable{ + + //Test open page + + openPage(); + + //Test set default Show Tag value + + bot.toolbarButtonWithTooltip("Preferences").click(); + bot.shell("Preferences (Filtered)").activate(); + SWTBotCheckBox checkBox = bot.checkBox("Show Non-Visual Tags"); + if (checkBox.isChecked()) { + checkBox.click(); + } + bot.button("OK").click(); + checkVPE("DumpedTestPage.xml"); + + //Test Show Non-Visual Tags + + selectShowNonVisual(); + closePage(); + openPage(); + checkVPE("ShowNonVisualTags.xml"); + + //Test Hide Non-Visual Tags + selectShowNonVisual(); + closePage(); + openPage(); + checkVPE("DumpedTestPage.xml"); + + } + + private void checkVPE(String testPage) throws Throwable{ + waitForJobs(); + performContentTestByDocument(testPage, bot.multiPageEditorByTitle(TEST_PAGE)); + } + + @Override + protected void closeUnuseDialogs() { + try { + bot.shell("Preferences (Filtered)").close(); + } catch (WidgetNotFoundException e) { + } + } + + @Override + protected boolean isUnuseDialogOpened() { + boolean isOpened = false; + try { + bot.shell("Preferences (Filtered)").activate(); + isOpened = true; + } catch (WidgetNotFoundException e) { + } + return isOpened; + } + + @Override + protected void tearDown() throws Exception { + try { + bot.toolbarButtonWithTooltip("Preferences").click(); + bot.shell("Preferences (Filtered)").activate(); + SWTBotCheckBox checkBox = bot.checkBox("Show Non-Visual Tags"); + if (checkBox.isChecked()) { + checkBox.click(); + } + bot.button("OK").click(); + } catch (WidgetNotFoundException e) { + } + super.tearDown(); + } + + private void closePage(){ + bot.editorByTitle(TEST_PAGE).close(); + } + + private void openPage(){ + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + try { + tree.expandNode(projectProperties.getProperty("JSFProjectName")) + .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); + } catch (WidgetNotFoundException e) { + } + } + + private void selectShowNonVisual(){ + bot.toolbarButtonWithTooltip("Preferences").click(); + bot.shell("Preferences (Filtered)").activate(); + bot.checkBox("Show Non-Visual Tags").click(); + bot.button("OK").click(); + } + +} Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowResourceBundlesUsageasELexpressionsTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowResourceBundlesUsageasELexpressionsTest.java 2009-08-04 11:39:16 UTC (rev 16958) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowResourceBundlesUsageasELexpressionsTest.java 2009-08-04 12:20:51 UTC (rev 16959) @@ -2,6 +2,7 @@ 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.SWTBotCheckBox; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.jboss.tools.ui.bot.test.WidgetVariables; @@ -21,7 +22,7 @@ try { tree.expandNode(projectProperties.getProperty("JSFProjectName")) .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } editor = bot.editorByTitle(TEST_PAGE).toTextEditor(); @@ -53,7 +54,7 @@ protected void closeUnuseDialogs() { try { bot.shell("Preferences (Filtered)").close(); - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } } @@ -63,7 +64,7 @@ try { bot.shell("Preferences (Filtered)").activate(); isOpened = true; - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } return isOpened; } @@ -81,7 +82,7 @@ checkBox.click(); } bot.button("OK").click(); - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } editor.setFocus(); bot.menu("Edit").menu("Select All").click(); Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowSelectionTagBarTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowSelectionTagBarTest.java 2009-08-04 11:39:16 UTC (rev 16958) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ShowSelectionTagBarTest.java 2009-08-04 12:20:51 UTC (rev 16959) @@ -84,7 +84,7 @@ protected void closeUnuseDialogs() { try { bot.shell("Preferences (Filtered)").close(); - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } } @@ -94,7 +94,7 @@ try { bot.shell("Preferences (Filtered)").activate(); isOpened = true; - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } return isOpened; } @@ -116,7 +116,7 @@ checkBox.click(); } bot.button("OK").click(); - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } super.tearDown(); } @@ -138,7 +138,7 @@ try { tree.expandNode(projectProperties.getProperty("JSFProjectName")) .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } } 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-04 11:39:16 UTC (rev 16958) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2009-08-04 12:20:51 UTC (rev 16959) @@ -5,6 +5,7 @@ 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.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.VPEAutoTestCase; @@ -23,7 +24,7 @@ try { tree.expandNode(projectProperties.getProperty("JSFProjectName")) .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); - } catch (Exception e) { + } catch (WidgetNotFoundException e) { } Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpaces.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpaces.java 2009-08-04 11:39:16 UTC (rev 16958) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpaces.java 2009-08-04 12:20:51 UTC (rev 16959) @@ -1,76 +0,0 @@ -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 VerificationOfNameSpaces 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(); - try { - tree.expandNode(projectProperties.getProperty("JSFProjectName")) - .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); - } catch (Exception e) { - } - - editor = bot.editorByTitle(TEST_PAGE).toTextEditor(); - textEditor = editor.getText(); - - //Test clear source - - editor.setFocus(); - bot.menu("Edit").menu("Select All").click(); - waitForJobs(); - bot.menu("Edit").menu("Delete").click(); - - //Test insert test text - - editor.setText(testText); - editor.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(); - } - -} Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java (from rev 16906, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpaces.java) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java 2009-08-04 12:20:51 UTC (rev 16959) @@ -0,0 +1,77 @@ +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.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.VPEAutoTestCase; + +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(); + try { + tree.expandNode(projectProperties.getProperty("JSFProjectName")) + .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); + } catch (WidgetNotFoundException e) { + } + + editor = bot.editorByTitle(TEST_PAGE).toTextEditor(); + textEditor = editor.getText(); + + //Test clear source + + editor.setFocus(); + bot.menu("Edit").menu("Select All").click(); + waitForJobs(); + bot.menu("Edit").menu("Delete").click(); + + //Test insert test text + + editor.setText(testText); + editor.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(); + } + +}