Author: vpakan(a)redhat.com Date: 2011-11-21 11:04:00 -0500 (Mon, 21 Nov 2011) New Revision: 36494 Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/FacesConfigEditingTest.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/Assertions.java trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/MarkerHelper.java 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/view/ProblemsView.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/EditingActionsTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/InsertActionsTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextEditingActionsTest.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/tags/JSFTagsTest.java Log: Added FacesConfigEditingTest. Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2011-11-21 15:35:25 UTC (rev 36493) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2011-11-21 16:04:00 UTC (rev 36494) @@ -13,6 +13,7 @@ import org.jboss.tools.jsf.ui.bot.test.smoke.CodeCompletionTest; import org.jboss.tools.jsf.ui.bot.test.smoke.CreateNewJSFProjectTest; import org.jboss.tools.jsf.ui.bot.test.smoke.FacesConfigCodeCompletionTest; +import org.jboss.tools.jsf.ui.bot.test.smoke.FacesConfigEditingTest; import org.jboss.tools.jsf.ui.bot.test.smoke.MarkersTest; import org.jboss.tools.jsf.ui.bot.test.smoke.OpenOnTest; import org.jboss.tools.jsf.ui.bot.test.smoke.WebXmlEditorTest; @@ -45,6 +46,7 @@ JSF2AttributeRenameTest.class, OpenOnTest.class, CodeCompletionTest.class, + FacesConfigEditingTest.class, FacesConfigCodeCompletionTest.class, MarkersTest.class, WebXmlEditorTest.class, Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/FacesConfigEditingTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/FacesConfigEditingTest.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/FacesConfigEditingTest.java 2011-11-21 16:04:00 UTC (rev 36494) @@ -0,0 +1,162 @@ +/******************************************************************************* + * Copyright (c) 2007-2011 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.ui.bot.test.smoke; + +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; +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.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase; +import org.jboss.tools.ui.bot.ext.Assertions; +import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.SWTUtilExt; +import org.jboss.tools.ui.bot.ext.Timing; +import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt; +import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.jboss.tools.ui.bot.ext.view.ProblemsView; +import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; +/** Test Editing of faces-config.xml file + * @author Vladimir Pakan + * + */ +public class FacesConfigEditingTest extends JSFAutoTestCase{ + + private static final String FACES_CONFIG_FILE_NAME = "faces-config.xml"; + private SWTBotEditor facesConfigEditor; + private String originalContent; + private SWTBotEditorExt facesConfigEditorExt; + private SWTBotExt botExt; + + @Override + public void setUp() throws Exception { + super.setUp(); + facesConfigEditor = eclipse.openFile(VPEAutoTestCase.JBT_TEST_PROJECT_NAME, + "WebContent", + "WEB-INF", + FacesConfigEditingTest.FACES_CONFIG_FILE_NAME); + originalContent = facesConfigEditor.toTextEditor().getText(); + facesConfigEditorExt = new SWTBotEditorExt(facesConfigEditor.toTextEditor().getReference(),bot); + botExt = new SWTBotExt(); + } + + @Override + public void tearDown() throws Exception { + if (facesConfigEditor != null) { + facesConfigEditor.toTextEditor().setText(originalContent); + facesConfigEditor.saveAndClose(); + } + super.tearDown(); + } + /** + * Test Managed Bean editing + */ + public void testManagedBean(){ + facesConfigEditorExt.selectPage(IDELabel.FacesConfigEditor.TREE_TAB_LABEL); + SWTBot editorBot = facesConfigEditorExt.bot(); + SWTBotTree tree = editorBot.tree(); + SWTUtilExt.displayAllBotWidgets(facesConfigEditor.bot()); + final String managedBeanName = "TestBean"; + final String managedBeanClass = "TestBeanClass"; + SWTBotTreeItem tiFacesConfigXml = tree.expandNode(FacesConfigEditingTest.FACES_CONFIG_FILE_NAME); + SWTBotTreeItem tiManagedbean = tiFacesConfigXml.getNode(IDELabel.FacesConfigEditor.MANAGED_BEANS_NODE); + tiManagedbean.select(); + bot.sleep(Timing.time1S()); + // Add managed bean + editorBot.button(IDELabel.Button.ADD).click(); + bot.shell(IDELabel.Shell.NEW_MANAGED_BEAN).activate(); + bot.textWithLabel(IDELabel.FacesConfigEditor.NEW_MANAGED_BEAN_CLASS_LABEL) + .setText(managedBeanClass); + bot.textWithLabel(IDELabel.FacesConfigEditor.NEW_MANAGED_BEAN_NAME_LABEL) + .setText(managedBeanName); + bot.button(IDELabel.Button.FINISH).click(); + facesConfigEditorExt.save(); + bot.sleep(Timing.time1S()); + assertFacesConfigXmlHasNoErrors(botExt); + final String selectedNode = tree.selection().get(0,0); + assertTrue ("Selected node has to have label '" + managedBeanName +"'\n" + + "but has '" + selectedNode + "'.", + selectedNode.equals(managedBeanName)); + Assertions.assertFileExistsInWorkspace(managedBeanClass + ".java", + JBT_TEST_PROJECT_NAME,"JavaSource"); + Assertions.assertSourceEditorContains(facesConfigEditorExt.getText(), + "<managed-bean-name>" + managedBeanName + "</managed-bean-name>", + FacesConfigEditingTest.FACES_CONFIG_FILE_NAME); + Assertions.assertSourceEditorContains(facesConfigEditorExt.getText(), + "<managed-bean-class>" + managedBeanClass + "</managed-bean-class>", + FacesConfigEditingTest.FACES_CONFIG_FILE_NAME); + SWTUtilExt.displayAllBotWidgets(facesConfigEditor.bot()); + // Modify Managed Bean + editorBot.textWithLabel(IDELabel.FacesConfigEditor.MANAGED_BEAN_CLASS_LABEL) + .setText(managedBeanClass + "xxqq"); + facesConfigEditorExt.save(); + bot.sleep(Timing.time1S()); + assertFacesConfigXmlHasErrors(botExt); + editorBot.textWithLabel(IDELabel.FacesConfigEditor.MANAGED_BEAN_CLASS_LABEL) + .setText(managedBeanClass); + facesConfigEditorExt.save(); + bot.sleep(Timing.time1S()); + // Delete Managed Bean + tiManagedbean.select(); + editorBot.table().select(managedBeanName); + editorBot.button(IDELabel.Button.REMOVE_WITH_DOTS).click(); + bot.shell(IDELabel.Shell.CONFIRMATION).activate(); + bot.checkBox(IDELabel.FacesConfigEditor.DELETE_JAVA_SOURCE_CHECK_BOX).select(); + bot.button(IDELabel.Button.OK).click(); + boolean managedBeanWasDeleted = false; + try{ + editorBot.table().select(managedBeanName); + } catch (WidgetNotFoundException wnfe){ + managedBeanWasDeleted = true; + } catch (IllegalArgumentException iae){ + managedBeanWasDeleted = true; + } + assertTrue("Managed bean " + managedBeanName + " was not deleted properly.", + managedBeanWasDeleted); + Assertions.assertFileNotExistsInWorkspace(managedBeanClass + ".java", + JBT_TEST_PROJECT_NAME,"JavaSource"); + Assertions.assertSourceEditorNotContain(facesConfigEditorExt.getText(), + "<managed-bean-name>" + managedBeanName + "</managed-bean-name>", + FacesConfigEditingTest.FACES_CONFIG_FILE_NAME); + Assertions.assertSourceEditorNotContain(facesConfigEditorExt.getText(), + "<managed-bean-class>" + managedBeanClass + "</managed-bean-class>", + FacesConfigEditingTest.FACES_CONFIG_FILE_NAME); + } + /** + * Asserts if faces-config.xml has no errors + * @param botExt + */ + private static void assertFacesConfigXmlHasNoErrors (SWTBotExt botExt){ + + SWTBotTreeItem[] errors = ProblemsView.getFilteredErrorsTreeItems(botExt, null, null, FacesConfigEditingTest.FACES_CONFIG_FILE_NAME, null); + boolean areThereNoErrors = ((errors == null) || (errors.length == 0)); + assertTrue("There are errors in Problems view: " + + (areThereNoErrors ? "" : errors[0].getText()), + areThereNoErrors); + } + /** + * Asserts if faces-config.xml has errors + * @param botExt + */ + private static void assertFacesConfigXmlHasErrors (SWTBotExt botExt){ + + SWTBotTreeItem[] errors = ProblemsView.getFilteredErrorsTreeItems(botExt, null, null, FacesConfigEditingTest.FACES_CONFIG_FILE_NAME, null); + boolean areThereErrors = ((errors != null) && (errors.length > 0)); + assertTrue("There are missing errors in Problems view for " + FacesConfigEditingTest.FACES_CONFIG_FILE_NAME + " file.", + areThereErrors); + } + // adding Component + // adding Custom Converter + // adding Render Kit + // adding Referenced Bean + // adding Validator + +} \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/smoke/FacesConfigEditingTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/Assertions.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/Assertions.java 2011-11-21 15:35:25 UTC (rev 36493) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/Assertions.java 2011-11-21 16:04:00 UTC (rev 36494) @@ -4,8 +4,10 @@ import java.util.Arrays; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.swtbot.swt.finder.widgets.AbstractSWTBot; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.ui.bot.ext.helper.MarkerHelper; public class Assertions { /** @@ -26,4 +28,79 @@ public static void assertControlEnabled(AbstractSWTBot<?> control, boolean enabled) { assertTrue(control.getClass().getSimpleName()+" "+control.getText()+ " is not in state: isEnabled()="+enabled,enabled == control.isEnabled()); } + /** + * Asserts that given file exists + * @param fileName + * @param pathWithinWorkspace + */ + public static void assertFileExistsInWorkspace (String fileName , String... pathWithinWorkspace){ + assertTrue("File " + fileName + " does not exist.", + isExistingFileWithinWorkspace (fileName, pathWithinWorkspace)); + } + /** + * Asserts that given file does not exists + * @param fileName + * @param pathWithinWorkspace + */ + public static void assertFileNotExistsInWorkspace (String fileName , String... pathWithinWorkspace){ + assertTrue("File " + fileName + " does exist but it has to be deleted.", + !isExistingFileWithinWorkspace (fileName, pathWithinWorkspace)); + } + /** + * Returns true when specified file exists on the path within workspace + * @param fileName + * @param pathWithinWorkspace + * @return + */ + private static boolean isExistingFileWithinWorkspace(String fileName , String... pathWithinWorkspace){ + return ResourcesPlugin + .getWorkspace() + .getRoot() + .findMember(MarkerHelper.getPathToResource(fileName, pathWithinWorkspace)) != null; + } + /** + * Asserts if sourceEditorText of file with fileName contains textToContain + * @param sourceEditorText + * @param textToContain + * @param fileName + */ + public static void assertSourceEditorContains (String sourceEditorText, String textToContain, String fileName){ + + assertTrue("File " + fileName + + " has to contain string '" + + textToContain + + "' but it doesn't.\nIt is: " + sourceEditorText, + sourceEditorText.contains(textToContain)); + + } + /** + * Asserts if sourceEditorText of file with fileName does not contain textToNotContain + * @param sourceEditorText + * @param textToNotContain + * @param fileName + */ + public static void assertSourceEditorNotContain (String sourceEditorText, String textToNotContain, String fileName){ + + assertTrue("File " + fileName + + " must not contain string '" + + textToNotContain + + "' but it does.\nIt is: " + sourceEditorText, + !sourceEditorText.contains(textToNotContain)); + + } + /** + * Asserts if sourceEditorText of file with fileName equals to expectedText + * @param sourceEditorText + * @param expectedText + * @param fileName + */ + public static void assertSourceEditorIs (String sourceEditorText, String expectedText, String fileName){ + + assertTrue("File " + fileName + + " has to be '" + + expectedText + + "' but it doesn't.\nIt is: " + sourceEditorText, + sourceEditorText.equals(expectedText)); + + } } Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/MarkerHelper.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/MarkerHelper.java 2011-11-21 15:35:25 UTC (rev 36493) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/MarkerHelper.java 2011-11-21 16:04:00 UTC (rev 36494) @@ -85,7 +85,7 @@ * @param pathToResource * @return */ - private static IPath getPathToResource (String resourceName, String... pathToResource){ + public static IPath getPathToResource (String resourceName, String... pathToResource){ IPath path = new Path("/"); if (pathToResource != null){ 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-11-21 15:35:25 UTC (rev 36493) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types/IDELabel.java 2011-11-21 16:04:00 UTC (rev 36494) @@ -101,6 +101,7 @@ public static final String NEW = "New..."; public static final String CONTINUE = "Continue"; public static final String REMOVE = "Remove"; + public static final String REMOVE_WITH_DOTS = "Remove..."; public static final String EDIT = "Edit..."; public static final String ADD_WITHOUT_DOTS = "Add"; public static final String EDIT_WITHOUT_DOTS = "Edit"; @@ -166,6 +167,7 @@ public static final String REPOSITORY_LOCATION_PROPERTIES = "Repository Location Properties"; public static final String SECURE_STORAGE = "Secure Storage"; public static final String ADD_JSF_PROJECT_TEMPLATE = "Add JSF Project Template"; + public static final String NEW_MANAGED_BEAN = "New Managed Bean"; } public class EntityGroup { @@ -688,6 +690,11 @@ public static final String SOURCE_TAB_LABEL = "Source"; public static final String TREE_TAB_LABEL = "Tree"; public static final String DIAGRAM_TAB_LABEL = "Diagram"; + public static final String MANAGED_BEANS_NODE = "Managed Beans"; + public static final String NEW_MANAGED_BEAN_CLASS_LABEL = "Class:*"; + public static final String MANAGED_BEAN_CLASS_LABEL = "Managed Bean Class:"; + public static final String NEW_MANAGED_BEAN_NAME_LABEL = "Name:*"; + public static final String DELETE_JAVA_SOURCE_CHECK_BOX = "Delete Java Source"; } Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java 2011-11-21 15:35:25 UTC (rev 36493) +++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java 2011-11-21 16:04:00 UTC (rev 36494) @@ -13,6 +13,7 @@ import java.util.LinkedList; import org.apache.log4j.Logger; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; @@ -103,7 +104,9 @@ SWTBotTreeItem errorsNode = null; SWTBot problemsBot = null; if (new SWTEclipseExt().isViewOpened("Problems")) { - problemsBot = bot.viewByTitle("Problems").bot(); + SWTBotView problemsView = bot.viewByTitle("Problems"); + problemsView.show(); + problemsBot = problemsView.bot(); }else { problemsBot = SWTEclipseExt.showView(bot,ViewType.PROBLEMS); } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/EditingActionsTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/EditingActionsTest.java 2011-11-21 15:35:25 UTC (rev 36493) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/EditingActionsTest.java 2011-11-21 16:04:00 UTC (rev 36494) @@ -20,6 +20,7 @@ import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; import org.eclipse.swtbot.swt.finder.results.VoidResult; +import org.jboss.tools.ui.bot.ext.Assertions; import org.jboss.tools.ui.bot.ext.SWTBotExt; import org.jboss.tools.ui.bot.ext.SWTJBTExt; import org.jboss.tools.ui.bot.ext.Timing; @@ -82,7 +83,7 @@ SWTBotWebBrowser.PASTE_MENU_LABEL); jspEditor.save(); botExt.sleep(Timing.time3S()); - assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), + Assertions.assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), "<h:inputText/><h:inputText/><h:outputTextvalue=\"outputText\"/><h:inputText/>", EditingActionsTest.TEST_PAGE); assertVisualEditorContainsManyNodes(webBrowser, "INPUT", 6, EditingActionsTest.TEST_PAGE_NAME); @@ -95,7 +96,7 @@ SWTBotWebBrowser.CUT_MENU_LABEL); jspEditor.save(); botExt.sleep(Timing.time3S()); - assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), + Assertions.assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), "<body><h:inputText/><h:outputTextvalue=\"outputText\"/><h:inputText/><rich:comboBox>", EditingActionsTest.TEST_PAGE_NAME); assertVisualEditorContainsManyNodes(webBrowser, "INPUT", 5, EditingActionsTest.TEST_PAGE_NAME); @@ -109,7 +110,7 @@ SWTBotWebBrowser.PASTE_MENU_LABEL); jspEditor.save(); botExt.sleep(Timing.time3S()); - assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), + Assertions.assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), "<h:inputText/><h:outputTextvalue=\"outputText\"/><h:inputText/><h:inputText/>", EditingActionsTest.TEST_PAGE_NAME); assertVisualEditorContainsManyNodes(webBrowser, "INPUT", 6, EditingActionsTest.TEST_PAGE_NAME); @@ -124,7 +125,7 @@ } jspEditor.save(); botExt.sleep(Timing.time3S()); - assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), + Assertions.assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), "<h:outputTextvalue=\"outputText\"/><h:inputText/><rich:comboBox>", EditingActionsTest.TEST_PAGE_NAME); if (SWTJBTExt.isRunningOnMacOs()){ @@ -135,7 +136,7 @@ } jspEditor.save(); botExt.sleep(Timing.time3S()); - assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), + Assertions.assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), "<h:inputText/><h:inputText/><h:outputTextvalue=\"outputText\"/>", EditingActionsTest.TEST_PAGE_NAME); if (SWTJBTExt.isRunningOnMacOs()){ @@ -146,7 +147,7 @@ } jspEditor.save(); botExt.sleep(Timing.time3S()); - assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), + Assertions.assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), "<body><h:inputText/><h:outputTextvalue=\"outputText\"/>", EditingActionsTest.TEST_PAGE_NAME); // Check Delete Functionality @@ -157,7 +158,7 @@ KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_DELETE); jspEditor.save(); botExt.sleep(Timing.time3S()); - assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), + Assertions.assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), "<body><h:inputText/><h:outputTextvalue=\"outputText\"/><h:inputText/></body>", EditingActionsTest.TEST_PAGE_NAME); assertVisualEditorContainsManyNodes(webBrowser, "INPUT", 2, EditingActionsTest.TEST_PAGE_NAME); @@ -199,10 +200,10 @@ SWTBotWebBrowser.H_OUTPUT_TEXT_TAG_MENU_LABEL); jspEditor.save(); bot.sleep(Timing.time2S()); - assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), + Assertions.assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), "h:outputText", EditingActionsTest.TEST_PAGE_NAME); - assertSourceEditorNotContain(stripHTMLSourceText(jspEditor.getText()), + Assertions.assertSourceEditorNotContain(stripHTMLSourceText(jspEditor.getText()), "h:inputText", EditingActionsTest.TEST_PAGE_NAME); assertVisualEditorContainsManyNodes(webBrowser, "SPAN", 1, EditingActionsTest.TEST_PAGE_NAME); @@ -327,7 +328,7 @@ SWTBotWebBrowser.STRIP_TAG_MENU_LABEL); jspEditor.save(); bot.sleep(Timing.time2S()); - assertSourceEditorNotContain(jspEditor.getText(), "<f:view>", EditingActionsTest.TEST_PAGE_NAME); + Assertions.assertSourceEditorNotContain(jspEditor.getText(), "<f:view>", EditingActionsTest.TEST_PAGE_NAME); // Undo Changes webBrowser.setFocus(); if (SWTJBTExt.isRunningOnMacOs()){ @@ -338,7 +339,7 @@ } jspEditor.save(); bot.sleep(Timing.time2S()); - assertSourceEditorContains(jspEditor.getText(), "<f:view>", EditingActionsTest.TEST_PAGE_NAME); + Assertions.assertSourceEditorContains(jspEditor.getText(), "<f:view>", EditingActionsTest.TEST_PAGE_NAME); } /** * Tests Select This Tag Menu @@ -365,7 +366,7 @@ SWTBotWebBrowser.SELECT_THIS_TAG_MENU_LABEL); jspEditor.save(); bot.sleep(Timing.time2S()); - assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), + Assertions.assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), "<f:view><h:inputText", EditingActionsTest.TEST_PAGE_NAME); } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/InsertActionsTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/InsertActionsTest.java 2011-11-21 15:35:25 UTC (rev 36493) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/InsertActionsTest.java 2011-11-21 16:04:00 UTC (rev 36494) @@ -12,6 +12,7 @@ package org.jboss.tools.vpe.ui.bot.test.editor; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; +import org.jboss.tools.ui.bot.ext.Assertions; import org.jboss.tools.ui.bot.ext.SWTBotExt; import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.vpe.ui.bot.test.tools.SWTBotWebBrowser; @@ -67,7 +68,7 @@ jspTextEditor.save(); botExt.sleep(Timing.time3S()); // Check if tag <rich:calendar> was properly added. - assertSourceEditorContains(jspTextEditor.getText(), "<h:inputText/><rich:calendar>", InsertActionsTest.TEST_PAGE); + Assertions.assertSourceEditorContains(jspTextEditor.getText(), "<h:inputText/><rich:calendar>", InsertActionsTest.TEST_PAGE); assertVisualEditorContains(webBrowser, "SPAN", new String[]{"title"},new String[] {"rich:calendar"}, InsertActionsTest.TEST_PAGE); assertProbelmsViewNoErrors(botExt); @@ -88,7 +89,7 @@ jspTextEditor.save(); botExt.sleep(Timing.time3S()); // Check if tag <rich:calendar> was properly added - assertSourceEditorContains(VPEEditorTestCase.stripHTMLSourceText(jspTextEditor.getText()), + Assertions.assertSourceEditorContains(VPEEditorTestCase.stripHTMLSourceText(jspTextEditor.getText()), "<rich:calendar></rich:calendar><h:inputText/>", InsertActionsTest.TEST_PAGE); assertVisualEditorContains(webBrowser, "SPAN", new String[]{"title"},new String[] {"rich:calendar"}, InsertActionsTest.TEST_PAGE); @@ -119,7 +120,7 @@ jspTextEditor.save(); botExt.sleep(Timing.time3S()); // Check if tag <rich:calendar> was properly added - assertSourceEditorContains(VPEEditorTestCase.stripHTMLSourceText(jspTextEditor.getText()), + Assertions.assertSourceEditorContains(VPEEditorTestCase.stripHTMLSourceText(jspTextEditor.getText()), "<form><rich:calendar></rich:calendar></form>", InsertActionsTest.TEST_PAGE); assertVisualEditorContains(webBrowser, "FORM", null,null,InsertActionsTest.TEST_PAGE); assertProbelmsViewNoErrors(botExt); @@ -141,7 +142,7 @@ jspTextEditor.save(); botExt.sleep(Timing.time3S()); // Check if tag <h:form> was properly added - assertSourceEditorContains(VPEEditorTestCase.stripHTMLSourceText(jspTextEditor.getText()), + Assertions.assertSourceEditorContains(VPEEditorTestCase.stripHTMLSourceText(jspTextEditor.getText()), "<h:form><h:inputText/></h:form>", InsertActionsTest.TEST_PAGE); assertVisualEditorContains(webBrowser, "FORM", null,null,InsertActionsTest.TEST_PAGE); assertProbelmsViewNoErrors(botExt); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java 2011-11-21 15:35:25 UTC (rev 36493) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/MinMaxPanesTest.java 2011-11-21 16:04:00 UTC (rev 36494) @@ -19,6 +19,7 @@ import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; import org.eclipse.swtbot.swt.finder.results.Result; import org.eclipse.swtbot.swt.finder.results.VoidResult; +import org.jboss.tools.ui.bot.ext.Assertions; import org.jboss.tools.ui.bot.ext.SWTBotExt; import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; @@ -108,7 +109,7 @@ } }); bot.sleep(Timing.time2S()); - assertSourceEditorContains(jspTextEditor.getText(), insertTestString, MinMaxPanesTest.TEST_PAGE_NAME); + Assertions.assertSourceEditorContains(jspTextEditor.getText(), insertTestString, MinMaxPanesTest.TEST_PAGE_NAME); } @Override Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextEditingActionsTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextEditingActionsTest.java 2011-11-21 15:35:25 UTC (rev 36493) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextEditingActionsTest.java 2011-11-21 16:04:00 UTC (rev 36494) @@ -16,6 +16,7 @@ import org.eclipse.swtbot.swt.finder.utils.Position; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.ui.bot.ext.Assertions; import org.jboss.tools.ui.bot.ext.SWTBotExt; import org.jboss.tools.ui.bot.ext.SWTEclipseExt; import org.jboss.tools.ui.bot.ext.Timing; @@ -94,7 +95,7 @@ jspEditor.save(); bot.sleep(Timing.time2S()); String textToContain = TextEditingActionsTest.TEXT_TO_EDIT + textToCutCopy; - assertSourceEditorContains(jspEditor.getText(), + Assertions.assertSourceEditorContains(jspEditor.getText(), textToContain, TextEditingActionsTest.TEST_PAGE_NAME); assertVisualEditorContainsNodeWithValue(webBrowser, @@ -111,7 +112,7 @@ jspEditor.save(); bot.sleep(Timing.time2S()); jspEditor.deselectAndSetCursorPosition(0, 0); - assertSourceEditorIs(jspEditor.getText(), + Assertions.assertSourceEditorIs(jspEditor.getText(), TextEditingActionsTest.TEXT_TO_EDIT, TextEditingActionsTest.TEST_PAGE_NAME); assertVisualEditorContainsNodeWithValue(webBrowser, @@ -123,7 +124,7 @@ jspEditor.save(); bot.sleep(Timing.time2S()); textToContain = textToCutCopy + TextEditingActionsTest.TEXT_TO_EDIT; - assertSourceEditorContains(jspEditor.getText(), + Assertions.assertSourceEditorContains(jspEditor.getText(), textToContain, TextEditingActionsTest.TEST_PAGE_NAME); assertVisualEditorContainsNodeWithValue(webBrowser, @@ -245,7 +246,7 @@ jspEditor.save(); bot.sleep(Timing.time2S()); String textToContain = TextEditingActionsTest.TEXT_TO_EDIT + textToCutCopy; - assertSourceEditorContains(jspEditor.getText(), + Assertions.assertSourceEditorContains(jspEditor.getText(), textToContain, TextEditingActionsTest.TEST_PAGE_NAME); assertVisualEditorContainsNodeWithValue(webBrowser, @@ -263,7 +264,7 @@ SWTBotWebBrowser.CUT_MENU_LABEL); jspEditor.save(); bot.sleep(Timing.time2S()); - assertSourceEditorContains(jspEditor.getText(), + Assertions.assertSourceEditorContains(jspEditor.getText(), "\"" + TextEditingActionsTest.TEXT_TO_EDIT + "\"", TextEditingActionsTest.TEST_PAGE_NAME); assertVisualEditorContainsNodeWithValue(webBrowser, @@ -285,7 +286,7 @@ jspEditor.save(); bot.sleep(Timing.time2S()); textToContain = textToCutCopy + TextEditingActionsTest.TEXT_TO_EDIT; - assertSourceEditorContains(jspEditor.getText(), + Assertions.assertSourceEditorContains(jspEditor.getText(), textToContain, TextEditingActionsTest.TEST_PAGE_NAME); assertVisualEditorContainsNodeWithValue(webBrowser, 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-11-21 15:35:25 UTC (rev 36493) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/TextSelectionTest.java 2011-11-21 16:04:00 UTC (rev 36494) @@ -12,6 +12,8 @@ package org.jboss.tools.vpe.ui.bot.test.editor; import java.awt.event.KeyEvent; + +import org.jboss.tools.ui.bot.ext.Assertions; import org.jboss.tools.ui.bot.ext.SWTBotExt; import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; @@ -84,7 +86,7 @@ KeyboardHelper.typeBasicStringUsingAWT(newText); jspEditor.save(); bot.sleep(Timing.time3S()); - assertSourceEditorContains(jspEditor.getText(), " " + newText + " ", TextSelectionTest.TEST_PAGE_NAME); + Assertions.assertSourceEditorContains(jspEditor.getText(), " " + newText + " ", TextSelectionTest.TEST_PAGE_NAME); jspEditor.setText(TextSelectionTest.PAGE_TEXT); jspEditor.save(); bot.sleep(Timing.time3S()); 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-11-21 15:35:25 UTC (rev 36493) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java 2011-11-21 16:04:00 UTC (rev 36494) @@ -89,52 +89,8 @@ return editorText.replaceAll("\n", "").replaceAll("\t", "").replaceAll("\b", "") .replaceAll(" ", "").replaceAll("\r", "").replaceAll("\f", ""); } + /** - * Asserts if sourceEditorText of file with fileName contains textToContain - * @param sourceEditorText - * @param textToContain - * @param fileName - */ - protected static void assertSourceEditorContains (String sourceEditorText, String textToContain, String fileName){ - - assertTrue("File " + fileName - + " has to contain string '" - + textToContain - + "' but it doesn't.\nIt is: " + sourceEditorText, - sourceEditorText.contains(textToContain)); - - } - /** - * Asserts if sourceEditorText of file with fileName does not contain textToNotContain - * @param sourceEditorText - * @param textToNotContain - * @param fileName - */ - protected static void assertSourceEditorNotContain (String sourceEditorText, String textToNotContain, String fileName){ - - assertTrue("File " + fileName - + " must not contain string '" - + textToNotContain - + "' but it does.\nIt is: " + sourceEditorText, - !sourceEditorText.contains(textToNotContain)); - - } - /** - * Asserts if sourceEditorText of file with fileName equals to expectedText - * @param sourceEditorText - * @param expectedText - * @param fileName - */ - protected static void assertSourceEditorIs (String sourceEditorText, String expectedText, String fileName){ - - assertTrue("File " + fileName - + " has to be '" - + expectedText - + "' but it doesn't.\nIt is: " + sourceEditorText, - sourceEditorText.equals(expectedText)); - - } - /** * Asserts if Visual Editor contains node with particular attributes * @param webBrowser * @param nodeNameToContain Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/JSFTagsTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/JSFTagsTest.java 2011-11-21 15:35:25 UTC (rev 36493) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/tags/JSFTagsTest.java 2011-11-21 16:04:00 UTC (rev 36494) @@ -13,6 +13,7 @@ import java.awt.event.KeyEvent; +import org.jboss.tools.ui.bot.ext.Assertions; import org.jboss.tools.ui.bot.ext.SWTBotExt; import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; @@ -148,7 +149,7 @@ new String[]{"title","value"}, new String[]{"h:inputText value: " + insertText,insertText}, JSFTagsTest.TEST_PAGE_NAME); - assertSourceEditorContains(jspEditor.getText(), + Assertions.assertSourceEditorContains(jspEditor.getText(), "<h:inputText value=\"" + insertText + "\"", JSFTagsTest.TEST_PAGE_NAME); } @@ -195,7 +196,7 @@ new String[]{"h:inputTextarea value: " + insertText}, JSFTagsTest.TEST_PAGE_NAME); assertVisualEditorContainsNodeWithValue(webBrowser, insertText, JSFTagsTest.TEST_PAGE_NAME); - assertSourceEditorContains(jspEditor.getText(), + Assertions.assertSourceEditorContains(jspEditor.getText(), "<h:inputTextarea value=\"" + insertText + "\"", JSFTagsTest.TEST_PAGE_NAME); } @@ -236,14 +237,14 @@ KeyboardHelper.typeBasicStringUsingAWT(insertText); jspEditor.save(); bot.sleep(Timing.time3S()); - assertSourceEditorContains(jspEditor.getText(), + Assertions.assertSourceEditorContains(jspEditor.getText(), "<h:outputText value=\"" + insertText + outputText + "\"", JSFTagsTest.TEST_PAGE_NAME); KeyboardHelper.typeKeyCodeUsingAWTRepeately(KeyEvent.VK_RIGHT,outputText.length() + normalText.length()); KeyboardHelper.typeBasicStringUsingAWT(insertText); jspEditor.save(); bot.sleep(Timing.time3S()); - assertSourceEditorContains(jspEditor.getText(), + Assertions.assertSourceEditorContains(jspEditor.getText(), normalText + insertText, JSFTagsTest.TEST_PAGE_NAME); } @@ -292,7 +293,7 @@ jspEditor.save(); bot.sleep(Timing.time3S()); assertVisualEditorContainsNodeWithValue(webBrowser, insertText + itemLabel, JSFTagsTest.TEST_PAGE_NAME); - assertSourceEditorContains(jspEditor.getText(), + Assertions.assertSourceEditorContains(jspEditor.getText(), "<f:selectItem itemLabel=\"" + insertText + itemLabel + "\"", JSFTagsTest.TEST_PAGE_NAME); } @@ -341,7 +342,7 @@ jspEditor.save(); bot.sleep(Timing.time3S()); assertVisualEditorContainsNodeWithValue(webBrowser, insertText + itemLabel, JSFTagsTest.TEST_PAGE_NAME); - assertSourceEditorContains(jspEditor.getText(), + Assertions.assertSourceEditorContains(jspEditor.getText(), "<f:selectItem itemLabel=\"" + insertText + itemLabel + "\"", JSFTagsTest.TEST_PAGE_NAME); }