Author: vpakan(a)redhat.com Date: 2011-01-05 08:20:20 -0500 (Wed, 05 Jan 2011) New Revision: 27908 Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 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/editor/TextSelectionTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java Log: Added CoreHTMLTagsTest and small fixes for VPE Bot Tests Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-01-05 13:11:19 UTC (rev 27907) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-01-05 13:20:20 UTC (rev 27908) @@ -654,4 +654,9 @@ } + public static class ToolbarButton{ + + public static final String REFRESH = "Refresh"; + + } } 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 2011-01-05 13:11:19 UTC (rev 27907) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2011-01-05 13:20:20 UTC (rev 27908) @@ -33,6 +33,7 @@ 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.editor.selectionbar.SelectionBarTest; +import org.jboss.tools.vpe.ui.bot.test.editor.tags.CoreHTMLTagsTest; 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; @@ -96,6 +97,7 @@ suite.addTestSuite(IncludedCssFilesJSPTest.class); suite.addTestSuite(StylesOnThePageTest.class); suite.addTestSuite(TextSelectionTest.class); + suite.addTestSuite(CoreHTMLTagsTest.class); return new TestSetup(suite); } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextSelectionTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextSelectionTest.java 2011-01-05 13:11:19 UTC (rev 27907) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextSelectionTest.java 2011-01-05 13:20:20 UTC (rev 27908) @@ -45,7 +45,7 @@ " </body>\n" + "</html>"; - private static final String TEST_PAGE_NAME = "TextSelectionTest.jsp"; + private static final String TEST_PAGE_NAME = "CoreHTMLTagsTest.jsp"; private SWTBotEditorExt jspEditor; private SWTBotWebBrowser webBrowser; @@ -65,7 +65,7 @@ /** * Tests Text Selection */ - public void ttestTextSelection(){ + public void testTextSelection(){ jspEditor.setText(TextSelectionTest.PAGE_TEXT); jspEditor.save(); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java 2011-01-05 13:11:19 UTC (rev 27907) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java 2011-01-05 13:20:20 UTC (rev 27908) @@ -19,19 +19,19 @@ private String editorText; private SWTBotEclipseEditor editor; - String getEditorText() { + protected String getEditorText() { return editorText; } - void setEditorText(String textEditor) { + protected void setEditorText(String textEditor) { this.editorText = textEditor; } - SWTBotEclipseEditor getEditor() { + protected SWTBotEclipseEditor getEditor() { return editor; } - void setEditor(SWTBotEclipseEditor editor) { + protected void setEditor(SWTBotEclipseEditor editor) { this.editor = editor; } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java 2011-01-05 13:11:19 UTC (rev 27907) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java 2011-01-05 13:20:20 UTC (rev 27908) @@ -1,6 +1,5 @@ package org.jboss.tools.vpe.ui.bot.test.editor.pagedesign; -import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; @@ -12,26 +11,7 @@ static final String ADD_EL = "Add EL Reference"; //$NON-NLS-1$ static final String SUBSTITUTED_EL = "Substituted EL expressions"; //$NON-NLS-1$ - private SWTBotEclipseEditor editor; - private String editorText; - - 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 {