Author: mareshkau Date: 2010-05-06 10:21:19 -0400 (Thu, 06 May 2010) New Revision: 21936 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6131, test has been adjusted Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-05-06 14:08:46 UTC (rev 21935) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-05-06 14:21:19 UTC (rev 21936) @@ -47,7 +47,7 @@ <page name="%VPE_Templates" category="org.jboss.tools.vpe.editor" - class="org.jboss.tools.jst.web.ui.editor.pref.template.VPETemplatePreferencePage" + class="org.jboss.tools.jst.web.ui.editor.pref.template.VPE1TemplatePreferencePage" id="org.jboss.tools.jsf.ui.editor.pref.template"> <keywordReference id="org.eclipse.wst.html.ui.templates"/> </page> Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2010-05-06 14:08:46 UTC (rev 21935) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2010-05-06 14:21:19 UTC (rev 21936) @@ -31,27 +31,27 @@ public static Test suite(){ TestSuite suite = new TestSuite("VPE All Tests"); //$NON-NLS-1$ - suite.addTestSuite(CancelTagLibDefenitionTest.class); - suite.addTestSuite(ImportTagsFromTLDFileTest.class); - suite.addTestSuite(ToggleCommentTest.class); - suite.addTestSuite(BlockCommentTest.class); - suite.addTestSuite(ChangeEditorTabForTheFirstOpenPageTest.class); - suite.addTestSuite(JBIDE4556Test.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); - suite.addTestSuite(EditorSynchronizationTest.class); - suite.addTestSuite(JSPPageCreationTest.class); - suite.addTestSuite(XHTMLPageCreationTest.class); - suite.addTestSuite(RenameFacesConfigFileTest.class); - suite.addTestSuite(RenameJSPFileTest.class); - suite.addTestSuite(RenameXHTMLFileTest.class); - suite.addTestSuite(ImportUnknownTagsWizardTest.class); - suite.addTestSuite(NewXHTMLPageWizardTest.class); +// suite.addTestSuite(CancelTagLibDefenitionTest.class); +// suite.addTestSuite(ImportTagsFromTLDFileTest.class); +// suite.addTestSuite(ToggleCommentTest.class); +// suite.addTestSuite(BlockCommentTest.class); +// suite.addTestSuite(ChangeEditorTabForTheFirstOpenPageTest.class); +// suite.addTestSuite(JBIDE4556Test.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); +// suite.addTestSuite(EditorSynchronizationTest.class); +// suite.addTestSuite(JSPPageCreationTest.class); +// suite.addTestSuite(XHTMLPageCreationTest.class); +// suite.addTestSuite(RenameFacesConfigFileTest.class); +// suite.addTestSuite(RenameJSPFileTest.class); +// suite.addTestSuite(RenameXHTMLFileTest.class); +// suite.addTestSuite(ImportUnknownTagsWizardTest.class); +// suite.addTestSuite(NewXHTMLPageWizardTest.class); suite.addTestSuite(VPESourceCodeTemplatesPreferencePageTest.class); return new TestSetup(suite); } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java 2010-05-06 14:08:46 UTC (rev 21935) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java 2010-05-06 14:21:19 UTC (rev 21936) @@ -11,7 +11,9 @@ package org.jboss.tools.vpe.ui.bot.test.wizard; import org.eclipse.swtbot.swt.finder.SWTBotTestCase; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.ui.bot.test.WidgetVariables; /** * This test class open vpe preference page @@ -32,8 +34,13 @@ .expandNode("Editors") //$NON-NLS-1$ .expandNode("Visual Page Editor") //$NON-NLS-1$ .select("Templates").click(); //$NON-NLS-1$ - this.bot.button("New...").click(); //$NON-NLS-1$ - this.bot.button("Cancel").click(); //$NON-NLS-1$ - System.out.println(this.bot.activeShell().getText()); + try{ + this.bot.button("New...").click(); //$NON-NLS-1$ + this.bot.button("Cancel").click(); //$NON-NLS-1$ + } catch(WidgetNotFoundException ex){ + fail("Preference Page has not been created"+ex);//$NON-NLS-1$ + }finally{ + this.bot.button(WidgetVariables.OK_BUTTON).click(); + } } }