[jbosstools-commits] JBoss Tools SVN: r20925 - trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide.
Author: vpakan(a)redhat.com
Date: 2010-03-19 05:02:43 -0400 (Fri, 19 Mar 2010)
New Revision: 20925
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CSSSelectorJBIDE3288.java
Log:
Close properly opened dialogs when exception is thrown
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CSSSelectorJBIDE3288.java
===================================================================
---
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CSSSelectorJBIDE3288.java 2010-03-19
07:29:17 UTC (rev 20924)
+++
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/cssdialog/jbide/CSSSelectorJBIDE3288.java 2010-03-19
09:02:43 UTC (rev 20925)
@@ -7,6 +7,7 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
+import org.jboss.tools.ui.bot.ext.SWTUtilExt;
import org.jboss.tools.ui.bot.test.WidgetVariables;
public class CSSSelectorJBIDE3288 extends JSFAutoTestCase{
@@ -32,20 +33,19 @@
@Override
protected void closeUnuseDialogs() {
- try {
- bot.shell(WidgetVariables.CSS_SELECTOR_DIALOG_TITLE).close();
- } catch (WidgetNotFoundException e) {
- }
+ SWTUtilExt.closeShellWhenActive(WidgetVariables.CSS_SELECTOR_DIALOG_TITLE,bot);
+ SWTUtilExt.closeShellWhenActive(WidgetVariables.EDIT_STYLE_CLASS,bot);
}
@Override
protected boolean isUnuseDialogOpened() {
boolean isOpened = false;
- try {
- bot.shell(WidgetVariables.CSS_SELECTOR_DIALOG_TITLE).activate();
- isOpened = true;
- } catch (WidgetNotFoundException e) {
+ isOpened = SWTUtilExt.isShellActive(WidgetVariables.CSS_SELECTOR_DIALOG_TITLE, bot);
+
+ if (!isOpened){
+ isOpened = SWTUtilExt.isShellActive(WidgetVariables.EDIT_STYLE_CLASS, bot);
}
+
return isOpened;
}
@@ -85,6 +85,7 @@
private void selectTestElement(){
getEditor().navigateTo(12, 21);
getEditor().insertText(""); //$NON-NLS-1$
+ getEditor().save();
}
private void openCSSSelectorDialog(){