Author: vpakan(a)redhat.com Date: 2011-04-11 10:03:00 -0400 (Mon, 11 Apr 2011) New Revision: 30471 Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AbstractTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CommandButtonTagTest.java Removed: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/RichFacesTagsTest.java 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/editor/tags/ActionParamTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AjaxValidatorTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/BeanValidatorTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CalendarTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ColumnGroupTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ColumnTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ColumnsTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ComboBoxTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataDefinitionTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataGridTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataListTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataOrderedListTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataScrollerTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataTableTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/EditorTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ExtendedDataTableTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/FileUploadTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/InplaceInputTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/InplaceSelectInputTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ListShuttleTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PanelMenuTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PanelTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PickListTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ProgressTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/SpacerTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/TogglePanelAndToogleControlTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ToolbarAndToolbarGroupTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/TreeTagTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/VirtualEarthTagTest.java Log: added Ajax Command Button Tag Test 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-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -41,6 +41,7 @@ import org.jboss.tools.vpe.ui.bot.test.editor.tags.ColumnTagTest; import org.jboss.tools.vpe.ui.bot.test.editor.tags.ColumnsTagTest; import org.jboss.tools.vpe.ui.bot.test.editor.tags.ComboBoxTagTest; +import org.jboss.tools.vpe.ui.bot.test.editor.tags.CommandButtonTagTest; import org.jboss.tools.vpe.ui.bot.test.editor.tags.CoreHTMLTagsTest; import org.jboss.tools.vpe.ui.bot.test.editor.tags.DataDefinitionTagTest; import org.jboss.tools.vpe.ui.bot.test.editor.tags.DataGridTagTest; @@ -157,7 +158,8 @@ suite.addTestSuite(ExtendedDataTableTagTest.class); suite.addTestSuite(ToolbarAndToolbarGroupTagTest.class); suite.addTestSuite(TogglePanelAndToogleControlTagTest.class); - suite.addTestSuite(XhtmlFilePerformanceTest.class); + suite.addTestSuite(CommandButtonTagTest.class); + suite.addTestSuite(XhtmlFilePerformanceTest.class); return new TestSetup(suite); } } Copied: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AbstractTagTest.java (from rev 30466, trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/RichFacesTagsTest.java) =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AbstractTagTest.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AbstractTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -0,0 +1,102 @@ +/******************************************************************************* + + * Copyright (c) 2007-2011 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.ui.bot.test.editor.tags; + +import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.Timing; +import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt; +import org.jboss.tools.vpe.ui.bot.test.editor.VPEEditorTestCase; +import org.jboss.tools.vpe.ui.bot.test.tools.SWTBotWebBrowser; +/** + * Abstract Tag Test behavior + * @author vlado pakan + * + */ +public abstract class AbstractTagTest extends VPEEditorTestCase { + + protected static final String TEST_PAGE_NAME_JSP = "TagTest.jsp"; + protected static final String TEST_PAGE_NAME_XHTML = "TagTest.xhtml"; + + protected SWTBotEditorExt jspEditor; + protected SWTBotEditorExt xhtmlEditor; + protected SWTBotWebBrowser jspWebBrowser; + protected SWTBotWebBrowser xhtmlWebBrowser; + protected SWTBotExt botExt; + + public AbstractTagTest() { + super(); + botExt = new SWTBotExt(); + } + @Override + protected void setUp() throws Exception { + super.setUp(); + eclipse.maximizeActiveShell(); + createJspPage(AbstractTagTest.TEST_PAGE_NAME_JSP); + jspEditor = botExt.swtBotEditorExtByTitle(AbstractTagTest.TEST_PAGE_NAME_JSP); + jspWebBrowser = new SWTBotWebBrowser(AbstractTagTest.TEST_PAGE_NAME_JSP,botExt); + createXhtmlPage(AbstractTagTest.TEST_PAGE_NAME_XHTML); + xhtmlEditor = botExt.swtBotEditorExtByTitle(AbstractTagTest.TEST_PAGE_NAME_XHTML); + xhtmlWebBrowser = new SWTBotWebBrowser(AbstractTagTest.TEST_PAGE_NAME_XHTML,botExt); + + } + + @Override + protected void closeUnuseDialogs() { + + } + + @Override + protected boolean isUnuseDialogOpened() { + return false; + } + @Override + protected void tearDown() throws Exception { + jspEditor.close(); + xhtmlEditor.close(); + super.tearDown(); + } + /** + * Runs Tag Testing + */ + public void testTag (){ + initPageContent (); + savePageContent (); + verifyTag(); + } + /** + * Initialize proper page content + */ + protected abstract void initPageContent (); + /** + * Verify tag + */ + protected abstract void verifyTag (); + /** + * Saves Page Content if it was changed and shows changed editor + */ + protected void savePageContent(){ + boolean wasSaved = false; + if (jspEditor.isDirty()){ + jspEditor.save(); + jspEditor.show(); + wasSaved = true; + } + if (xhtmlEditor.isDirty()){ + xhtmlEditor.save(); + xhtmlEditor.show(); + wasSaved = true; + } + if (wasSaved){ + bot.sleep(Timing.time3S()); + } + } +} Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AbstractTagTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ActionParamTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ActionParamTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ActionParamTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -20,7 +20,7 @@ * @author vlado pakan * */ -public class ActionParamTagTest extends RichFacesTagsTest{ +public class ActionParamTagTest extends AbstractTagTest{ @Override protected void initPageContent() { xhtmlEditor.setText("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" + Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AjaxValidatorTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AjaxValidatorTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/AjaxValidatorTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -20,7 +20,7 @@ * @author vlado pakan * */ -public class AjaxValidatorTagTest extends RichFacesTagsTest{ +public class AjaxValidatorTagTest extends AbstractTagTest{ private static final String INPUT_TEXT = "!*- Input Text"; @Override protected void initPageContent() { Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/BeanValidatorTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/BeanValidatorTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/BeanValidatorTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -20,7 +20,7 @@ * @author vlado pakan * */ -public class BeanValidatorTagTest extends RichFacesTagsTest{ +public class BeanValidatorTagTest extends AbstractTagTest{ private static final String INPUT_TEXT = "!*- Input Text"; @Override protected void initPageContent() { Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CalendarTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CalendarTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CalendarTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class CalendarTagTest extends RichFacesTagsTest{ +public class CalendarTagTest extends AbstractTagTest{ @Override protected void initPageContent() { xhtmlEditor.setText("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" + @@ -43,7 +43,7 @@ "INPUT", new String[]{"class"}, new String[]{"rich-calendar-input null"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); // check tag selection xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("INPUT",0), 0); bot.sleep(Timing.time3S()); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ColumnGroupTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ColumnGroupTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ColumnGroupTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class ColumnGroupTagTest extends RichFacesTagsTest{ +public class ColumnGroupTagTest extends AbstractTagTest{ private static final String SPAN_COLUMN_VALUE = "!-*Span Column Value"; private static final String SPAN_ROW__VALUE = "!-*Span Row Value"; private static final String CELL_1_0_VALUE = "!-* Cell 1x0 Value"; @@ -59,29 +59,29 @@ "TD", new String[]{"class","rowspan"}, new String[]{"dr-table-cell rich-table-cell dr-subtable-cell","2"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TD", new String[]{"class","colspan"}, new String[]{"dr-table-cell rich-table-cell dr-subtable-cell","2"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TD", new String[]{"class","breakbefore"}, new String[]{"dr-table-cell rich-table-cell dr-subtable-cell","true"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, ColumnGroupTagTest.SPAN_COLUMN_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, ColumnGroupTagTest.SPAN_ROW__VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, ColumnGroupTagTest.CELL_1_0_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, ColumnGroupTagTest.CELL_1_1_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); // check tag selection xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("TBODY",0), 0); bot.sleep(Timing.time3S()); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ColumnTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ColumnTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ColumnTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class ColumnTagTest extends RichFacesTagsTest{ +public class ColumnTagTest extends AbstractTagTest{ private static final String COLUMN_HEADER_VALUE = "!-*Column Header Value"; private static final String COLUMN_VALUE = "!-*Column Value"; @Override @@ -52,28 +52,28 @@ "TR", new String[]{"class"}, new String[]{"dr-table-subheader rich-table-subheader"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TD", new String[]{"class"}, new String[]{"dr-table-subheadercell rich-table-subheadercell"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TR", new String[]{"class"}, new String[]{"dr-table-firstrow rich-table-firstrow"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TD", new String[]{"class"}, new String[]{"dr-table-cell rich-table-cell"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, ColumnTagTest.COLUMN_HEADER_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, ColumnTagTest.COLUMN_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); // check tag selection xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("TD",2), 0); bot.sleep(Timing.time3S()); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ColumnsTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ColumnsTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ColumnsTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -16,7 +16,7 @@ * @author vlado pakan * */ -public class ColumnsTagTest extends RichFacesTagsTest{ +public class ColumnsTagTest extends AbstractTagTest{ private static final String columnHeader = "Column Header"; private static final String columnValue = "Column Value"; @@ -52,30 +52,30 @@ protected void verifyTag() { assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, columnHeader, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, columnValue, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TR", new String[]{"class"}, new String[]{"dr-table-subheader rich-table-subheader"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TD", new String[]{"class"}, new String[]{"dr-table-subheadercell rich-table-subheadercell"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TR", new String[]{"class"}, new String[]{"dr-table-firstrow rich-table-firstrow"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TD", new String[]{"class"}, new String[]{"dr-table-cell rich-table-cell"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ComboBoxTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ComboBoxTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ComboBoxTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class ComboBoxTagTest extends RichFacesTagsTest{ +public class ComboBoxTagTest extends AbstractTagTest{ private static final String defaultLabel = "DefaultLabel"; @Override @@ -48,22 +48,22 @@ "INPUT", new String[]{"type","class","value"}, new String[]{"text","rich-combobox-font-disabled rich-combobox-input-inactive",defaultLabel}, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); assertVisualEditorContains(jspWebBrowser, "INPUT", new String[]{"type","class"}, new String[]{"text","rich-combobox-font-inactive rich-combobox-button-background rich-combobox-button-inactive"}, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); assertVisualEditorContains(jspWebBrowser, "INPUT", new String[]{"type","class"}, new String[]{"text","rich-combobox-font-inactive rich-combobox-button-icon-inactive rich-combobox-button-inactive"}, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); assertVisualEditorContains(jspWebBrowser, "DIV", new String[]{"class"}, new String[]{"rich-combobox-strut rich-combobox-font"}, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); // check tag selection jspWebBrowser.selectDomNode(jspWebBrowser.getDomNodeByTagName("INPUT"), 0); bot.sleep(Timing.time3S()); Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CommandButtonTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CommandButtonTagTest.java (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CommandButtonTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -0,0 +1,61 @@ +/******************************************************************************* + + * Copyright (c) 2007-2011 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.ui.bot.test.editor.tags; + +import org.jboss.tools.ui.bot.ext.Timing; + +/** + * Tests ajax command button Tag behavior + * @author vlado pakan + * + */ +public class CommandButtonTagTest extends AbstractTagTest{ + @Override + protected void initPageContent() { + jspEditor.setText("<%@ taglib uri=\"http://java.sun.com/jsf/html\" prefix=\"h\" %>\n" + + "<%@ taglib uri=\"http://java.sun.com/jsf/core\" prefix=\"f\" %>\n" + + "<%@ taglib uri=\"http://richfaces.org/a4j\" prefix=\"a4j\" %>\n" + + "<%@ taglib uri=\"http://richfaces.org/rich\" prefix=\"rich\" %>\n" + + "<html>\n" + + " <head>\n" + + " </head>\n" + + " <body>\n" + + " <f:view>\n" + + " <a4j:commandButton type=\"Submit\">\n" + + " </a4j:commandButton>\n" + + " </f:view>\n" + + " </body> \n" + + "</html>"); + } + + @Override + protected void verifyTag() { + assertVisualEditorContains(jspWebBrowser, + "INPUT", + new String[]{"type"}, + new String[]{"Submit"}, + AbstractTagTest.TEST_PAGE_NAME_JSP); + // check tag selection + jspWebBrowser.selectDomNode(jspWebBrowser.getDomNodeByTagName("INPUT",0), 0); + bot.sleep(Timing.time3S()); + String selectedText = jspEditor.getSelection(); + String hasToStartWith = "<a4j:commandButton type=\"Submit\">"; + assertTrue("Selected text in Source Pane has to start with '" + hasToStartWith + "'" + + "\nbut it is '" + selectedText + "'", + selectedText.trim().startsWith(hasToStartWith)); + String hasEndWith = "</a4j:commandButton>"; + assertTrue("Selected text in Source Pane has to end with '" + hasEndWith + "'" + + "\nbut it is '" + selectedText + "'", + selectedText.trim().endsWith(hasEndWith)); + } + +} Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/CommandButtonTagTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataDefinitionTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataDefinitionTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataDefinitionTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class DataDefinitionTagTest extends RichFacesTagsTest{ +public class DataDefinitionTagTest extends AbstractTagTest{ private static String testText = "test_text"; private static int numRows = 3; @Override @@ -47,21 +47,21 @@ protected void verifyTag() { assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, DataDefinitionTagTest.testText, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsManyNodes(xhtmlWebBrowser, "DD", DataDefinitionTagTest.numRows, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "DL", new String[]{"class"}, new String[]{"listClass"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "DD", new String[]{"class"}, new String[]{"columnClass"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); // check tag selection xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("DD",2), 0); bot.sleep(Timing.time3S()); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataGridTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataGridTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataGridTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class DataGridTagTest extends RichFacesTagsTest{ +public class DataGridTagTest extends AbstractTagTest{ private static final String HEADER_VALUE = "!-*Header Value"; private static final String FOOTER_VALUE = "!-*Footer Value"; private static final String CELL_0_VALUE = "!-*Cell 0 Value"; @@ -58,63 +58,63 @@ "TABLE", new String[]{"class","columns","elements"}, new String[]{"dr-table rich-table",DataGridTagTest.GRID_COLUMNS,DataGridTagTest.GRID_ELEMENTS}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "THEAD", null, null, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TFOOT", null, null, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TR", new String[]{"class"}, new String[]{"dr-table-header rich-table-header"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TD", new String[]{"class"}, new String[]{"dr-table-headercell rich-table-headercell"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TR", new String[]{"class"}, new String[]{"dr-table-footer rich-table-footer"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TD", new String[]{"class"}, new String[]{"dr-table-footercell rich-table-footercell"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TR", new String[]{"class"}, new String[]{"dr-table-row rich-table-row"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TD", new String[]{"class"}, new String[]{"dr-table-cell rich-table-cell"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsManyNodes(xhtmlWebBrowser, "SPAN", 2 + (2 * Integer.parseInt(DataGridTagTest.GRID_ELEMENTS)), - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, DataGridTagTest.HEADER_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, DataGridTagTest.FOOTER_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, DataGridTagTest.CELL_0_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, DataGridTagTest.CELL_1_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); // check tag selection xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("THEAD",0), 0); bot.sleep(Timing.time3S()); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataListTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataListTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataListTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class DataListTagTest extends RichFacesTagsTest{ +public class DataListTagTest extends AbstractTagTest{ private static final String ROW_0_VALUE = "!-* Row 0 Value"; private static final String ROW_1_VALUE = "!-* Row 1 Value"; private static final String ROW_2_VALUE = "!-* Row 2 Value"; @@ -51,21 +51,21 @@ "UL", new String[]{"class"}, new String[]{"dr-list rich-datalist"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "LI", new String[]{"class"}, new String[]{"dr-list-item rich-list-item"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, DataListTagTest.ROW_0_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, DataListTagTest.ROW_1_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, DataListTagTest.ROW_2_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); // check tag selecti xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("LI",0), 0); bot.sleep(Timing.time3S()); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataOrderedListTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataOrderedListTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataOrderedListTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class DataOrderedListTagTest extends RichFacesTagsTest{ +public class DataOrderedListTagTest extends AbstractTagTest{ private static final String ROW_0_VALUE = "!-* Row 0 Value"; private static final String ROW_1_VALUE = "!-* Row 1 Value"; private static final String ROW_2_VALUE = "!-* Row 2 Value"; @@ -51,21 +51,21 @@ "OL", new String[]{"class"}, new String[]{"dr-list rich-orderedlist"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "LI", new String[]{"class"}, new String[]{"dr-list-item rich-list-item"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, DataOrderedListTagTest.ROW_0_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, DataOrderedListTagTest.ROW_1_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, DataOrderedListTagTest.ROW_2_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); // check tag selecti xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("LI",0), 0); bot.sleep(Timing.time3S()); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataScrollerTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataScrollerTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataScrollerTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class DataScrollerTagTest extends RichFacesTagsTest{ +public class DataScrollerTagTest extends AbstractTagTest{ private static final String DATA_SCROLLER_STYLE = "background-color: red;"; @Override protected void initPageContent() { @@ -45,22 +45,22 @@ "DIV", new String[]{"class","style"}, new String[]{"rich-datascr",DataScrollerTagTest.DATA_SCROLLER_STYLE}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TD", new String[]{"class"}, new String[]{"rich-datascr-button rich-datascr-button-dsbld"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TD", new String[]{"class"}, new String[]{"rich-datascr-act"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TD", new String[]{"class"}, new String[]{"rich-datascr-inact"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); // check tag selection xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("DIV",4), 0); bot.sleep(Timing.time3S()); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataTableTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataTableTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/DataTableTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class DataTableTagTest extends RichFacesTagsTest{ +public class DataTableTagTest extends AbstractTagTest{ private static final String TABLE_HEADER_VALUE = "!-*Table Header Value"; private static final String COLUMN_HEADER_VALUE = "!-*Column Header Value"; private static final String COLUMN_0_VALUE = "!-*Column 0 Value"; @@ -58,49 +58,49 @@ "TABLE", new String[]{"class"}, new String[]{"dr-table rich-table"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TR", new String[]{"class"}, new String[]{"dr-table-header rich-table-header"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TD", new String[]{"class"}, new String[]{"dr-table-headercell rich-table-headercell"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TR", new String[]{"class"}, new String[]{"dr-table-subheader rich-table-subheader"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TD", new String[]{"class"}, new String[]{"dr-table-subheadercell rich-table-subheadercell"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TR", new String[]{"class"}, new String[]{"dr-table-firstrow rich-table-firstrow"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TD", new String[]{"class"}, new String[]{"dr-table-cell rich-table-cell"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, DataTableTagTest.TABLE_HEADER_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, DataTableTagTest.COLUMN_HEADER_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, DataTableTagTest.COLUMN_0_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, DataTableTagTest.COLUMN_1_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); // check tag selection xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("THEAD",0), 0); bot.sleep(Timing.time3S()); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/EditorTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/EditorTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/EditorTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class EditorTagTest extends RichFacesTagsTest{ +public class EditorTagTest extends AbstractTagTest{ @Override protected void initPageContent() { xhtmlEditor.setText("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" + @@ -44,7 +44,7 @@ "DIV", new String[]{"class"}, new String[]{"mceIframeContainer"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); // check tag selection xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("DIV",4), 0); bot.sleep(Timing.time3S()); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ExtendedDataTableTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ExtendedDataTableTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ExtendedDataTableTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class ExtendedDataTableTagTest extends RichFacesTagsTest{ +public class ExtendedDataTableTagTest extends AbstractTagTest{ private static final String COL_0_VALUE = "!-* Col 0 Value"; private static final String COL_1_VALUE = "!-* Col 1 Value"; private static final String COL_0_LABEL = "!-* Col 0 Label"; @@ -59,44 +59,44 @@ "TR", new String[]{"class"}, new String[]{"dr-table-subheader rich-table-subheader"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TH", new String[]{"class"}, new String[]{"dr-table-subheadercell rich-table-subheadercell"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TR", new String[]{"class"}, new String[]{"dr-table-subfooter rich-table-subfooter"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TD", new String[]{"class"}, new String[]{"dr-table-subfootercell rich-table-subfootercell dr-table-subfooter rich-table-subfooter"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TR", new String[]{"class"}, new String[]{"dr-body-table-tr"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TD", new String[]{"class"}, new String[]{"dr-table-cell rich-table-cell"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, ExtendedDataTableTagTest.COL_0_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, ExtendedDataTableTagTest.COL_1_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, ExtendedDataTableTagTest.COL_0_LABEL, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, ExtendedDataTableTagTest.COL_1_LABEL, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); // check tag selecti xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("TABLE",1), 0); bot.sleep(Timing.time3S()); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/FileUploadTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/FileUploadTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/FileUploadTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class FileUploadTagTest extends RichFacesTagsTest{ +public class FileUploadTagTest extends AbstractTagTest{ @Override protected void initPageContent() { jspEditor.setText("<%@ taglib uri=\"http://java.sun.com/jsf/html\" prefix=\"h\" %>\n" + @@ -45,37 +45,37 @@ "B", new String[]{"title"}, new String[]{"rich:fileUpload fileUploadListener: maxFilesQuantity: 1 id: upload immediateUpload: false acceptedTypes: jpg style: width:500; height:500"}, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); assertVisualEditorContains(jspWebBrowser, "DIV", new String[]{"class"}, new String[]{"rich-fileupload-list-decor"}, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); assertVisualEditorContains(jspWebBrowser, "DIV", new String[]{"class"}, new String[]{"rich-fileupload-button-border"}, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); assertVisualEditorContains(jspWebBrowser, "DIV", new String[]{"class"}, new String[]{"rich-fileupload-button rich-fileupload-font"}, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); assertVisualEditorContains(jspWebBrowser, "DIV", new String[]{"class"}, new String[]{"rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-add"}, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); assertVisualEditorContains(jspWebBrowser, "DIV", new String[]{"class"}, new String[]{"rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-start"}, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); assertVisualEditorContains(jspWebBrowser, "DIV", new String[]{"class"}, new String[]{"rich-fileupload-button-content rich-fileupload-font rich-fileupload-ico rich-fileupload-ico-clear"}, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); // check tag selection jspWebBrowser.selectDomNode(jspWebBrowser.getDomNodeByTagName("B",0), 0); bot.sleep(Timing.time3S()); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/InplaceInputTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/InplaceInputTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/InplaceInputTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class InplaceInputTagTest extends RichFacesTagsTest{ +public class InplaceInputTagTest extends AbstractTagTest{ private static final String defaultLabel = "DefaultLabel"; @Override protected void initPageContent() { @@ -42,10 +42,10 @@ "SPAN", new String[]{"vpe-user-toggle-id","title","class"}, new String[]{"false","rich:inplaceInput defaultLabel: " + defaultLabel,"rich-inplace rich-inplace-view"}, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); assertVisualEditorContainsNodeWithValue(jspWebBrowser, defaultLabel, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); // check tag selection jspWebBrowser.selectDomNode(jspWebBrowser.getDomNodeByTagName("SPAN",2), 0); bot.sleep(Timing.time3S()); @@ -61,12 +61,12 @@ "SPAN", new String[]{"vpe-user-toggle-id","class"}, new String[]{"true","rich-inplace rich-inplace-edit"}, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); assertVisualEditorContains(jspWebBrowser, "INPUT", new String[]{"type","class","value"}, new String[]{"text","rich-inplace-field",defaultLabel}, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); assertTrue("Selected text in Source Pane has to be '" + expectedSelectedText + "'" + "\nbut it is '" + selectedText + "'", selectedText.trim().equals(expectedSelectedText)); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/InplaceSelectInputTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/InplaceSelectInputTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/InplaceSelectInputTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class InplaceSelectInputTagTest extends RichFacesTagsTest{ +public class InplaceSelectInputTagTest extends AbstractTagTest{ private static final String defaultLabel = "DefaultLabel"; private static final String option1 = "Option 1"; private static final String option2 = "Option 2"; @@ -47,10 +47,10 @@ "SPAN", new String[]{"vpe-user-toggle-id","title","class"}, new String[]{"false","rich:inplaceSelect value: 0 defaultLabel: " + defaultLabel,"rich-inplace-select rich-inplace-select-view"}, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); assertVisualEditorContainsNodeWithValue(jspWebBrowser, defaultLabel, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); // check tag selection jspWebBrowser.selectDomNode(jspWebBrowser.getDomNodeByTagName("SPAN",2), 0); bot.sleep(Timing.time3S()); @@ -70,16 +70,16 @@ "SPAN", new String[]{"vpe-user-toggle-id","class"}, new String[]{"true","rich-inplace-select rich-inplace-select-edit"}, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); assertVisualEditorContainsNodeWithValue(jspWebBrowser, option1, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); assertVisualEditorContainsNodeWithValue(jspWebBrowser, option2, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); assertVisualEditorNotContainNodeWithValue(jspWebBrowser, defaultLabel, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); selectedText = jspEditor.getSelection(); // check tag selection assertTrue("Selected text in Source Pane has to start with '" + hasToStartWith + "'" + Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ListShuttleTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ListShuttleTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ListShuttleTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class ListShuttleTagTest extends RichFacesTagsTest{ +public class ListShuttleTagTest extends AbstractTagTest{ @Override protected void initPageContent() { xhtmlEditor.setText("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" + @@ -43,55 +43,55 @@ assertVisualEditorContainsNodeWithValue( xhtmlWebBrowser, "Copy all", - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue( xhtmlWebBrowser, "Copy", - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue( xhtmlWebBrowser, "Remove All", - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue( xhtmlWebBrowser, "Remove", - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue( xhtmlWebBrowser, "First", - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue( xhtmlWebBrowser, "Up", - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue( xhtmlWebBrowser, "Last", - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue( xhtmlWebBrowser, "Down", - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "DIV", new String[]{"class"}, new String[]{"rich-shuttle-button-content"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TABLE", new String[]{"class"}, new String[]{"rich-list-shuttle"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "DIV", new String[]{"class"}, new String[]{"rich-shuttle-controls"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "DIV", new String[]{"class"}, new String[]{"rich-shuttle-control"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); // check tag selection xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("DIV",4), 0); bot.sleep(Timing.time3S()); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PanelMenuTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PanelMenuTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PanelMenuTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class PanelMenuTagTest extends RichFacesTagsTest{ +public class PanelMenuTagTest extends AbstractTagTest{ private static String getSubGroupLabel (final int groupIndex , final int subGroupIndex){ StringBuffer sb = new StringBuffer(); @@ -104,29 +104,29 @@ "TD", new String[]{"class"}, new String[]{"rich-pmenu-top-group-self-label"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TD", new String[]{"class"}, new String[]{"rich-pmenu-group-self-icon rich-pmenu-top-group-self-icon"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TABLE", new String[]{"class"}, new String[]{"dr-pmenu-top-group rich-pmenu-group"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, PanelMenuTagTest.getGroupLabel(0), - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, PanelMenuTagTest.getGroupLabel(1), - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, PanelMenuTagTest.getGroupLabel(2), - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorNotContainNodeWithValue(xhtmlWebBrowser, PanelMenuTagTest.getGroupItemLabel(0, 0), - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); // check tag selection xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("DIV",4), 0); bot.sleep(Timing.time3S()); @@ -173,12 +173,12 @@ selectedText.trim().endsWith(hasToEndWith)); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, PanelMenuTagTest.getSubGroupItemLabel(1, 0, 0), - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TD", new String[]{"class"}, new String[]{"rich-pmenu-item-label"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PanelTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PanelTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PanelTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class PanelTagTest extends RichFacesTagsTest{ +public class PanelTagTest extends AbstractTagTest{ private static final String HEADER_VALUE = "!-*Header Value"; private static final String BODY_VALUE = "!-*Body Value"; @Override @@ -50,18 +50,18 @@ "DIV", new String[]{"class"}, new String[]{"dr-pnl rich-panel"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "DIV", new String[]{"class"}, new String[]{"dr-pnl-b rich-panel-body"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, PanelTagTest.HEADER_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, PanelTagTest.BODY_VALUE, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); // check tag selection xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("DIV",4), 0); bot.sleep(Timing.time3S()); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PickListTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PickListTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/PickListTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class PickListTagTest extends RichFacesTagsTest{ +public class PickListTagTest extends AbstractTagTest{ private static final String[] options = new String[] {"Option0","Option1","Option2","Option3"}; @Override @@ -57,41 +57,41 @@ protected void verifyTag() { assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, "Copy all", - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, "Copy", - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, "Remove All", - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, "Remove", - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TABLE", new String[]{"class"}, new String[]{"rich-list-picklist"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TABLE", new String[]{"class"}, new String[]{"rich-picklist-body"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TABLE", new String[]{"class"}, new String[]{"rich-picklist-internal-tab"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "TBODY", null, null, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); int index = 0; for (String option : options ){ assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, option, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); StringBuffer sbTitle = new StringBuffer(""); sbTitle.append("f:selectItem itemLabel: "); sbTitle.append(option); @@ -103,7 +103,7 @@ "OPTION", new String[]{"title"}, new String[]{sbTitle.toString()}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); index++; } // check tag selection @@ -143,7 +143,7 @@ "OPTION", new String[]{"title","style"}, new String[]{sbOptionTitle.toString(),"border: 2px solid rgb(0, 0, 255) ! important;"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ProgressTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ProgressTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ProgressTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class ProgressTagTest extends RichFacesTagsTest{ +public class ProgressTagTest extends AbstractTagTest{ @Override protected void initPageContent() { jspEditor.setText("<%@ taglib uri=\"http://java.sun.com/jsf/html\" prefix=\"h\" %>\n" + @@ -42,7 +42,7 @@ "DIV", new String[]{"title","class"}, new String[]{"rich:progressBar mode: client id: progressBar","rich-progress-bar-block rich-progress-bar-width rich-progress-bar-shell"}, - RichFacesTagsTest.TEST_PAGE_NAME_JSP); + AbstractTagTest.TEST_PAGE_NAME_JSP); // check tag selection jspWebBrowser.selectDomNode(jspWebBrowser.getDomNodeByTagName("DIV",4), 0); bot.sleep(Timing.time3S()); Deleted: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/RichFacesTagsTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/RichFacesTagsTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/RichFacesTagsTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -1,102 +0,0 @@ -/******************************************************************************* - - * Copyright (c) 2007-2011 Exadel, Inc. and Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.vpe.ui.bot.test.editor.tags; - -import org.jboss.tools.ui.bot.ext.SWTBotExt; -import org.jboss.tools.ui.bot.ext.Timing; -import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt; -import org.jboss.tools.vpe.ui.bot.test.editor.VPEEditorTestCase; -import org.jboss.tools.vpe.ui.bot.test.tools.SWTBotWebBrowser; -/** - * Tests Rich Faces Tags behavior - * @author vlado pakan - * - */ -public abstract class RichFacesTagsTest extends VPEEditorTestCase { - - protected static final String TEST_PAGE_NAME_JSP = "RichFacesTagsTest.jsp"; - protected static final String TEST_PAGE_NAME_XHTML = "RichFacesTagsTest.xhtml"; - - protected SWTBotEditorExt jspEditor; - protected SWTBotEditorExt xhtmlEditor; - protected SWTBotWebBrowser jspWebBrowser; - protected SWTBotWebBrowser xhtmlWebBrowser; - protected SWTBotExt botExt; - - public RichFacesTagsTest() { - super(); - botExt = new SWTBotExt(); - } - @Override - protected void setUp() throws Exception { - super.setUp(); - eclipse.maximizeActiveShell(); - createJspPage(RichFacesTagsTest.TEST_PAGE_NAME_JSP); - jspEditor = botExt.swtBotEditorExtByTitle(RichFacesTagsTest.TEST_PAGE_NAME_JSP); - jspWebBrowser = new SWTBotWebBrowser(RichFacesTagsTest.TEST_PAGE_NAME_JSP,botExt); - createXhtmlPage(RichFacesTagsTest.TEST_PAGE_NAME_XHTML); - xhtmlEditor = botExt.swtBotEditorExtByTitle(RichFacesTagsTest.TEST_PAGE_NAME_XHTML); - xhtmlWebBrowser = new SWTBotWebBrowser(RichFacesTagsTest.TEST_PAGE_NAME_XHTML,botExt); - - } - - @Override - protected void closeUnuseDialogs() { - - } - - @Override - protected boolean isUnuseDialogOpened() { - return false; - } - @Override - protected void tearDown() throws Exception { - jspEditor.close(); - xhtmlEditor.close(); - super.tearDown(); - } - /** - * Runs Tag Testing - */ - public void testTag (){ - initPageContent (); - savePageContent (); - verifyTag(); - } - /** - * Initialize proper page content - */ - protected abstract void initPageContent (); - /** - * Verify tag - */ - protected abstract void verifyTag (); - /** - * Saves Page Content if it was changed and shows changed editor - */ - protected void savePageContent(){ - boolean wasSaved = false; - if (jspEditor.isDirty()){ - jspEditor.save(); - jspEditor.show(); - wasSaved = true; - } - if (xhtmlEditor.isDirty()){ - xhtmlEditor.save(); - xhtmlEditor.show(); - wasSaved = true; - } - if (wasSaved){ - bot.sleep(Timing.time3S()); - } - } -} Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/SpacerTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/SpacerTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/SpacerTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class SpacerTagTest extends RichFacesTagsTest{ +public class SpacerTagTest extends AbstractTagTest{ private static final String SPACER_STYLE = "background-color: red;"; @Override protected void initPageContent() { @@ -44,7 +44,7 @@ "IMG", new String[]{"width","height","class","style"}, new String[]{"1px","1px","rich-spacer",SpacerTagTest.SPACER_STYLE}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); // check tag selection xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("IMG",0), 0); bot.sleep(Timing.time3S()); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/TogglePanelAndToogleControlTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/TogglePanelAndToogleControlTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/TogglePanelAndToogleControlTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class TogglePanelAndToogleControlTagTest extends RichFacesTagsTest{ +public class TogglePanelAndToogleControlTagTest extends AbstractTagTest{ private static final String FACET_0_LABEL = "!-* Facet 0 Label"; private static final String FACET_1_LABEL = "!-* Facet 1 Label"; @Override @@ -51,10 +51,10 @@ protected void verifyTag() { assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, TogglePanelAndToogleControlTagTest.FACET_0_LABEL, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorNotContainNodeWithValue(xhtmlWebBrowser, TogglePanelAndToogleControlTagTest.FACET_1_LABEL, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); // check tag selection xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("DIV",4), 0); bot.sleep(Timing.time3S()); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ToolbarAndToolbarGroupTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ToolbarAndToolbarGroupTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/ToolbarAndToolbarGroupTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class ToolbarAndToolbarGroupTagTest extends RichFacesTagsTest{ +public class ToolbarAndToolbarGroupTagTest extends AbstractTagTest{ private static final String GROUP_0_LABEL = "!-* Group 0 Label"; private static final String GROUP_1_LABEL = "!-* Group 1 Label"; @Override @@ -51,13 +51,13 @@ "TD", new String[]{"class"}, new String[]{"dr-toolbar-int rich-toolbar-item"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, ToolbarAndToolbarGroupTagTest.GROUP_0_LABEL, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, ToolbarAndToolbarGroupTagTest.GROUP_1_LABEL, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); // check tag selection xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("TBODY",0), 0); bot.sleep(Timing.time3S()); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/TreeTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/TreeTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/TreeTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class TreeTagTest extends RichFacesTagsTest{ +public class TreeTagTest extends AbstractTagTest{ private static final String typeLibrary = "library"; private static final String typePathway = "pathway"; private static final String typeOrganism = "organism"; @@ -55,18 +55,18 @@ protected void verifyTag() { assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, TreeTagTest.typePathway, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, TreeTagTest.typeLibrary, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContainsNodeWithValue(xhtmlWebBrowser, TreeTagTest.typeOrganism, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "IMG", new String[]{"class"}, new String[]{"treePictureStyle"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); // check tag selection xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("DIV",4), 0); bot.sleep(Timing.time3S()); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/VirtualEarthTagTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/VirtualEarthTagTest.java 2011-04-11 13:18:51 UTC (rev 30470) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/VirtualEarthTagTest.java 2011-04-11 14:03:00 UTC (rev 30471) @@ -18,7 +18,7 @@ * @author vlado pakan * */ -public class VirtualEarthTagTest extends RichFacesTagsTest{ +public class VirtualEarthTagTest extends AbstractTagTest{ @Override protected void initPageContent() { xhtmlEditor.setText("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" + @@ -42,12 +42,12 @@ assertVisualEditorContainsManyNodes(xhtmlWebBrowser, "IMG", 2, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); assertVisualEditorContains(xhtmlWebBrowser, "SCRIPT", new String[]{"type","src"}, new String[]{"text/javascript","mozileLoader.js"}, - RichFacesTagsTest.TEST_PAGE_NAME_XHTML); + AbstractTagTest.TEST_PAGE_NAME_XHTML); // check tag selection xhtmlWebBrowser.selectDomNode(xhtmlWebBrowser.getDomNodeByTagName("IMG",0), 0); bot.sleep(Timing.time3S());