[jbosstools-commits] JBoss Tools SVN: r20084 - in trunk: jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools and 14 other directories.

Author: yzhishko Date: 2010-02-02 14:40:18 -0500 (Tue, 02 Feb 2010) New Revision: 20084 Added: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/jst/ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/jst/ui/ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/jst/ui/bot/ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/jst/ui/bot/test/ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/jst/ui/bot/test/utils/ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/jst/ui/bot/test/utils/ImplementationChangedException.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/bin/ Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/Activator.java 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/JSFAutoTestCase.java trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/test/TestProperties.java trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/Activator.java trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/SWTBotJSPMultiPageEditor.java trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/WidgetVariables.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/Activator.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestUtil.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.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/VerificationOfNameSpacesTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/PageDesignTestCase.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java Log: Little changes in SWTBot tests Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/Activator.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/Activator.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/Activator.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -9,7 +9,7 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.jsf.ui.bot.test"; + public static final String PLUGIN_ID = "org.jboss.tools.jsf.ui.bot.test"; //$NON-NLS-1$ // The shared instance private static Activator plugin; 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 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -18,7 +18,7 @@ */ public class JSFAllBotTests{ public static Test suite(){ - TestSuite suite = new TestSuite("JSF all tests"); + TestSuite suite = new TestSuite("JSF all tests"); //$NON-NLS-1$ suite.addTestSuite(CreateNewJSFProjectTest.class); suite.addTestSuite(AddRemoveJSFCapabilitiesTest.class); suite.addTestSuite(JBIDE3148and4441Test.class); @@ -26,7 +26,6 @@ suite.addTestSuite(JBIDE3577Test.class); suite.addTestSuite(JBIDE3579Test.class); suite.addTestSuite(JBIDE3920Test.class); - return suite; } } \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -9,7 +9,7 @@ @Override protected String getPathToResources(String testPage) throws IOException{ - return FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"resources/"+testPage ; + return FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"resources/"+testPage ; //$NON-NLS-1$ //$NON-NLS-2$ } protected abstract void closeUnuseDialogs(); Added: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/jst/ui/bot/test/utils/ImplementationChangedException.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/jst/ui/bot/test/utils/ImplementationChangedException.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/jst/ui/bot/test/utils/ImplementationChangedException.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -0,0 +1,22 @@ +package org.jboss.tools.jst.ui.bot.test.utils; + +public class ImplementationChangedException extends RuntimeException { + + /** + * + */ + private static final long serialVersionUID = -9102478034961288576L; + + public ImplementationChangedException() { + super(); + } + + public ImplementationChangedException(String message) { + super(message); + } + + public ImplementationChangedException(Throwable cause){ + super(cause); + } + +} Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/test/TestProperties.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/test/TestProperties.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/test/TestProperties.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -33,12 +33,12 @@ public static void substituteSystemProperties(Properties projectProperties2) { for (Object opject : projectProperties2.keySet()) { String propertyValue = projectProperties2.get(opject).toString(); - if(propertyValue.matches("\\$\\{.*")) { + if(propertyValue.matches("\\$\\{.*")) { //$NON-NLS-1$ Enumeration<?> names = System.getProperties().propertyNames(); while(names.hasMoreElements()) { String substitute = names.nextElement().toString(); - String regexp = "\\$\\{" + substitute + "}"; + String regexp = "\\$\\{" + substitute + "}"; //$NON-NLS-1$ //$NON-NLS-2$ if(propertyValue.matches(regexp)) { projectProperties2.put(opject, propertyValue.replaceAll(regexp, System.getProperty(substitute))); } Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/Activator.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/Activator.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/Activator.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -10,7 +10,7 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.ui.bot.test"; + public static final String PLUGIN_ID = "org.jboss.tools.ui.bot.test"; //$NON-NLS-1$ // The shared instance private static Activator plugin; Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -18,14 +18,14 @@ public abstract class JBTSWTBotTestCase extends SWTBotTestCase implements ILogListener { - protected static final String BUILDING_WS = "Building workspace"; - protected static final String VISUAL_UPDATE = "Visual Editor View Update"; - protected static final String VISUAL_REFRESH = "Visual Editor Refresh"; - protected static final String UPDATING_INDEXES = "Updating indexes"; + protected static final String BUILDING_WS = "Building workspace"; //$NON-NLS-1$ + protected static final String VISUAL_UPDATE = "Visual Editor View Update"; //$NON-NLS-1$ + protected static final String VISUAL_REFRESH = "Visual Editor Refresh"; //$NON-NLS-1$ + protected static final String UPDATING_INDEXES = "Updating indexes"; //$NON-NLS-1$ private static Properties SWT_BOT_PROPERTIES; private volatile Throwable exception; - public static final String PATH_TO_SWT_BOT_PROPERTIES = "SWTBot.properties"; + public static final String PATH_TO_SWT_BOT_PROPERTIES = "SWTBot.properties"; //$NON-NLS-1$ protected SWTJBTBot bot = new SWTJBTBot(); private static int sleepTime = 1000; @@ -39,47 +39,28 @@ static { try { InputStream inputStream = JBTSWTBotTestCase.class - .getResourceAsStream("/" + PATH_TO_SWT_BOT_PROPERTIES); + .getResourceAsStream("/" + PATH_TO_SWT_BOT_PROPERTIES); //$NON-NLS-1$ SWT_BOT_PROPERTIES = new Properties(); SWT_BOT_PROPERTIES.load(inputStream); SWTBotPreferences.PLAYBACK_DELAY = Long .parseLong(SWT_BOT_PROPERTIES - .getProperty("SWTBotPreferences.PLAYBACK_DELAY")); + .getProperty("SWTBotPreferences.PLAYBACK_DELAY")); //$NON-NLS-1$ SWTBotPreferences.TIMEOUT = Long.parseLong(SWT_BOT_PROPERTIES - .getProperty("SWTBotPreferences.TIMEOUT")); + .getProperty("SWTBotPreferences.TIMEOUT")); //$NON-NLS-1$ inputStream.close(); } catch (IOException e) { IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, - "Can't load properties from " + PATH_TO_SWT_BOT_PROPERTIES - + " file", e); + "Can't load properties from " + PATH_TO_SWT_BOT_PROPERTIES //$NON-NLS-1$ + + " file", e); //$NON-NLS-1$ Activator.getDefault().getLog().log(status); e.printStackTrace(); } catch (IllegalStateException e) { IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, - "Property file " + PATH_TO_SWT_BOT_PROPERTIES - + " was not found", e); + "Property file " + PATH_TO_SWT_BOT_PROPERTIES //$NON-NLS-1$ + + " was not found", e); //$NON-NLS-1$ Activator.getDefault().getLog().log(status); e.printStackTrace(); } - // try { - // InputStream swtPreferenceIS = - // Platform.getBundle(Activator.PLUGIN_ID).getResource(PATH_TO_SWT_BOT_PROPERTIES) - // .openStream(); - // SWT_BOT_PROPERTIES = new Properties(); - // SWT_BOT_PROPERTIES.load(swtPreferenceIS); - // SWTBotPreferences.PLAYBACK_DELAY = Long - // .parseLong(SWT_BOT_PROPERTIES - // .getProperty("SWTBotPreferences.PLAYBACK_DELAY")); - // SWTBotPreferences.TIMEOUT = Long.parseLong(SWT_BOT_PROPERTIES - // .getProperty("SWTBotPreferences.TIMEOUT")); - // swtPreferenceIS.close(); - // } catch (IOException e) { - // fail("Can't load properties from " + PATH_TO_SWT_BOT_PROPERTIES + - // " file"); - // } catch (IllegalStateException e) { - // fail("Property file " + PATH_TO_SWT_BOT_PROPERTIES + - // " was not found"); - // } } public void logging(IStatus status, String plugin) { @@ -87,7 +68,7 @@ case IStatus.ERROR: Throwable throwable = status.getException(); if (throwable == null) { - throwable = new Throwable(status.getMessage() + " in " + throwable = new Throwable(status.getMessage() + " in " //$NON-NLS-1$ + status.getPlugin()); } setException(throwable); @@ -203,12 +184,12 @@ try { bot.viewByTitle(WidgetVariables.ERROR_LOG); } catch (WidgetNotFoundException e) { - bot.menu("Window").menu("Show View").menu("Other...").click(); + bot.menu("Window").menu("Show View").menu("Other...").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ SWTBotTree viewTree = bot.tree(); delay(); - viewTree.expandNode("General") + viewTree.expandNode("General") //$NON-NLS-1$ .expandNode(WidgetVariables.ERROR_LOG).select(); - bot.button("OK").click(); + bot.button("OK").click(); //$NON-NLS-1$ } } @@ -220,12 +201,12 @@ try { bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).setFocus(); } catch (WidgetNotFoundException e) { - bot.menu("Window").menu("Show View").menu("Other...").click(); + bot.menu("Window").menu("Show View").menu("Other...").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ SWTBotTree viewTree = bot.tree(); delay(); - viewTree.expandNode("Java").expandNode( + viewTree.expandNode("Java").expandNode( //$NON-NLS-1$ WidgetVariables.PACKAGE_EXPLORER).select(); - bot.button("OK").click(); + bot.button("OK").click(); //$NON-NLS-1$ } } @@ -237,12 +218,12 @@ try { bot.viewByTitle(WidgetVariables.WEB_PROJECTS).setFocus(); } catch (WidgetNotFoundException e) { - bot.menu("Window").menu("Show View").menu("Other...").click(); + bot.menu("Window").menu("Show View").menu("Other...").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ SWTBotTree viewTree = bot.tree(); delay(); - viewTree.expandNode("Java").expandNode( + viewTree.expandNode("Java").expandNode( //$NON-NLS-1$ WidgetVariables.WEB_PROJECTS).select(); - bot.button("OK").click(); + bot.button("OK").click(); //$NON-NLS-1$ } } @@ -254,12 +235,12 @@ try { bot.viewByTitle(WidgetVariables.SERVERS).setFocus(); } catch (WidgetNotFoundException e) { - bot.menu("Window").menu("Show View").menu("Other...").click(); + bot.menu("Window").menu("Show View").menu("Other...").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ SWTBotTree viewTree = bot.tree(); delay(); - viewTree.expandNode("Server").expandNode( + viewTree.expandNode("Server").expandNode( //$NON-NLS-1$ WidgetVariables.SERVERS).select(); - bot.button("OK").click(); + bot.button("OK").click(); //$NON-NLS-1$ } } /** @@ -270,12 +251,12 @@ try { bot.viewByTitle(WidgetVariables.PROPERTIES).setFocus(); } catch (WidgetNotFoundException e) { - bot.menu("Window").menu("Show View").menu("Other...").click(); + bot.menu("Window").menu("Show View").menu("Other...").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ SWTBotTree viewTree = bot.tree(); delay(); - viewTree.expandNode("General").expandNode( + viewTree.expandNode("General").expandNode( //$NON-NLS-1$ WidgetVariables.PROPERTIES).select(); - bot.button("OK").click(); + bot.button("OK").click(); //$NON-NLS-1$ } } /** @@ -286,12 +267,12 @@ try { bot.viewByTitle(WidgetVariables.OUTLINE).setFocus(); } catch (WidgetNotFoundException e) { - bot.menu("Window").menu("Show View").menu("Other...").click(); + bot.menu("Window").menu("Show View").menu("Other...").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ SWTBotTree viewTree = bot.tree(); delay(); - viewTree.expandNode("General").expandNode( + viewTree.expandNode("General").expandNode( //$NON-NLS-1$ WidgetVariables.OUTLINE).select(); - bot.button("OK").click(); + bot.button("OK").click(); //$NON-NLS-1$ } } // protected void openProgressStatus() { @@ -347,8 +328,8 @@ if (!isRequiredProcessesStarted) { long endTime = System.currentTimeMillis(); if (endTime - startTime > timeOut) { - System.out.println("Next processes are already started or finished: "+ - runningProcessesToString(jobNames)+" called in " + getName() + " class"); + System.out.println("Next processes are already started or finished: "+ //$NON-NLS-1$ + runningProcessesToString(jobNames)+" called in " + getName() + " class"); //$NON-NLS-1$ //$NON-NLS-2$ return; } } @@ -373,9 +354,9 @@ } private String runningProcessesToString (String ... processes){ - String process = ""; + String process = ""; //$NON-NLS-1$ for (String processRunning : processes) { - process = process + processRunning + ", "; + process = process + processRunning + ", "; //$NON-NLS-1$ } return process; } Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/SWTBotJSPMultiPageEditor.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/SWTBotJSPMultiPageEditor.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/SWTBotJSPMultiPageEditor.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -10,6 +10,7 @@ import org.hamcrest.SelfDescribing; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditorPart; +import org.jboss.tools.jst.ui.bot.test.utils.ImplementationChangedException; /** * This represents Eclipse JSPMultiPageEditor part @@ -66,13 +67,13 @@ return jspMultiPageEditor; } - public void selectTab(final String tabLabel) throws WidgetNotFoundException{ + public void selectTab(final String tabLabel) { bot.getDisplay().syncExec(new Runnable() { public void run() { Class<? extends JSPMultiPageEditorPart> cls = JSPMultiPageEditorPart.class; try { - Field field = cls.getDeclaredField("container"); + Field field = cls.getDeclaredField("container"); //$NON-NLS-1$ field.setAccessible(true); CTabFolder tabFolder = (CTabFolder) field.get(jspMultiPageEditor); CTabItem[] tabItems = tabFolder.getItems(); @@ -85,15 +86,15 @@ } } if (!isHasItem) { - throw new WidgetNotFoundException("Can't find a tab item with "+ tabLabel + " label"); + throw new WidgetNotFoundException("Can't find a tab item with "+ tabLabel + " label"); //$NON-NLS-1$ //$NON-NLS-2$ } tabFolder.setSelection(tabItems[pageIndex]); jspMultiPageEditor.pageChange(pageIndex); } catch (NoSuchFieldException e) { - e.printStackTrace(); + throw new ImplementationChangedException(e); } catch (IllegalAccessException e) { - e.printStackTrace(); + throw new ImplementationChangedException(e); } } Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/WidgetVariables.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/WidgetVariables.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/WidgetVariables.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -8,19 +8,19 @@ public class WidgetVariables { - public static final String ERROR_LOG = "Error Log"; - public static final String PACKAGE_EXPLORER = "Package Explorer"; - public static final String WELCOME = "Welcome"; - public static final String PROGRESS_STATUS = "Progress"; - public static final String PALETTE = "JBoss Tools Palette"; - public static final String WEB_PROJECTS = "Web Projects"; - public static final String SERVERS = "Servers"; - public static final String PROPERTIES = "Properties"; - public static final String OUTLINE = "Outline"; - public static final String OK_BUTTON = "OK"; - public static final String NEXT_BUTTON = "Next >"; - public static final String BACK_BUTTON = "< Back"; - public static final String FINISH_BUTTON = "Finish"; - public static final String CONTINUE_BUTTON = "Continue"; - public static final String NEW_BUTTON = "New..."; + public static final String ERROR_LOG = "Error Log"; //$NON-NLS-1$ + public static final String PACKAGE_EXPLORER = "Package Explorer"; //$NON-NLS-1$ + public static final String WELCOME = "Welcome"; //$NON-NLS-1$ + public static final String PROGRESS_STATUS = "Progress"; //$NON-NLS-1$ + public static final String PALETTE = "JBoss Tools Palette"; //$NON-NLS-1$ + public static final String WEB_PROJECTS = "Web Projects"; //$NON-NLS-1$ + public static final String SERVERS = "Servers"; //$NON-NLS-1$ + public static final String PROPERTIES = "Properties"; //$NON-NLS-1$ + public static final String OUTLINE = "Outline"; //$NON-NLS-1$ + public static final String OK_BUTTON = "OK"; //$NON-NLS-1$ + public static final String NEXT_BUTTON = "Next >"; //$NON-NLS-1$ + public static final String BACK_BUTTON = "< Back"; //$NON-NLS-1$ + public static final String FINISH_BUTTON = "Finish"; //$NON-NLS-1$ + public static final String CONTINUE_BUTTON = "Continue"; //$NON-NLS-1$ + public static final String NEW_BUTTON = "New..."; //$NON-NLS-1$ } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF 2010-02-02 19:40:18 UTC (rev 20084) @@ -17,9 +17,9 @@ org.apache.log4j;bundle-version="1.2.13", org.eclipse.datatools.connectivity;bundle-version="1.1.2", org.eclipse.datatools.connectivity.db.generic;bundle-version="1.0.1", - org.jboss.tools.common.text.ext;bundle-version="3.1.0", + org.jboss.tools.common.text.ext, org.eclipse.ui.ide;bundle-version="3.5.1", - org.jboss.tools.common.model;bundle-version="3.1.0" + org.jboss.tools.common.model Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Eclipse-RegisterBuddy: org.apache.log4j Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/Activator.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/Activator.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/Activator.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -9,7 +9,7 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jboss.tools.vpe.ui.bot.test"; + public static final String PLUGIN_ID = "org.jboss.tools.vpe.ui.bot.test"; //$NON-NLS-1$ // The shared instance private static Activator plugin; Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestDomUtil.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -136,7 +136,7 @@ + modelNode.getNodeName() + "\""); //$NON-NLS-1$ } - if ("#comment".equals(vpeNode.getNodeName())){ + if ("#comment".equals(vpeNode.getNodeName())){ //$NON-NLS-1$ String vpeNodeValue = vpeNode.getNodeValue(); try { vpeNodeValue = clearStringFromRSymbols(vpeNodeValue); @@ -294,12 +294,12 @@ } private static String clearStringFromRSymbols(String string){ - int index = string.indexOf("\r"); + int index = string.indexOf("\r"); //$NON-NLS-1$ while (index!=-1) { String stringAfterSymbol = string.substring(index+1); String stringBeforeSymbol = string.substring(0,index); string = stringBeforeSymbol.concat(stringAfterSymbol); - index = string.indexOf("\r"); + index = string.indexOf("\r"); //$NON-NLS-1$ } return string; } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestUtil.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestUtil.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestUtil.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -41,6 +41,6 @@ * @param t the t */ public static void fail(Throwable t){ - Assert.fail("Test case was fail "+t.getMessage()+":"+t); + Assert.fail("Test case was fail "+t.getMessage()+":"+t); //$NON-NLS-1$ //$NON-NLS-2$ } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllBotTests.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -26,7 +26,7 @@ public class VPEAllBotTests extends SWTBotTestCase{ public static Test suite(){ - TestSuite suite = new TestSuite("VPE All Tests"); + TestSuite suite = new TestSuite("VPE All Tests"); //$NON-NLS-1$ suite.addTestSuite(CancelTagLibDefenitionTest.class); suite.addTestSuite(ImportTagsFromTLDFileTest.class); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -32,8 +32,8 @@ public abstract class VPEAutoTestCase extends JBTSWTBotTestCase{ protected static Properties projectProperties; - protected static final String TEST_PAGE = "inputUserName.jsp"; - protected static String PROJECT_PROPERTIES = "projectProperties.properties"; + protected static final String TEST_PAGE = "inputUserName.jsp"; //$NON-NLS-1$ + protected static String PROJECT_PROPERTIES = "projectProperties.properties"; //$NON-NLS-1$ /** * Variable defines JBoss EAP 4.3 server location on a file system @@ -51,23 +51,23 @@ static { try { - InputStream inputStream = VPEAutoTestCase.class.getResourceAsStream("/"+PROJECT_PROPERTIES); + InputStream inputStream = VPEAutoTestCase.class.getResourceAsStream("/"+PROJECT_PROPERTIES); //$NON-NLS-1$ projectProperties = new TestProperties(); projectProperties.load(inputStream); inputStream.close(); } catch (IOException e) { - IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Can't load properties from " + PROJECT_PROPERTIES + " file", e); + IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Can't load properties from " + PROJECT_PROPERTIES + " file", e); //$NON-NLS-1$ //$NON-NLS-2$ Activator.getDefault().getLog().log(status); e.printStackTrace(); } catch (IllegalStateException e) { - IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Property file " + PROJECT_PROPERTIES + " was not found", e); + IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Property file " + PROJECT_PROPERTIES + " was not found", e); //$NON-NLS-1$ //$NON-NLS-2$ Activator.getDefault().getLog().log(status); e.printStackTrace(); } - JBOSS_EAP_HOME = projectProperties.getProperty("JBossEap4.3"); - JBT_TEST_PROJECT_NAME = projectProperties.getProperty("JSFProjectName"); + JBOSS_EAP_HOME = projectProperties.getProperty("JBossEap4.3"); //$NON-NLS-1$ + JBT_TEST_PROJECT_NAME = projectProperties.getProperty("JSFProjectName"); //$NON-NLS-1$ } /** @@ -105,41 +105,39 @@ */ protected void createJSFProject(String jsfProjectName){ - bot.menu("File").menu("New").menu("Other...").click(); - bot.shell("New").activate(); + bot.menu("File").menu("New").menu("Other...").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + bot.shell("New").activate(); //$NON-NLS-1$ SWTBotTree tree = bot.tree(); delay(); - tree.expandNode("JBoss Tools Web").expandNode("JSF").select("JSF Project"); - bot.button("Next >").click(); - bot.textWithLabel("Project Name*").setText(jsfProjectName); - bot.comboBoxWithLabel("Template*").setSelection("JSFKickStartWithoutLibs"); - bot.button("Next >").click(); + tree.expandNode("JBoss Tools Web").expandNode("JSF").select("JSF Project"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + bot.button("Next >").click(); //$NON-NLS-1$ + bot.textWithLabel("Project Name*").setText(jsfProjectName); //$NON-NLS-1$ + bot.comboBoxWithLabel("Template*").setSelection("JSFKickStartWithoutLibs"); //$NON-NLS-1$ //$NON-NLS-2$ + bot.button("Next >").click(); //$NON-NLS-1$ try { - bot.comboBoxWithLabel("Runtime*").setSelection("jboss-eap Runtime"); + bot.comboBoxWithLabel("Runtime*").setSelection("jboss-eap Runtime"); //$NON-NLS-1$ //$NON-NLS-2$ delay(); - bot.button("Finish").click(); + bot.button("Finish").click(); //$NON-NLS-1$ try { - bot.button("Yes").click(); + bot.button("Yes").click(); //$NON-NLS-1$ openErrorLog(); openPackageExplorer(); -// openProgressStatus(); } catch (WidgetNotFoundException e) { } } catch (Exception e) { bot.button(0).click(); SWTBotTree innerTree = bot.tree(); delay(); - innerTree.expandNode("JBoss Enterprise Middleware").select("JBoss Enterprise Application Platform 4.3 Runtime"); - bot.button("Next >").click(); - bot.textWithLabel("Home Directory").setText(JBOSS_EAP_HOME); - bot.button("Finish").click(); + innerTree.expandNode("JBoss Enterprise Middleware").select("JBoss Enterprise Application Platform 4.3 Runtime"); //$NON-NLS-1$ //$NON-NLS-2$ + bot.button("Next >").click(); //$NON-NLS-1$ + bot.textWithLabel("Home Directory").setText(JBOSS_EAP_HOME); //$NON-NLS-1$ + bot.button("Finish").click(); //$NON-NLS-1$ delay(); - bot.button("Finish").click(); + bot.button("Finish").click(); //$NON-NLS-1$ try { - bot.button("Yes").click(); + bot.button("Yes").click(); //$NON-NLS-1$ openErrorLog(); openPackageExplorer(); -// openProgressStatus(); } catch (WidgetNotFoundException e2) { } } @@ -235,18 +233,18 @@ } protected String getPathToResources(String testPage) throws IOException { - String filePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"resources/"+testPage; + String filePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"resources/"+testPage; //$NON-NLS-1$//$NON-NLS-2$ File file = new File(filePath); if (!file.isFile()) { - filePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+testPage; + filePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+testPage; //$NON-NLS-1$ } return filePath; } @Override protected void activePerspective() { - if (!bot.perspectiveByLabel("Web Development").isActive()) { - bot.perspectiveByLabel("Web Development").activate(); + if (!bot.perspectiveByLabel("Web Development").isActive()) { //$NON-NLS-1$ + bot.perspectiveByLabel("Web Development").activate(); //$NON-NLS-1$ } } @@ -254,12 +252,12 @@ try { bot.viewByTitle(WidgetVariables.PALETTE); } catch (WidgetNotFoundException e) { - bot.menu("Window").menu("Show View").menu("Other...").click(); + bot.menu("Window").menu("Show View").menu("Other...").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ SWTBotTree viewTree = bot.tree(); delay(); - viewTree.expandNode("JBoss Tools Web").expandNode( + viewTree.expandNode("JBoss Tools Web").expandNode( //$NON-NLS-1$ WidgetVariables.PALETTE).select(); - bot.button("OK").click(); + bot.button("OK").click(); //$NON-NLS-1$ } } @@ -308,8 +306,8 @@ } private void compareDocuments (nsIDOMDocument visualDocument, Document xmlTestDocument) throws ComparisonException{ - nsIDOMNode visualBodyNode = visualDocument.getElementsByTagName("BODY").item(0); - Node testBodyNode = xmlTestDocument.getElementsByTagName("BODY").item(0); + nsIDOMNode visualBodyNode = visualDocument.getElementsByTagName("BODY").item(0); //$NON-NLS-1$ + Node testBodyNode = xmlTestDocument.getElementsByTagName("BODY").item(0); //$NON-NLS-1$ TestDomUtil.compareNodes(visualBodyNode, testBodyNode); } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -18,51 +18,51 @@ //Test add block comment from Source menu getEditor().navigateTo(22,22); - bot.menu("Source").menu("Add Block Comment").click(); - checkVPE("BlockCommentTestToggle.xml"); + bot.menu("Source").menu("Add Block Comment").click(); //$NON-NLS-1$//$NON-NLS-2$ + checkVPE("BlockCommentTestToggle.xml"); //$NON-NLS-1$ //Test remove block comment from Source menu getEditor().navigateTo(22,22); - bot.menu("Source").menu("Remove Block Comment").click(); - checkVPE("CommentTestUntoggle.xml"); + bot.menu("Source").menu("Remove Block Comment").click(); //$NON-NLS-1$//$NON-NLS-2$ + checkVPE("CommentTestUntoggle.xml"); //$NON-NLS-1$ //Test add block comment with CTRL+SHIFT+/ hot keys getEditor().navigateTo(22,22); pressBlockCommentHotKeys(); - checkVPE("BlockCommentTestToggle.xml"); + checkVPE("BlockCommentTestToggle.xml"); //$NON-NLS-1$ //Test remove block comment with CTRL+SHIFT+\ hot keys getEditor().navigateTo(22,22); pressUnBlockCommentHotKeys(); - checkVPE("CommentTestUntoggle.xml"); + checkVPE("CommentTestUntoggle.xml"); //$NON-NLS-1$ //Test add block comment lines from Source menu getEditor().navigateTo(18,22); - bot.menu("Source").menu("Add Block Comment").click(); - checkVPE("BlockCommentTestLinesToggle.xml"); + bot.menu("Source").menu("Add Block Comment").click(); //$NON-NLS-1$//$NON-NLS-2$ + checkVPE("BlockCommentTestLinesToggle.xml"); //$NON-NLS-1$ //Test remove block comment lines from Source menu getEditor().navigateTo(18,22); - bot.menu("Source").menu("Remove Block Comment").click(); - checkVPE("CommentTestUntoggle.xml"); + bot.menu("Source").menu("Remove Block Comment").click(); //$NON-NLS-1$//$NON-NLS-2$ + checkVPE("CommentTestUntoggle.xml"); //$NON-NLS-1$ //Test add block comment lines with CTRL+SHIFT+/ hot keys getEditor().navigateTo(18,22); - bot.menu("Source").menu("Add Block Comment").click(); - checkVPE("BlockCommentTestLinesToggle.xml"); + bot.menu("Source").menu("Add Block Comment").click(); //$NON-NLS-1$ //$NON-NLS-2$ + checkVPE("BlockCommentTestLinesToggle.xml"); //$NON-NLS-1$ //Test remove block comment lines with CTRL+SHIFT+/ hot keys getEditor().navigateTo(18,22); - bot.menu("Source").menu("Remove Block Comment").click(); - checkVPE("CommentTestUntoggle.xml"); + bot.menu("Source").menu("Remove Block Comment").click(); //$NON-NLS-1$ //$NON-NLS-2$ + checkVPE("CommentTestUntoggle.xml"); //$NON-NLS-1$ } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -18,26 +18,26 @@ //Test toggle comment from Source menu getEditor().navigateTo(22,22); - bot.menu("Source").menu("Toggle Comment").click(); - checkVPE("ToggleCommentTestToggle.xml"); + bot.menu("Source").menu("Toggle Comment").click(); //$NON-NLS-1$ //$NON-NLS-2$ + checkVPE("ToggleCommentTestToggle.xml"); //$NON-NLS-1$ //Test untoggle comment from Source menu getEditor().navigateTo(22,22); - bot.menu("Source").menu("Toggle Comment").click(); - checkVPE("CommentTestUntoggle.xml"); + bot.menu("Source").menu("Toggle Comment").click(); //$NON-NLS-1$ //$NON-NLS-2$ + checkVPE("CommentTestUntoggle.xml"); //$NON-NLS-1$ //Test toggle comment with CTRL+SHIFT+C hot keys getEditor().navigateTo(22,22); pressToggleCommentHotKeys(); - checkVPE("ToggleCommentTestToggle.xml"); + checkVPE("ToggleCommentTestToggle.xml"); //$NON-NLS-1$ //Test untoggle comment with CTRL+SHIFT hot keys getEditor().navigateTo(22,22); pressToggleCommentHotKeys(); - checkVPE("CommentTestUntoggle.xml"); + checkVPE("CommentTestUntoggle.xml"); //$NON-NLS-1$ } 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 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -44,10 +44,10 @@ @Override protected String getPathToResources(String testPage) throws IOException { - String filePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"resources/editor/"+testPage; + String filePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"resources/editor/"+testPage; //$NON-NLS-1$ //$NON-NLS-2$ File file = new File(filePath); if (!file.isFile()) { - filePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"editor/"+testPage; + filePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"editor/"+testPage; //$NON-NLS-1$//$NON-NLS-2$ } return filePath; } @@ -56,7 +56,7 @@ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); SWTBotTree tree = innerBot.tree(); tree.expandNode(JBT_TEST_PROJECT_NAME) - .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); + .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ } void checkVPE(String testPage) throws Throwable{ @@ -70,8 +70,8 @@ //Restore page state before tests if (editor != null){ editor.setFocus(); - bot.menu("Edit").menu("Select All").click(); - bot.menu("Edit").menu("Delete").click(); + bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$ //$NON-NLS-2$ + bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ editor.setText(editorText); editor.save(); } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -2,12 +2,12 @@ public class VerificationOfNameSpacesTest extends VPEEditorTestCase{ - private static String testText = "<jsp:root\n" + - "xmlns:jsp=\"http://java.sun.com/JSP/Page\n" + - "xmlns:public=\"http://www.jspcentral.com/tags\"\n" + - "version=\"1.2\">\n" + - "...\n" + - "</jsp:root>"; + private static String testText = "<jsp:root\n" + //$NON-NLS-1$ + "xmlns:jsp=\"http://java.sun.com/JSP/Page\n" + //$NON-NLS-1$ + "xmlns:public=\"http://www.jspcentral.com/tags\"\n" + //$NON-NLS-1$ + "version=\"1.2\">\n" + //$NON-NLS-1$ + "...\n" + //$NON-NLS-1$ + "</jsp:root>"; //$NON-NLS-1$ public void testVerificationOfNameSpaces() throws Throwable{ @@ -21,16 +21,16 @@ //Test clear source getEditor().setFocus(); - bot.menu("Edit").menu("Select All").click(); + bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$ //$NON-NLS-2$ delay(); - bot.menu("Edit").menu("Delete").click(); + bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ //Test insert test text getEditor().setText(testText); getEditor().save(); waitForBlockingJobsAcomplished(VISUAL_UPDATE); - performContentTestByDocument("VerificationOfNameSpaces.xml", bot.multiPageEditorByTitle(TEST_PAGE)); + performContentTestByDocument("VerificationOfNameSpaces.xml", bot.multiPageEditorByTitle(TEST_PAGE)); //$NON-NLS-1$ } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -9,11 +9,11 @@ public class AddSubstitutedELExpressionFolderScopeTest extends SubstitutedELTestCase{ - private static final String TEST_PAGE_FOR_FOLDER = "testPage"; - private static final String TEST_FOLDER = "testFolder"; + private static final String TEST_PAGE_FOR_FOLDER = "testPage"; //$NON-NLS-1$ + private static final String TEST_FOLDER = "testFolder"; //$NON-NLS-1$ //Do not edit this variable as test will fail - private static final String EL_VALUE = "Any Name"; + private static final String EL_VALUE = "Any Name"; //$NON-NLS-1$ public void testAddSubstitutedELExpressionFolderScope() throws Throwable{ @@ -25,28 +25,28 @@ //Test create new folder SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); - innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") + innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") //$NON-NLS-1$ .select(); - bot.menu("File").menu("New").menu("Folder").click(); + bot.menu("File").menu("New").menu("Folder").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - bot.shell("New Folder").activate(); - bot.textWithLabel("Folder name:").setText(TEST_FOLDER); - bot.button("Finish").click(); + bot.shell("New Folder").activate(); //$NON-NLS-1$ + bot.textWithLabel("Folder name:").setText(TEST_FOLDER); //$NON-NLS-1$ + bot.button("Finish").click(); //$NON-NLS-1$ //Test create page in new folder innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); - innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") + innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") //$NON-NLS-1$ .getNode(TEST_FOLDER).select(); - bot.menu("File").menu("New").menu("JSP File").click(); + bot.menu("File").menu("New").menu("JSP File").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - bot.shell("New File JSP").activate(); - bot.textWithLabel("Name*").setText(TEST_PAGE_FOR_FOLDER); - bot.button("Finish").click(); + bot.shell("New File JSP").activate(); //$NON-NLS-1$ + bot.textWithLabel("Name*").setText(TEST_PAGE_FOR_FOLDER); //$NON-NLS-1$ + bot.button("Finish").click(); //$NON-NLS-1$ delay(); - SWTBotEclipseEditor editorForTestPage = bot.editorByTitle(TEST_PAGE_FOR_FOLDER+".jsp").toTextEditor(); + SWTBotEclipseEditor editorForTestPage = bot.editorByTitle(TEST_PAGE_FOR_FOLDER+".jsp").toTextEditor(); //$NON-NLS-1$ editorForTestPage.setText(getEditorText()); editorForTestPage.save(); editorForTestPage.close(); @@ -67,35 +67,35 @@ //Test add EL with folder scope to list - bot.button("Add").click(); + bot.button("Add").click(); //$NON-NLS-1$ delay(); bot.shell(ADD_EL).activate(); - bot.textWithLabel("El Name*").setText("user.name"); - bot.textWithLabel("Value").setText(EL_VALUE); - bot.radio("Folder: Any Page at the Same Folder").click(); - bot.button("Finish").click(); + bot.textWithLabel("El Name*").setText("user.name"); //$NON-NLS-1$ //$NON-NLS-2$ + bot.textWithLabel("Value").setText(EL_VALUE); //$NON-NLS-1$ + bot.radio("Folder: Any Page at the Same Folder").click(); //$NON-NLS-1$ + bot.button("Finish").click(); //$NON-NLS-1$ //Test check table with ELs bot.shell(PAGE_DESIGN).activate(); SWTBotTable table = bot.table(); - String elName = table.cell(0, "El Expression"); - String scope = table.cell(0, "Scope"); - String elValue = table.cell(0, "Value"); - assertEquals("user.name",elName); - assertEquals("Folder",scope); + String elName = table.cell(0, "El Expression"); //$NON-NLS-1$ + String scope = table.cell(0, "Scope"); //$NON-NLS-1$ + String elValue = table.cell(0, "Value"); //$NON-NLS-1$ + assertEquals("user.name",elName); //$NON-NLS-1$ + assertEquals("Folder",scope); //$NON-NLS-1$ assertEquals(EL_VALUE, elValue); //Test close Design Options - bot.button("OK").click(); + bot.button("OK").click(); //$NON-NLS-1$ // waitForBlockingJobsAcomplished(VISUAL_REFRESH); //Check page content - checkVPEForTestPage("AddSubstitutedELExpressionTestPage.xml"); - checkVPEForHelloPage("AddSubstitutedELExpressionHelloPage.xml"); - checkVPEForTestPageFolder("RemoveSubstitutedELExpressionTestPage.xml"); + checkVPEForTestPage("AddSubstitutedELExpressionTestPage.xml"); //$NON-NLS-1$ + checkVPEForHelloPage("AddSubstitutedELExpressionHelloPage.xml"); //$NON-NLS-1$ + checkVPEForTestPageFolder("RemoveSubstitutedELExpressionTestPage.xml"); //$NON-NLS-1$ //Test check the page in the same folder @@ -113,25 +113,25 @@ //Delete item bot.table().select(0); - bot.button("Remove").click(); - bot.button("OK").click(); + bot.button("Remove").click(); //$NON-NLS-1$ + bot.button("OK").click(); //$NON-NLS-1$ //Check VPE content - checkVPEForTestPage("RemoveSubstitutedELExpressionTestPage.xml"); - checkVPEForHelloPage("RemoveSubstitutedELExpressionHelloPage.xml"); - checkVPEForTestPageFolder("RemoveSubstitutedELExpressionTestPage.xml"); + checkVPEForTestPage("RemoveSubstitutedELExpressionTestPage.xml"); //$NON-NLS-1$ + checkVPEForHelloPage("RemoveSubstitutedELExpressionHelloPage.xml"); //$NON-NLS-1$ + checkVPEForTestPageFolder("RemoveSubstitutedELExpressionTestPage.xml"); //$NON-NLS-1$ } @Override protected void tearDown() throws Exception { bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).setFocus(); SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); - innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") + innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") //$NON-NLS-1$ .getNode(TEST_FOLDER).select(); - bot.menu("Edit").menu("Delete").click(); - bot.shell("Confirm Delete").activate(); - bot.button("OK").click(); + bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ + bot.shell("Confirm Delete").activate(); //$NON-NLS-1$ + bot.button("OK").click(); //$NON-NLS-1$ delay(); super.tearDown(); } @@ -143,15 +143,15 @@ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); SWTBotTree tree = innerBot.tree(); tree.expandNode(JBT_TEST_PROJECT_NAME) - .expandNode("WebContent").expandNode(TEST_FOLDER) - .getNode(TEST_PAGE_FOR_FOLDER+".jsp").doubleClick(); - SWTBotEditor editor = bot.editorByTitle(TEST_PAGE_FOR_FOLDER+".jsp"); + .expandNode("WebContent").expandNode(TEST_FOLDER) //$NON-NLS-1$ + .getNode(TEST_PAGE_FOR_FOLDER+".jsp").doubleClick(); //$NON-NLS-1$ + SWTBotEditor editor = bot.editorByTitle(TEST_PAGE_FOR_FOLDER+".jsp"); //$NON-NLS-1$ // waitForBlockingJobsAcomplished(VISUAL_REFRESH); //Check page content try { - performContentTestByDocument(testPageFolder, bot.multiPageEditorByTitle(TEST_PAGE_FOR_FOLDER+".jsp")); + performContentTestByDocument(testPageFolder, bot.multiPageEditorByTitle(TEST_PAGE_FOR_FOLDER+".jsp")); //$NON-NLS-1$ } catch (Throwable e) { throw e; }finally{ Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/PageDesignTestCase.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/PageDesignTestCase.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/PageDesignTestCase.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -14,7 +14,7 @@ public abstract class PageDesignTestCase extends VPEAutoTestCase{ - final static String PAGE_DESIGN = "Page Design Options"; + final static String PAGE_DESIGN = "Page Design Options"; //$NON-NLS-1$ @Override protected void closeUnuseDialogs() { @@ -43,15 +43,15 @@ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); SWTBotTree tree = innerBot.tree(); tree.expandNode(JBT_TEST_PROJECT_NAME) - .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); + .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ } @Override protected String getPathToResources(String testPage) throws IOException { - String filePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"resources/pagedesign/"+testPage; + String filePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"resources/pagedesign/"+testPage; //$NON-NLS-1$//$NON-NLS-2$ File file = new File(filePath); if (!file.isFile()) { - filePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"pagedesign/"+testPage; + filePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"pagedesign/"+testPage; //$NON-NLS-1$ //$NON-NLS-2$ } return filePath; } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -10,8 +10,8 @@ public abstract class SubstitutedELTestCase extends PageDesignTestCase{ - static final String ADD_EL = "Add EL Reference"; - static final String SUBSTITUTED_EL = "Substituted EL expressions"; + static final String ADD_EL = "Add EL Reference"; //$NON-NLS-1$ + static final String SUBSTITUTED_EL = "Substituted EL expressions"; //$NON-NLS-1$ private SWTBotEclipseEditor editor; private String editorText; @@ -54,7 +54,6 @@ void checkVPEForTestPage(String testPage) throws Throwable{ - // waitForBlockingJobsAcomplished(VISUAL_REFRESH); performContentTestByDocument(testPage, bot.multiPageEditorByTitle(TEST_PAGE)); } @@ -70,7 +69,7 @@ bot.tabItem(SUBSTITUTED_EL).activate(); clearELTable(bot.table()); try { - bot.button("OK").click(); + bot.button("OK").click(); //$NON-NLS-1$ } catch (WidgetNotFoundException e) { bot.shell(PAGE_DESIGN).close(); } @@ -81,7 +80,7 @@ try { while (true) { table.select(0); - bot.button("Remove").click(); + bot.button("Remove").click(); //$NON-NLS-1$ } } catch (IllegalArgumentException e) { } @@ -96,14 +95,13 @@ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); SWTBotTree tree = innerBot.tree(); tree.expandNode(JBT_TEST_PROJECT_NAME) - .expandNode("WebContent").expandNode("pages").getNode("hello.jsp").doubleClick(); - SWTBotEditor editor = bot.editorByTitle("hello.jsp"); - // waitForBlockingJobsAcomplished(VISUAL_REFRESH); + .expandNode("WebContent").expandNode("pages").getNode("hello.jsp").doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + SWTBotEditor editor = bot.editorByTitle("hello.jsp"); //$NON-NLS-1$ //Check page content try { - performContentTestByDocument(testHelloPage, bot.multiPageEditorByTitle("hello.jsp")); + performContentTestByDocument(testHelloPage, bot.multiPageEditorByTitle("hello.jsp")); //$NON-NLS-1$ } catch (Throwable e) { throw e; }finally{ Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -4,7 +4,7 @@ public class AlwaysHideSelectionBarWithoutPromptTest extends PreferencesTestCase{ - private static final String HID_SEL_BAR = "Hide selection bar"; + private static final String HID_SEL_BAR = "Hide selection bar"; //$NON-NLS-1$ public void testAlwaysHideSelectionBarWithoutPrompt(){ @@ -67,14 +67,14 @@ bot.toolbarButtonWithTooltip(PREF_TOOLTIP).click(); bot.shell(PREF_FILTER_SHELL_TITLE).activate(); bot.checkBox(SHOW_SELECTION_TAG_BAR).click(); - bot.button("OK").click(); + bot.button("OK").click(); //$NON-NLS-1$ } private void selectPrompt(){ bot.toolbarButtonWithTooltip(PREF_TOOLTIP).click(); bot.shell(PREF_FILTER_SHELL_TITLE).activate(); bot.checkBox(ASK_FOR_CONFIRM).click(); - bot.button("OK").click(); + bot.button("OK").click(); //$NON-NLS-1$ } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/BorderForUnknownTagsTest.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -17,7 +17,7 @@ //Test insert unknown tag editor.navigateTo(12, 52); - editor.insertText("<tagunknown></tagunknown>"); + editor.insertText("<tagunknown></tagunknown>"); //$NON-NLS-1$ //Test default Show Border value @@ -27,21 +27,21 @@ if (!checkBox.isChecked()) { checkBox.click(); } - bot.button("OK").click(); + bot.button("OK").click(); //$NON-NLS-1$ //Test check VPE content - checkVPE("ShowBorderForUnknownTag.xml"); + checkVPE("ShowBorderForUnknownTag.xml"); //$NON-NLS-1$ //Test hide border for unknown tag selectBorder(); - checkVPE("HideBorderForUnknownTag.xml"); + checkVPE("HideBorderForUnknownTag.xml"); //$NON-NLS-1$ //Test restore previous state selectBorder(); - checkVPE("ShowBorderForUnknownTag.xml"); + checkVPE("ShowBorderForUnknownTag.xml"); //$NON-NLS-1$ } @@ -54,7 +54,7 @@ bot.toolbarButtonWithTooltip(PREF_TOOLTIP).click(); bot.shell(PREF_FILTER_SHELL_TITLE).activate(); bot.checkBox(SHOW_BORDER_FOR_UNKNOWN_TAGS).click(); - bot.button("OK").click(); + bot.button("OK").click(); //$NON-NLS-1$ } @Override @@ -63,8 +63,8 @@ //Restore page state before tests editor.setFocus(); - bot.menu("Edit").menu("Select All").click(); - bot.menu("Edit").menu("Delete").click(); + bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$ //$NON-NLS-2$ + bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ editor.setText(textEditor); editor.save(); super.tearDown(); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -12,26 +12,26 @@ bot.toolbarButtonWithTooltip(PREF_TOOLTIP).click(); bot.shell(PREF_FILTER_SHELL_TITLE).activate(); - bot.comboBoxWithLabel(SELECT_DEFAULT_TAB).setSelection("Source"); - bot.button("OK").click(); + bot.comboBoxWithLabel(SELECT_DEFAULT_TAB).setSelection("Source"); //$NON-NLS-1$ + bot.button("OK").click(); //$NON-NLS-1$ //Create and open new page SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); - innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") - .getNode("pages").select(); + innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") //$NON-NLS-1$ + .getNode("pages").select(); //$NON-NLS-1$ - bot.menu("File").menu("New").menu("JSP File").click(); - bot.shell("New File JSP").activate(); - bot.textWithLabel("Name*").setText("testPage"); - bot.button("Finish").click(); + bot.menu("File").menu("New").menu("JSP File").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + bot.shell("New File JSP").activate(); //$NON-NLS-1$ + bot.textWithLabel("Name*").setText("testPage"); //$NON-NLS-1$ //$NON-NLS-2$ + bot.button("Finish").click(); //$NON-NLS-1$ bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).setFocus(); //Check if the tab changed WidgetNotFoundException exception = null; try { - bot.toolbarButtonWithTooltip("Refresh").click(); + bot.toolbarButtonWithTooltip("Refresh").click(); //$NON-NLS-1$ } catch (WidgetNotFoundException e) { exception = e; } @@ -43,12 +43,12 @@ //Delete test page if it has been created SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); - innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") - .expandNode("pages").getNode("testPage.jsp").select(); - bot.menu("Edit").menu("Delete").click(); - bot.shell("Confirm Delete").activate(); - bot.button("OK").click(); - bot.multiPageEditorByTitle(TEST_PAGE).selectTab("Visual/Source"); + innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") //$NON-NLS-1$ + .expandNode("pages").getNode("testPage.jsp").select(); //$NON-NLS-1$//$NON-NLS-2$ + bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ + bot.shell("Confirm Delete").activate(); //$NON-NLS-1$ + bot.button("OK").click(); //$NON-NLS-1$ + bot.multiPageEditorByTitle(TEST_PAGE).selectTab("Visual/Source"); //$NON-NLS-1$ super.tearDown(); } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -15,23 +15,23 @@ public abstract class PreferencesTestCase extends VPEAutoTestCase{ - protected static final String SHOW_SELECTION_TAG_BAR = "Show selection tag bar"; - protected static final String SHOW_NON_VISUAL_TAGS = "Show non-visual tags"; - protected static final String SHOW_BORDER_FOR_UNKNOWN_TAGS = "Show border for unknown tags"; - protected static final String SHOW_RESOURCE_BUNDLES = "Show resource bundles usage as EL expressions"; - protected static final String ASK_FOR_ATTRIBUTES = "Ask for tag attributes during tag insert"; - protected static final String ASK_FOR_CONFIRM = "Ask for confirmation when closing Selection Bar"; - protected static final String SELECT_DEFAULT_TAB = "Select the default active editor's tab"; - protected static final String EDITOR_SPLITTING = "Visual/Source editors splitting"; - protected static final String SHOW_TEXY_FORMAT = "Show text formatting bar"; - protected static final String PREF_TOOLTIP = "Preferences"; - protected static final String PREF_FILTER_SHELL_TITLE = "Preferences (Filtered)"; + protected static final String SHOW_SELECTION_TAG_BAR = "Show selection tag bar"; //$NON-NLS-1$ + protected static final String SHOW_NON_VISUAL_TAGS = "Show non-visual tags"; //$NON-NLS-1$ + protected static final String SHOW_BORDER_FOR_UNKNOWN_TAGS = "Show border for unknown tags"; //$NON-NLS-1$ + protected static final String SHOW_RESOURCE_BUNDLES = "Show resource bundles usage as EL expressions"; //$NON-NLS-1$ + protected static final String ASK_FOR_ATTRIBUTES = "Ask for tag attributes during tag insert"; //$NON-NLS-1$ + protected static final String ASK_FOR_CONFIRM = "Ask for confirmation when closing Selection Bar"; //$NON-NLS-1$ + protected static final String SELECT_DEFAULT_TAB = "Select the default active editor's tab"; //$NON-NLS-1$ + protected static final String EDITOR_SPLITTING = "Visual/Source editors splitting"; //$NON-NLS-1$ + protected static final String SHOW_TEXY_FORMAT = "Show text formatting bar"; //$NON-NLS-1$ + protected static final String PREF_TOOLTIP = "Preferences"; //$NON-NLS-1$ + protected static final String PREF_FILTER_SHELL_TITLE = "Preferences (Filtered)"; //$NON-NLS-1$ @Override protected void closeUnuseDialogs() { try { - bot.shell("Preferences (Filtered)").close(); + bot.shell("Preferences (Filtered)").close(); //$NON-NLS-1$ } catch (WidgetNotFoundException e) { } } @@ -40,7 +40,7 @@ protected boolean isUnuseDialogOpened() { boolean isOpened = false; try { - bot.shell("Preferences (Filtered)").activate(); + bot.shell("Preferences (Filtered)").activate(); //$NON-NLS-1$ isOpened = true; } catch (WidgetNotFoundException e) { } @@ -55,15 +55,15 @@ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); SWTBotTree tree = innerBot.tree(); tree.expandNode(JBT_TEST_PROJECT_NAME) - .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); + .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ } @Override protected String getPathToResources(String testPage) throws IOException { - String filePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"resources/preferences/"+testPage; + String filePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"resources/preferences/"+testPage; //$NON-NLS-1$ //$NON-NLS-2$ File file = new File(filePath); if (!file.isFile()) { - filePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"preferences/"+testPage; + filePath = FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"preferences/"+testPage; //$NON-NLS-1$//$NON-NLS-2$ } return filePath; } @@ -75,16 +75,16 @@ bot.toolbarButtonWithTooltip(PREF_TOOLTIP).click(); bot.shell(PREF_FILTER_SHELL_TITLE).activate(); setPreferencesToDefault(); - bot.button("OK").click(); + bot.button("OK").click(); //$NON-NLS-1$ } @Override protected void tearDown() throws Exception { openPage(); - bot.toolbarButtonWithTooltip("Preferences").click(); - bot.shell("Preferences (Filtered)").activate(); + bot.toolbarButtonWithTooltip("Preferences").click(); //$NON-NLS-1$ + bot.shell("Preferences (Filtered)").activate(); //$NON-NLS-1$ setPreferencesToDefault(); - bot.button("OK").click(); + bot.button("OK").click(); //$NON-NLS-1$ super.tearDown(); } @@ -118,9 +118,9 @@ checkBox.click(); } SWTBotCombo combo = bot.comboBoxWithLabel(SELECT_DEFAULT_TAB); - combo.setSelection("Visual/Source"); + combo.setSelection("Visual/Source"); //$NON-NLS-1$ combo = bot.comboBoxWithLabel(EDITOR_SPLITTING); - combo.setSelection("Vertical splitting with Source Editor on the top"); + combo.setSelection("Vertical splitting with Source Editor on the top"); //$NON-NLS-1$ } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowNonVisualTagsTest.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -4,20 +4,20 @@ public void testShowNonVisualTags() throws Throwable{ - checkVPE("DumpedTestPage.xml"); + checkVPE("DumpedTestPage.xml"); //$NON-NLS-1$ //Test Show Non-Visual Tags selectShowNonVisual(); closePage(); openPage(); - checkVPE("ShowNonVisualTags.xml"); + checkVPE("ShowNonVisualTags.xml"); //$NON-NLS-1$ //Test Hide Non-Visual Tags selectShowNonVisual(); closePage(); openPage(); - checkVPE("DumpedTestPage.xml"); + checkVPE("DumpedTestPage.xml"); //$NON-NLS-1$ } @@ -30,7 +30,7 @@ bot.toolbarButtonWithTooltip(PREF_TOOLTIP).click(); bot.shell(PREF_FILTER_SHELL_TITLE).activate(); bot.checkBox(SHOW_NON_VISUAL_TAGS).click(); - bot.button("OK").click(); + bot.button("OK").click(); //$NON-NLS-1$ } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowResourceBundlesUsageasELexpressionsTest.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -15,12 +15,12 @@ //Test check VPE content with resource bundles selectELExpressions(); - checkVPE("ShowResourceBundlesUsageasELExpressions.xml"); + checkVPE("ShowResourceBundlesUsageasELExpressions.xml"); //$NON-NLS-1$ //Test check VPE content without resource bundles selectELExpressions(); - checkVPE("HideResourceBundlesUsageasELExpressions.xml"); + checkVPE("HideResourceBundlesUsageasELExpressions.xml"); //$NON-NLS-1$ } @@ -30,8 +30,8 @@ //Restore page state before tests editor.setFocus(); - bot.menu("Edit").menu("Select All").click(); - bot.menu("Edit").menu("Delete").click(); + bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$ //$NON-NLS-2$ + bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ editor.setText(textEditor); editor.save(); super.tearDown(); @@ -46,7 +46,7 @@ bot.toolbarButtonWithTooltip(PREF_TOOLTIP).click(); bot.shell(PREF_FILTER_SHELL_TITLE).activate(); bot.checkBox(SHOW_RESOURCE_BUNDLES).click(); - bot.button("OK").click(); + bot.button("OK").click(); //$NON-NLS-1$ } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -4,7 +4,7 @@ public class ShowSelectionTagBarTest extends PreferencesTestCase{ - private static final String HID_SEL_BAR = "Hide selection bar"; + private static final String HID_SEL_BAR = "Hide selection bar"; //$NON-NLS-1$ public void testShowSelectionTagBar(){ @@ -33,8 +33,8 @@ //Test Hide Selection Bar button with confirm bot.toolbarButtonWithTooltip(HID_SEL_BAR).click(); - bot.shell("Confirm hide selection bar").activate(); - bot.button("OK").click(); + bot.shell("Confirm hide selection bar").activate(); //$NON-NLS-1$ + bot.button("OK").click(); //$NON-NLS-1$ checkIsHide(); //Test Show selection after reopen @@ -49,7 +49,7 @@ bot.toolbarButtonWithTooltip(PREF_TOOLTIP).click(); bot.shell(PREF_FILTER_SHELL_TITLE).activate(); bot.checkBox(SHOW_SELECTION_TAG_BAR).click(); - bot.button("OK").click(); + bot.button("OK").click(); //$NON-NLS-1$ } private void checkIsHide(){ Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -16,38 +16,38 @@ //Test open import dialog - bot.viewByTitle("JBoss Tools Palette").setFocus(); - bot.toolbarButtonWithTooltip("Import").click(); - bot.shell("Import Tags from TLD File").activate(); + bot.viewByTitle("JBoss Tools Palette").setFocus(); //$NON-NLS-1$ + bot.toolbarButtonWithTooltip("Import").click(); //$NON-NLS-1$ + bot.shell("Import Tags from TLD File").activate(); //$NON-NLS-1$ //Test open edit TLD dialog - bot.button("Browse...").click(); - bot.shell("Edit TLD").activate(); + bot.button("Browse...").click(); //$NON-NLS-1$ + bot.shell("Edit TLD").activate(); //$NON-NLS-1$ //Test cancel TLD SWTBotTree tree = bot.tree(); delay(); - tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("x-1_0-rt.tld [x_rt]").select(); - bot.button("Cancel").click(); + tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("x-1_0-rt.tld [x_rt]").select(); //$NON-NLS-1$ //$NON-NLS-2$ + bot.button("Cancel").click(); //$NON-NLS-1$ //Test check fields - bot.shell("Import Tags from TLD File").activate(); - assertEquals("", bot.textWithLabel("TLD File*").getText()); - assertEquals("", bot.textWithLabel("Name*").getText()); - assertEquals("", bot.textWithLabel("Default Prefix").getText()); - assertEquals("", bot.textWithLabel("Library URI").getText()); - bot.button("Cancel").click(); + bot.shell("Import Tags from TLD File").activate(); //$NON-NLS-1$ + assertEquals("", bot.textWithLabel("TLD File*").getText()); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("", bot.textWithLabel("Name*").getText()); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("", bot.textWithLabel("Default Prefix").getText()); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals("", bot.textWithLabel("Library URI").getText()); //$NON-NLS-1$ //$NON-NLS-2$ + bot.button("Cancel").click(); //$NON-NLS-1$ } protected void closeUnuseDialogs(){ try { - bot.shell("Edit TLD").close(); + bot.shell("Edit TLD").close(); //$NON-NLS-1$ } catch (WidgetNotFoundException e) { } try { - bot.shell("Import Tags from TLD File").close(); + bot.shell("Import Tags from TLD File").close(); //$NON-NLS-1$ } catch (WidgetNotFoundException e) { } } @@ -55,12 +55,12 @@ protected boolean isUnuseDialogOpened(){ boolean isOpened = false; try { - bot.shell("Edit TLD").activate(); + bot.shell("Edit TLD").activate(); //$NON-NLS-1$ isOpened = true; } catch (WidgetNotFoundException e) { } try { - bot.shell("Import Tags from TLD File").activate(); + bot.shell("Import Tags from TLD File").activate(); //$NON-NLS-1$ isOpened = true; }catch (WidgetNotFoundException e) { } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java 2010-02-02 15:07:22 UTC (rev 20083) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java 2010-02-02 19:40:18 UTC (rev 20084) @@ -9,13 +9,13 @@ public class ImportTagsFromTLDFileTest extends VPEAutoTestCase{ - private static final String GROUP_NAME = "NewGroup"; + private static final String GROUP_NAME = "NewGroup"; //$NON-NLS-1$ public void testImportTagsFromTLDFile(){ //Test clear group - bot.toolbarButtonWithTooltip("Palette Editor").click(); - bot.shell("Palette Editor").activate(); + bot.toolbarButtonWithTooltip("Palette Editor").click(); //$NON-NLS-1$ + bot.shell("Palette Editor").activate(); //$NON-NLS-1$ try { bot.getDisplay().syncExec(new Runnable() { @@ -23,7 +23,7 @@ SWTBotTree tree = bot.tree(); delay(); try { - tree.expandNode("XStudio").expandNode("Palette").getNode(GROUP_NAME).select(); + tree.expandNode("XStudio").expandNode("Palette").getNode(GROUP_NAME).select(); //$NON-NLS-1$ //$NON-NLS-2$ Display display = bot.getDisplay(); Event event = new Event(); event.type = SWT.KeyDown; @@ -49,38 +49,38 @@ }); - bot.shell("Confirmation").activate(); - bot.button("OK").click(); + bot.shell("Confirmation").activate(); //$NON-NLS-1$ + bot.button("OK").click(); //$NON-NLS-1$ } catch (WidgetNotFoundException e) { } - bot.shell("Palette Editor").activate(); - bot.button("OK").click(); + bot.shell("Palette Editor").activate(); //$NON-NLS-1$ + bot.button("OK").click(); //$NON-NLS-1$ //Test open import dialog - bot.toolbarButtonWithTooltip("Import").click(); - bot.shell("Import Tags from TLD File").activate(); + bot.toolbarButtonWithTooltip("Import").click(); //$NON-NLS-1$ + bot.shell("Import Tags from TLD File").activate(); //$NON-NLS-1$ //Test set tag lib - bot.button("Browse...").click(); - bot.shell("Edit TLD").activate(); + bot.button("Browse...").click(); //$NON-NLS-1$ + bot.shell("Edit TLD").activate(); //$NON-NLS-1$ SWTBotTree tree = bot.tree(); delay(); - tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("c.tld [c]").select(); - bot.button("OK").click(); + tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("c.tld [c]").select(); //$NON-NLS-1$ //$NON-NLS-2$ + bot.button("OK").click(); //$NON-NLS-1$ //Test set group - bot.shell("Import Tags from TLD File").activate(); + bot.shell("Import Tags from TLD File").activate(); //$NON-NLS-1$ bot.radio(1).click(); bot.text(4).setText(GROUP_NAME); - bot.button("OK").click(); + bot.button("OK").click(); //$NON-NLS-1$ //Test if group is created - bot.toolbarButtonWithTooltip("Palette Editor").click(); - bot.shell("Palette Editor").activate(); + bot.toolbarButtonWithTooltip("Palette Editor").click(); //$NON-NLS-1$ + bot.shell("Palette Editor").activate(); //$NON-NLS-1$ try { bot.getDisplay().syncExec(new Runnable() { @@ -88,7 +88,7 @@ SWTBotTree tree = bot.tree(); delay(); try { - tree.expandNode("XStudio").expandNode("Palette").getNode(GROUP_NAME).select(); + tree.expandNode("XStudio").expandNode("Palette").getNode(GROUP_NAME).select(); //$NON-NLS-1$ //$NON-NLS-2$ Display display = bot.getDisplay(); Event event = new Event(); event.type = SWT.KeyDown; @@ -114,12 +114,12 @@ } }); - bot.shell("Confirmation").activate(); - bot.button("OK").click(); + bot.shell("Confirmation").activate(); //$NON-NLS-1$ + bot.button("OK").click(); //$NON-NLS-1$ } catch (WidgetNotFoundException e) { } - bot.shell("Palette Editor").activate(); - bot.button("OK").click(); + bot.shell("Palette Editor").activate(); //$NON-NLS-1$ + bot.button("OK").click(); //$NON-NLS-1$ } @@ -133,17 +133,17 @@ protected boolean isUnuseDialogOpened() { boolean isOpened = false; try { - bot.shell("Edit TLD").activate(); + bot.shell("Edit TLD").activate(); //$NON-NLS-1$ isOpened = true; } catch (WidgetNotFoundException e) { } try { - bot.shell("Import Tags from TLD File").activate(); + bot.shell("Import Tags from TLD File").activate(); //$NON-NLS-1$ isOpened = true; }catch (WidgetNotFoundException e) { } try { - bot.shell("Palette Editor").activate(); + bot.shell("Palette Editor").activate(); //$NON-NLS-1$ isOpened = true; } catch (WidgetNotFoundException e) { } @@ -153,15 +153,15 @@ @Override protected void closeUnuseDialogs() { try { - bot.shell("Edit TLD").close(); + bot.shell("Edit TLD").close(); //$NON-NLS-1$ } catch (WidgetNotFoundException e) { } try { - bot.shell("Import Tags from TLD File").close(); + bot.shell("Import Tags from TLD File").close(); //$NON-NLS-1$ }catch (WidgetNotFoundException e) { } try { - bot.shell("Palette Editor").close(); + bot.shell("Palette Editor").close(); //$NON-NLS-1$ } catch (WidgetNotFoundException e) { } }