Author: vpakan(a)redhat.com
Date: 2012-01-31 14:10:39 -0500 (Tue, 31 Jan 2012)
New Revision: 38339
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java
Log:
Fix method removeProjectFromServers(String, String) to not fail when no server is defined
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java
===================================================================
---
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2012-01-31
17:55:08 UTC (rev 38338)
+++
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2012-01-31
19:10:39 UTC (rev 38339)
@@ -238,37 +238,43 @@
delay();
- SWTBotTree serverTree = bot.viewByTitle(IDELabel.View.SERVERS).bot().tree();
-
- delay();
-
- // Expand All
- for (SWTBotTreeItem serverTreeItem : serverTree.getAllItems()){
- serverTreeItem.expand();
- // if JSF Test Project is deployed to server remove it
- SWTBotTreeItem[] serverTreeItemChildren = serverTreeItem.getItems();
- if (serverTreeItemChildren != null && serverTreeItemChildren.length >
0){
- int itemIndex = 0;
- boolean found = false;
- String treeItemlabel = null;
- do{
- treeItemlabel = serverTreeItemChildren[itemIndex].getText();
- found = treeItemlabel.startsWith(projectName)
- && (stringToContain == null ||
treeItemlabel.indexOf(stringToContain) >= 0);
- } while (!found && ++itemIndex < serverTreeItemChildren.length);
- // Server Tree Item has Child with Text equal to JSF TEst Project
- if (found){
- log.info("Found project to be removed from server: " +
treeItemlabel);
-
ContextMenuHelper.prepareTreeItemForContextMenu(serverTree,serverTreeItemChildren[itemIndex]);
- new SWTBotMenu(ContextMenuHelper.getContextMenu(serverTree,
IDELabel.Menu.REMOVE, false)).click();
- bot.shell("Server").activate();
- bot.button(IDELabel.Button.OK).click();
- log.info("Removed project from server: " + treeItemlabel);
- bot.sleep(10*1000L);
- }
+ try{
+ SWTBotTree serverTree = bot.viewByTitle(IDELabel.View.SERVERS).bot().tree();
+
+ delay();
+
+ // Expand All
+ for (SWTBotTreeItem serverTreeItem : serverTree.getAllItems()){
+ serverTreeItem.expand();
+ // if JSF Test Project is deployed to server remove it
+ SWTBotTreeItem[] serverTreeItemChildren = serverTreeItem.getItems();
+ if (serverTreeItemChildren != null && serverTreeItemChildren.length >
0){
+ int itemIndex = 0;
+ boolean found = false;
+ String treeItemlabel = null;
+ do{
+ treeItemlabel = serverTreeItemChildren[itemIndex].getText();
+ found = treeItemlabel.startsWith(projectName)
+ && (stringToContain == null ||
treeItemlabel.indexOf(stringToContain) >= 0);
+ } while (!found && ++itemIndex < serverTreeItemChildren.length);
+ // Server Tree Item has Child with Text equal to JSF TEst Project
+ if (found){
+ log.info("Found project to be removed from server: " +
treeItemlabel);
+
ContextMenuHelper.prepareTreeItemForContextMenu(serverTree,serverTreeItemChildren[itemIndex]);
+ new SWTBotMenu(ContextMenuHelper.getContextMenu(serverTree,
IDELabel.Menu.REMOVE, false)).click();
+ bot.shell("Server").activate();
+ bot.button(IDELabel.Button.OK).click();
+ log.info("Removed project from server: " + treeItemlabel);
+ bot.sleep(10*1000L);
+ }
+ }
}
+ delay();
+
+ } catch (WidgetNotFoundException wnfe){
+ // do nothing it means there is no server defined
}
- delay();
+
}
public void delay() {
Show replies by date