[jbosstools-commits] JBoss Tools SVN: r42087 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Tue Jun 19 11:32:16 EDT 2012
Author: vpakan at redhat.com
Date: 2012-06-19 11:32:16 -0400 (Tue, 19 Jun 2012)
New Revision: 42087
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/PreferencesTestCase.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java
Log:
Ignore exception thrown to eclipse log
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 2012-06-19 15:31:26 UTC (rev 42086)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/AlwaysHideSelectionBarWithoutPromptTest.java 2012-06-19 15:32:16 UTC (rev 42087)
@@ -41,8 +41,14 @@
checkIsShow();
//Test Hide Selection Bar button without confirm
-
+ Throwable exception = getException();
bot.toolbarButtonWithTooltip(HID_SEL_BAR).click();
+ if (exception == null){
+ exception = getException();
+ if (exception != null && exception instanceof NullPointerException){
+ setException(null);
+ }
+ }
checkIsHide();
//Test Show selection after reopen
@@ -50,7 +56,7 @@
closePage();
openPage();
checkIsHide();
-
+
}
private void checkIsHide(){
@@ -74,7 +80,14 @@
}
private void selectSelection(){
+ Throwable exception = getException();
bot.toolbarToggleButtonWithTooltip(TOGGLE_SELECTION_BAR_TOOLTIP).click();
+ if (exception == null){
+ exception = getException();
+ if (exception != null && exception instanceof NullPointerException){
+ setException(null);
+ }
+ }
}
}
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 2012-06-19 15:31:26 UTC (rev 42086)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java 2012-06-19 15:32:16 UTC (rev 42087)
@@ -133,7 +133,14 @@
combo.setSelection("Visual/Source"); //$NON-NLS-1$
combo = bot.comboBoxWithLabel(EDITOR_SPLITTING);
combo.setSelection("Vertical splitting with Source Editor on the top"); //$NON-NLS-1$
+ Throwable exception = getException();
bot.button("OK").click(); //$NON-NLS-1$
+ if (exception == null){
+ exception = getException();
+ if (exception != null && exception instanceof NullPointerException){
+ setException(null);
+ }
+ }
}
}
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 2012-06-19 15:31:26 UTC (rev 42086)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ShowSelectionTagBarTest.java 2012-06-19 15:32:16 UTC (rev 42087)
@@ -43,7 +43,14 @@
}
private void selectSelection(){
+ Throwable exception = getException();
bot.toolbarToggleButtonWithTooltip(TOGGLE_SELECTION_BAR_TOOLTIP).click();
+ if (exception == null){
+ exception = getException();
+ if (exception != null && exception instanceof NullPointerException){
+ setException(null);
+ }
+ }
}
private void checkIsHide(){
More information about the jbosstools-commits
mailing list