Author: dgolovin
Date: 2011-04-26 19:39:43 -0400 (Tue, 26 Apr 2011)
New Revision: 30860
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java
Log:
Fix for intermittent errors in VPE related to catching exceptions that not related to VPE
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java 2011-04-26
23:33:33 UTC (rev 30859)
+++
trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java 2011-04-26
23:39:43 UTC (rev 30860)
@@ -37,6 +37,7 @@
import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage;
+import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.VpeController;
import org.jboss.tools.vpe.editor.mapping.VpeDomMapping;
import org.jboss.tools.vpe.editor.mapping.VpeElementMapping;
@@ -121,17 +122,9 @@
*/
@Override
protected void tearDown() throws Exception {
-
closeEditors();
-
Platform.removeLogListener(this);
-
- if (getException() != null) {
- throw new Exception(getException());
- }
-
super.tearDown();
-
}
/*
@@ -150,18 +143,20 @@
* the plugin
*/
public void logging(IStatus status, String plugin) {
- switch (status.getSeverity()) {
- case IStatus.ERROR:
- setException(status.getException());
- break;
- case IStatus.WARNING:
- if (isCheckWarning())
+ // Not perfect solution but at least now exceptions in other plug-ins aren't going
to break VPE tests
+ if (VpePlugin.PLUGIN_ID.equals(status.getPlugin())) {
+ switch (status.getSeverity()) {
+ case IStatus.ERROR:
setException(status.getException());
- break;
- default:
- break;
+ break;
+ case IStatus.WARNING:
+ if (isCheckWarning())
+ setException(status.getException());
+ break;
+ default:
+ break;
+ }
}
-
}
/**
Show replies by date