[jbosstools-commits] JBoss Tools SVN: r42676 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette.

jbosstools-commits at lists.jboss.org jbosstools-commits at lists.jboss.org
Mon Jul 23 08:39:20 EDT 2012


Author: vpakan at redhat.com
Date: 2012-07-23 08:39:20 -0400 (Mon, 23 Jul 2012)
New Revision: 42676

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/ImportTagsFromTLDFileTest.java
   trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ManagePaletteGroupsTest.java
   trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/PaletteEditorTest.java
Log:
Use method getToolbarButtonWitTooltip() from PaletteView class.

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	2012-07-23 12:36:16 UTC (rev 42675)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/CancelTagLibDefenitionTest.java	2012-07-23 12:39:20 UTC (rev 42676)
@@ -13,6 +13,7 @@
 import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.ui.bot.ext.view.PaletteView;
 import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
 
 public class CancelTagLibDefenitionTest extends VPEAutoTestCase{
@@ -22,7 +23,9 @@
 	  openPage();		
 		//Test open import dialog
 		bot.viewByTitle("JBoss Tools Palette").setFocus(); //$NON-NLS-1$
-		bot.toolbarButtonWithTooltip("Import").click(); //$NON-NLS-1$
+		new PaletteView()
+		  .getToolbarButtonWitTooltip("Import")
+		  .click();
 		bot.shell("Import Tags from TLD File").activate(); //$NON-NLS-1$
 		
 		//Test open edit TLD dialog

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	2012-07-23 12:36:16 UTC (rev 42675)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ImportTagsFromTLDFileTest.java	2012-07-23 12:39:20 UTC (rev 42676)
@@ -15,6 +15,8 @@
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.ui.bot.ext.view.PaletteView;
 import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
 
 public class ImportTagsFromTLDFileTest extends VPEAutoTestCase{
@@ -25,7 +27,9 @@
 
 		//Test clear group
 	  bot.viewByTitle("JBoss Tools Palette").setFocus(); //$NON-NLS-1$
-		bot.toolbarButtonWithTooltip("Palette Editor").click(); //$NON-NLS-1$
+	  PaletteView paletteView = new PaletteView();
+	  paletteView.getToolbarButtonWitTooltip(IDELabel.JBossToolsPalette.PALETTE_EDITOR_TOOL_ITEM)
+      .click();
 		bot.shell("Palette Editor").activate(); //$NON-NLS-1$
 		try {
 			bot.getDisplay().syncExec(new Runnable() {
@@ -69,7 +73,8 @@
 
 		//Test open import dialog
 
-		bot.toolbarButtonWithTooltip("Import").click(); //$NON-NLS-1$
+    paletteView.getToolbarButtonWitTooltip(IDELabel.JBossToolsPalette.IMPORT_TOOL_ITEM)
+      .click();
 		bot.shell("Import Tags from TLD File").activate(); //$NON-NLS-1$
 		
 		//Test set tag lib
@@ -90,7 +95,8 @@
 
 		//Test if group is created
 		
-		bot.toolbarButtonWithTooltip("Palette Editor").click(); //$NON-NLS-1$
+		paletteView.getToolbarButtonWitTooltip(IDELabel.JBossToolsPalette.PALETTE_EDITOR_TOOL_ITEM)
+      .click();
 		bot.shell("Palette Editor").activate(); //$NON-NLS-1$
 		try {
 			bot.getDisplay().syncExec(new Runnable() {

Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ManagePaletteGroupsTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ManagePaletteGroupsTest.java	2012-07-23 12:36:16 UTC (rev 42675)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/ManagePaletteGroupsTest.java	2012-07-23 12:39:20 UTC (rev 42676)
@@ -15,6 +15,7 @@
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
 import org.jboss.tools.ui.bot.ext.SWTBotExt;
 import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.ui.bot.ext.view.PaletteView;
 import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
 import org.jboss.tools.vpe.ui.bot.test.tools.SWTBotWebBrowser;
 /**
@@ -46,7 +47,9 @@
 	 * Hide or Show Pallete Group dependent on current Palette Group visibility
 	 */
 	private void hideShowPaletteGroup(){
-    bot.toolbarButtonWithTooltip(IDELabel.JBossToolsPalette.SHOW_HIDE_TOOL_ITEM).click();
+	   new PaletteView()
+       .getToolbarButtonWitTooltip(IDELabel.JBossToolsPalette.SHOW_HIDE_TOOL_ITEM)
+       .click();
     SWTBot dialogBot = bot.shell(IDELabel.Shell.SHOW_HIDE_DRAWERS).activate().bot();
     SWTBotTreeItem tiTestPaletteGroup = dialogBot.tree().getTreeItem(ManagePaletteGroupsTest.TEST_PALETTE_TREE_GROUP_LABEL);
     if (tiTestPaletteGroup.isChecked()){

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	2012-07-23 12:36:16 UTC (rev 42675)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/palette/PaletteEditorTest.java	2012-07-23 12:39:20 UTC (rev 42676)
@@ -19,6 +19,7 @@
 import org.jboss.tools.ui.bot.ext.SWTBotExt;
 import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
 import org.jboss.tools.ui.bot.ext.types.IDELabel;
+import org.jboss.tools.ui.bot.ext.view.PaletteView;
 import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase;
 import org.jboss.tools.vpe.ui.bot.test.tools.SWTBotWebBrowser;
 /**
@@ -38,7 +39,9 @@
 	  openPage();
     openPalette();	
     // add First Palette Group
-    bot.toolbarButtonWithTooltip(IDELabel.JBossToolsPalette.PALETTE_EDITOR_TOOL_ITEM).click();
+    PaletteView paletteView = new PaletteView();
+    paletteView.getToolbarButtonWitTooltip(IDELabel.JBossToolsPalette.PALETTE_EDITOR_TOOL_ITEM)
+      .click();
     SWTBot palettEditorBot = bot.shell(IDELabel.Shell.PALETTE_EDITOR).activate().bot();
     SWTBotTree tree = palettEditorBot.tree();
     SWTBotTreeItem tiPalette = tree.expandNode(IDELabel.PaletteEditor.XSTUDIO_NODE)
@@ -102,7 +105,8 @@
     jspTextEditor.setText(originalText);
     jspTextEditor.save();
     // Delete New Group From Palette
-    bot.toolbarButtonWithTooltip(IDELabel.JBossToolsPalette.PALETTE_EDITOR_TOOL_ITEM).click();
+    paletteView.getToolbarButtonWitTooltip(IDELabel.JBossToolsPalette.PALETTE_EDITOR_TOOL_ITEM)
+      .click();
     palettEditorBot = bot.shell(IDELabel.Shell.PALETTE_EDITOR).activate().bot();
     tree = palettEditorBot.tree();
     tiFirstGroup = tree.expandNode(IDELabel.PaletteEditor.XSTUDIO_NODE)



More information about the jbosstools-commits mailing list