Author: vpakan(a)redhat.com Date: 2011-09-06 03:32:43 -0400 (Tue, 06 Sep 2011) New Revision: 34533 Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.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/EditingActionsTest.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/VisualEditorContextMenuTest.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/palette/PaletteEditorTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ImportUnknownTagsWizardTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java Log: Changes for MacOS 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 2011-09-06 06:56:42 UTC (rev 34532) +++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2011-09-06 07:32:43 UTC (rev 34533) @@ -378,9 +378,9 @@ protected static void assertProbelmsViewNoErrors (SWTBotExt botExt){ SWTBotTreeItem[] errors = ProblemsView.getFilteredErrorsTreeItems(botExt, null, null, null, null); - + boolean areThereNoErrors = ((errors == null) || (errors.length == 0)); assertTrue("There are errors in Problems view: " + - (errors != null && errors.length > 0 ? errors[0].getText() : ""), - errors == null); + (areThereNoErrors ? "" : errors[0].getText()), + areThereNoErrors); } } 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 2011-09-06 06:56:42 UTC (rev 34532) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java 2011-09-06 07:32:43 UTC (rev 34533) @@ -3,6 +3,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; +import org.jboss.tools.ui.bot.ext.SWTJBTExt; public class BlockCommentTest extends VPEEditorTestCase{ @@ -67,67 +68,76 @@ } private void pressBlockCommentHotKeys(){ - bot.getDisplay().syncExec(new Runnable() { - public void run() { - Display display = bot.getDisplay(); - Event event = new Event(); - event.type = SWT.KeyDown; - event.keyCode = SWT.CTRL; - display.post(event); - event = new Event(); - event.type = SWT.KeyDown; - event.keyCode = SWT.SHIFT; - display.post(event); - event = new Event(); - event.type = SWT.KeyDown; - event.character = '/'; - display.post(event); - event = new Event(); - event.type = SWT.KeyUp; - event.character = '/'; - display.post(event); - event = new Event(); - event.type = SWT.KeyUp; - event.keyCode = SWT.SHIFT; - display.post(event); - event = new Event(); - event.type = SWT.KeyUp; - event.keyCode = SWT.CTRL; - display.post(event); - } - }); + if (SWTJBTExt.isRunningOnMacOs()) { + bot.shells()[0].pressShortcut(SWT.COMMAND, '/'); + } else { + bot.getDisplay().syncExec(new Runnable() { + public void run() { + Display display = bot.getDisplay(); + Event event = new Event(); + event.type = SWT.KeyDown; + event.keyCode = SWT.CTRL; + display.post(event); + event = new Event(); + event.type = SWT.KeyDown; + event.keyCode = SWT.SHIFT; + display.post(event); + event = new Event(); + event.type = SWT.KeyDown; + event.character = '/'; + display.post(event); + event = new Event(); + event.type = SWT.KeyUp; + event.character = '/'; + display.post(event); + event = new Event(); + event.type = SWT.KeyUp; + event.keyCode = SWT.SHIFT; + display.post(event); + event = new Event(); + event.type = SWT.KeyUp; + event.keyCode = SWT.CTRL; + display.post(event); + } + }); + } } private void pressUnBlockCommentHotKeys(){ - bot.getDisplay().syncExec(new Runnable() { - public void run() { - Display display = bot.getDisplay(); - Event event = new Event(); - event.type = SWT.KeyDown; - event.keyCode = SWT.CTRL; - display.post(event); - event = new Event(); - event.type = SWT.KeyDown; - event.keyCode = SWT.SHIFT; - display.post(event); - event = new Event(); - event.type = SWT.KeyDown; - event.character = '\\'; - display.post(event); - event = new Event(); - event.type = SWT.KeyUp; - event.character = '\\'; - display.post(event); - event = new Event(); - event.type = SWT.KeyUp; - event.keyCode = SWT.SHIFT; - display.post(event); - event = new Event(); - event.type = SWT.KeyUp; - event.keyCode = SWT.CTRL; - display.post(event); - } - }); - } + if (SWTJBTExt.isRunningOnMacOs()){ + bot.shells()[0].pressShortcut(SWT.COMMAND,'\\'); + } + else{ + bot.getDisplay().syncExec(new Runnable() { + public void run() { + Display display = bot.getDisplay(); + Event event = new Event(); + event.type = SWT.KeyDown; + event.keyCode = SWT.CTRL; + display.post(event); + event = new Event(); + event.type = SWT.KeyDown; + event.keyCode = SWT.SHIFT; + display.post(event); + event = new Event(); + event.type = SWT.KeyDown; + event.character = '\\'; + display.post(event); + event = new Event(); + event.type = SWT.KeyUp; + event.character = '\\'; + display.post(event); + event = new Event(); + event.type = SWT.KeyUp; + event.keyCode = SWT.SHIFT; + display.post(event); + event = new Event(); + event.type = SWT.KeyUp; + event.keyCode = SWT.CTRL; + display.post(event); + } + }); + } + } } 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-09-06 06:56:42 UTC (rev 34532) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/EditingActionsTest.java 2011-09-06 07:32:43 UTC (rev 34533) @@ -13,6 +13,7 @@ import java.awt.event.KeyEvent; +import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; @@ -20,6 +21,7 @@ import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; import org.eclipse.swtbot.swt.finder.results.VoidResult; import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.SWTJBTExt; import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; @@ -114,18 +116,34 @@ assertProbelmsViewNoErrors(botExt); // Check Undo Functionality webBrowser.setFocus(); - KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_Z, KeyEvent.VK_CONTROL); + if (SWTJBTExt.isRunningOnMacOs()){ + bot.shells()[0].pressShortcut(SWT.COMMAND, 'z'); + } + else{ + KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_Z, KeyEvent.VK_CONTROL); + } jspEditor.save(); botExt.sleep(Timing.time3S()); assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), "<h:outputTextvalue=\"outputText\"/><h:inputText/><rich:comboBox>", EditingActionsTest.TEST_PAGE_NAME); - KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_Z, KeyEvent.VK_CONTROL); + if (SWTJBTExt.isRunningOnMacOs()){ + bot.shells()[0].pressShortcut(SWT.COMMAND, 'z'); + } + else{ + KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_Z, KeyEvent.VK_CONTROL); + } jspEditor.save(); botExt.sleep(Timing.time3S()); assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), "<h:inputText/><h:inputText/><h:outputTextvalue=\"outputText\"/>", - EditingActionsTest.TEST_PAGE_NAME);KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_Z, KeyEvent.VK_CONTROL); + EditingActionsTest.TEST_PAGE_NAME); + if (SWTJBTExt.isRunningOnMacOs()){ + bot.shells()[0].pressShortcut(SWT.COMMAND, 'z'); + } + else{ + KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_Z, KeyEvent.VK_CONTROL); + } jspEditor.save(); botExt.sleep(Timing.time3S()); assertSourceEditorContains(stripHTMLSourceText(jspEditor.getText()), @@ -133,8 +151,9 @@ EditingActionsTest.TEST_PAGE_NAME); // Check Delete Functionality webBrowser.setFocus(); + botExt.sleep(Timing.time2S()); webBrowser.selectDomNode(webBrowser.getDomNodeByTagName("INPUT",2),0); - botExt.sleep(Timing.time1S()); + botExt.sleep(Timing.time2S()); KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_DELETE); jspEditor.save(); botExt.sleep(Timing.time3S()); @@ -208,7 +227,9 @@ bot.sleep(Timing.time2S()); assertVisualEditorContainsNodeWithValue(webBrowser, "h:text", EditingActionsTest.TEST_PAGE_NAME); nsIDOMNode node = webBrowser.getDomNodeByTagName("DIV", 4); + bot.sleep(Timing.time2S()); webBrowser.selectDomNode(node, 0); + bot.sleep(Timing.time2S()); webBrowser.clickContextMenu(node, SWTBotWebBrowser.SETUP_VISUAL_TEMPLATE_FOR_MENU_LABEL + "<" + unknownTag + ">..."); // Test if window for Tag Template definition was properly opened @@ -309,7 +330,12 @@ assertSourceEditorNotContain(jspEditor.getText(), "<f:view>", EditingActionsTest.TEST_PAGE_NAME); // Undo Changes webBrowser.setFocus(); - KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_Z, KeyEvent.VK_CONTROL); + if (SWTJBTExt.isRunningOnMacOs()){ + bot.shells()[0].pressShortcut(SWT.COMMAND, 'z'); + } + else{ + KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_Z, KeyEvent.VK_CONTROL); + } jspEditor.save(); bot.sleep(Timing.time2S()); assertSourceEditorContains(jspEditor.getText(), "<f:view>", EditingActionsTest.TEST_PAGE_NAME); 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 2011-09-06 06:56:42 UTC (rev 34532) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2011-09-06 07:32:43 UTC (rev 34533) @@ -3,6 +3,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; +import org.jboss.tools.ui.bot.ext.SWTJBTExt; public class ToggleCommentTest extends VPEEditorTestCase{ @@ -42,35 +43,39 @@ } private void pressToggleCommentHotKeys(){ - bot.getDisplay().syncExec(new Runnable() { - public void run() { - Display display = bot.getDisplay(); - Event event = new Event(); - event.type = SWT.KeyDown; - event.keyCode = SWT.CTRL; - display.post(event); - event = new Event(); - event.type = SWT.KeyDown; - event.keyCode = SWT.SHIFT; - display.post(event); - event = new Event(); - event.type = SWT.KeyDown; - event.character = 'c'; - display.post(event); - event = new Event(); - event.type = SWT.KeyUp; - event.character = 'c'; - display.post(event); - event = new Event(); - event.type = SWT.KeyUp; - event.keyCode = SWT.SHIFT; - display.post(event); - event = new Event(); - event.type = SWT.KeyUp; - event.keyCode = SWT.CTRL; - display.post(event); - } - }); - } - + if (SWTJBTExt.isRunningOnMacOs()){ + bot.shells()[0].pressShortcut(SWT.SHIFT | SWT.COMMAND,'c'); + } + else{ + bot.getDisplay().syncExec(new Runnable() { + public void run() { + Display display = bot.getDisplay(); + Event event = new Event(); + event.type = SWT.KeyDown; + event.keyCode = SWT.CTRL; + display.post(event); + event = new Event(); + event.type = SWT.KeyDown; + event.keyCode = SWT.SHIFT; + display.post(event); + event = new Event(); + event.type = SWT.KeyDown; + event.character = 'c'; + display.post(event); + event = new Event(); + event.type = SWT.KeyUp; + event.character = 'c'; + display.post(event); + event = new Event(); + event.type = SWT.KeyUp; + event.keyCode = SWT.SHIFT; + display.post(event); + event = new Event(); + event.type = SWT.KeyUp; + event.keyCode = SWT.CTRL; + display.post(event); + } + }); + } + } } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java 2011-09-06 06:56:42 UTC (rev 34532) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VisualEditorContextMenuTest.java 2011-09-06 07:32:43 UTC (rev 34533) @@ -17,12 +17,14 @@ import org.eclipse.gef.palette.PaletteContainer; import org.eclipse.gef.palette.PaletteEntry; +import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; import org.eclipse.swtbot.swt.finder.results.VoidResult; import org.jboss.tools.ui.bot.ext.SWTBotExt; +import org.jboss.tools.ui.bot.ext.SWTJBTExt; import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; @@ -472,11 +474,18 @@ bot.sleep(Timing.time2S()); webBrowser.setFocus(); // Test Cut + System.out.println(1); calendarNode = webBrowser.getDomNodeByTagName("INPUT",0); + bot.sleep(Timing.time2S()); webBrowser.selectDomNode(calendarNode,0); botExt.sleep(Timing.time2S()); webBrowser.setFocus(); - KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_X,KeyEvent.VK_CONTROL); + if (SWTJBTExt.isRunningOnMacOs()){ + bot.shells()[0].pressShortcut(SWT.COMMAND, 'x'); + } + else{ + KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_X,KeyEvent.VK_CONTROL); + } jspTextEditor.save(); botExt.sleep(Timing.time2S()); sourceEditorText = jspTextEditor.getText(); @@ -486,9 +495,15 @@ // Test Paste webBrowser.setFocus(); inputTextNode = webBrowser.getDomNodeByTagName("INPUT",0); + botExt.sleep(Timing.time2S()); webBrowser.selectDomNode(inputTextNode,0); botExt.sleep(Timing.time2S()); - KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_V,KeyEvent.VK_CONTROL); + if (SWTJBTExt.isRunningOnMacOs()){ + bot.shells()[0].pressShortcut(SWT.COMMAND, 'v'); + } + else{ + KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_V,KeyEvent.VK_CONTROL); + } jspTextEditor.save(); botExt.sleep(Timing.time2S()); sourceEditorText = jspTextEditor.getText(); @@ -502,12 +517,22 @@ botExt.sleep(Timing.time2S()); webBrowser.selectDomNode(calendarNode,0); botExt.sleep(Timing.time2S()); - KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_C,KeyEvent.VK_CONTROL); + if (SWTJBTExt.isRunningOnMacOs()){ + bot.shells()[0].pressShortcut(SWT.COMMAND, 'c'); + } + else{ + KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_C,KeyEvent.VK_CONTROL); + } inputTextNode = webBrowser.getDomNodeByTagName("INPUT",1); botExt.sleep(Timing.time2S()); webBrowser.selectDomNode(inputTextNode,0); botExt.sleep(Timing.time2S()); - KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_V,KeyEvent.VK_CONTROL); + if (SWTJBTExt.isRunningOnMacOs()){ + bot.shells()[0].pressShortcut(SWT.COMMAND, 'v'); + } + else{ + KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_V,KeyEvent.VK_CONTROL); + } jspTextEditor.save(); botExt.sleep(Timing.time2S()); sourceEditorText = jspTextEditor.getText(); 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 2011-09-06 06:56:42 UTC (rev 34532) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java 2011-09-06 07:32:43 UTC (rev 34533) @@ -9,13 +9,15 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotCombo; import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarToggleButton; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.ui.bot.ext.SWTJBTExt; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.vpe.ui.bot.test.Activator; import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; public abstract class PreferencesTestCase extends VPEAutoTestCase{ - protected static final String TOGGLE_SELECTION_BAR_TOOLTIP = "Toggle Selection Bar (Ctrl+6)"; //$NON-NLS-1$ + protected static final String TOGGLE_SELECTION_BAR_TOOLTIP = "Toggle Selection Bar (" + + (SWTJBTExt.isRunningOnMacOs() ? "⌘6" : "Ctrl+6") + ")"; //$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$ Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/PaletteEditorTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/PaletteEditorTest.java 2011-09-06 06:56:42 UTC (rev 34532) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/PaletteEditorTest.java 2011-09-06 07:32:43 UTC (rev 34533) @@ -49,7 +49,6 @@ ContextMenuHelper.clickContextMenu(menu, IDELabel.PaletteEditor.NEW_MENU_ITEM, IDELabel.PaletteEditor.CREATE_GROUP_MENU_ITEM); - ContextMenuHelper.hideMenuRecursively(menu); SWTBot createGroupDialogBot = bot.shell(IDELabel.Shell.CREATE_GROUP).activate().bot(); final String firstGroup = "First"; createGroupDialogBot.textWithLabel(IDELabel.CreateGroupDialog.NAME).setText(firstGroup); @@ -63,7 +62,6 @@ menu = ContextMenuHelper.getTreeMenuViaReflections(tree.widget,IDELabel.PaletteEditor.CREATE_GROUP_MENU_ITEM); ContextMenuHelper.clickContextMenu(menu, IDELabel.PaletteEditor.CREATE_GROUP_MENU_ITEM); - ContextMenuHelper.hideMenuRecursively(menu); SWTBot addPaletteGroupBot = bot.shell(IDELabel.Shell.ADD_PALETTE_GROUP).activate().bot(); final String secondGroup = "Second"; addPaletteGroupBot.textWithLabel(IDELabel.AddPaletteGroupDialog.NAME).setText(secondGroup); @@ -79,7 +77,6 @@ ContextMenuHelper.clickContextMenu(menu, IDELabel.PaletteEditor.NEW_MENU_ITEM, IDELabel.PaletteEditor.CREATE_MACRO_MENU_ITEM); - ContextMenuHelper.hideMenuRecursively(menu); SWTBot addPaletteMacroBot = bot.shell(IDELabel.Shell.ADD_PALETTE_MACRO).activate().bot(); final String macroName = "Test Macro"; addPaletteMacroBot.textWithLabel(IDELabel.AddPaletteMacroDialog.NAME).setText(macroName); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2011-09-06 06:56:42 UTC (rev 34532) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2011-09-06 07:32:43 UTC (rev 34533) @@ -24,6 +24,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotText; import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; import org.jboss.tools.jst.jsp.messages.JstUIMessages; +import org.jboss.tools.ui.bot.ext.SWTJBTExt; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; @@ -32,7 +33,7 @@ public class ExternalizeStringsDialogTest extends VPEAutoTestCase { private final String ENABLED_TEST_TEXT = "<html>Externalize Text</html>"; //$NON-NLS-1$ - private final String TOOL_TIP = "Externalize Strings... (Ctrl+7)"; //$NON-NLS-1$ + private final String TOOL_TIP = (SWTJBTExt.isRunningOnMacOs() ? "Externalize Strings... (⌘7)" : "Externalize selected string... (Ctrl+7)"); //$NON-NLS-1$ private final String FOLDER_TEXT_LABEL = "Enter or select the parent folder:"; //$NON-NLS-1$ private final String INCORRECT_TABLE_VALUE = "Table value is incorrect"; //$NON-NLS-1$ private final String TOOLBAR_ICON_ENABLED = "Toolbar button should be enabled"; //$NON-NLS-1$ Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ImportUnknownTagsWizardTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ImportUnknownTagsWizardTest.java 2011-09-06 06:56:42 UTC (rev 34532) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ImportUnknownTagsWizardTest.java 2011-09-06 07:32:43 UTC (rev 34533) @@ -12,6 +12,7 @@ import java.io.File; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.ui.bot.test.WidgetVariables; import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; @@ -76,8 +77,7 @@ /* * Check that templates have been added to the preference page */ - bot.menu(IDELabel.Menu.WINDOW).menu(IDELabel.Menu.PREFERENCES).click(); - bot.shell(IDELabel.Shell.PREFERENCES).activate(); + open.preferenceOpen(ActionItem.Preference.JBossTools.LABEL); importTree = bot.tree(); importTree.expandNode(IDELabel.PreferencesDialog.JBOSS_TOOLS) .expandNode(IDELabel.PreferencesDialog.JBOSS_TOOLS_WEB) @@ -102,4 +102,4 @@ } -} +} \ No newline at end of file Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java 2011-09-06 06:56:42 UTC (rev 34532) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java 2011-09-06 07:32:43 UTC (rev 34533) @@ -10,38 +10,54 @@ ******************************************************************************/ package org.jboss.tools.vpe.ui.bot.test.wizard; -import org.eclipse.swtbot.swt.finder.SWTBotTestCase; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.ui.bot.test.WidgetVariables; +import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; /** - * This test class open vpe preference page - * Window->Preferences->JBoss Tools->Web->Editors->Visual Page Editor->Templates + * This test class open vpe preference page Window->Preferences->JBoss + * Tools->Web->Editors->Visual Page Editor->Templates * * @author mareshkau - * + * */ -public class VPESourceCodeTemplatesPreferencePageTest extends SWTBotTestCase{ +public class VPESourceCodeTemplatesPreferencePageTest extends VPEAutoTestCase { - //just open a VPE Source Code templates preference test page - public void testSourceCodeTemplatesPreferencePage() { - this.bot.menu(IDELabel.Menu.WINDOW).menu(IDELabel.Menu.PREFERENCES).click(); //$NON-NLS-1$ //$NON-NLS-2$ - SWTBotTree preferenceTree = this.bot.tree(); - preferenceTree - .expandNode(IDELabel.PreferencesDialog.JBOSS_TOOLS) //$NON-NLS-1$ - .expandNode(IDELabel.PreferencesDialog.JBOSS_TOOLS_WEB) //$NON-NLS-1$ - .expandNode(IDELabel.PreferencesDialog.JBOSS_TOOLS_WEB_EDITORS) //$NON-NLS-1$ - .expandNode(IDELabel.PreferencesDialog.JBOSS_TOOLS_WEB_EDITORS_VPE).select(); //$NON-NLS-1$ - bot.tabItem(IDELabel.PreferencesDialog.JBOSS_TOOLS_WEB_EDITORS_VPE_VISUAL_TEMPLATES).activate(); //$NON-NLS-1$ - try{ - this.bot.button(IDELabel.Button.ADD).click(); //$NON-NLS-1$ - this.bot.button(IDELabel.Button.CANCEL).click(); //$NON-NLS-1$ - } catch(WidgetNotFoundException ex){ - fail("Preference Page has not been created"+ex);//$NON-NLS-1$ - }finally{ - this.bot.button(WidgetVariables.OK_BUTTON).click(); - } - } + // just open a VPE Source Code templates preference test page + public void testSourceCodeTemplatesPreferencePage() { + open.preferenceOpen(ActionItem.Preference.JBossTools.LABEL); + SWTBotTree preferenceTree = this.bot.tree(); + preferenceTree.expandNode(IDELabel.PreferencesDialog.JBOSS_TOOLS) + //$NON-NLS-1$ + .expandNode(IDELabel.PreferencesDialog.JBOSS_TOOLS_WEB) + //$NON-NLS-1$ + .expandNode(IDELabel.PreferencesDialog.JBOSS_TOOLS_WEB_EDITORS) + //$NON-NLS-1$ + .expandNode(IDELabel.PreferencesDialog.JBOSS_TOOLS_WEB_EDITORS_VPE) + .select(); //$NON-NLS-1$ + bot.tabItem( + IDELabel.PreferencesDialog.JBOSS_TOOLS_WEB_EDITORS_VPE_VISUAL_TEMPLATES) + .activate(); //$NON-NLS-1$ + try { + this.bot.button(IDELabel.Button.ADD).click(); //$NON-NLS-1$ + this.bot.button(IDELabel.Button.CANCEL).click(); //$NON-NLS-1$ + } catch (WidgetNotFoundException ex) { + fail("Preference Page has not been created" + ex);//$NON-NLS-1$ + } finally { + this.bot.button(WidgetVariables.OK_BUTTON).click(); + } + } + + @Override + protected void closeUnuseDialogs() { + + } + + @Override + protected boolean isUnuseDialogOpened() { + return false; + } }