[jbosstools-commits] JBoss Tools SVN: r28150 - in trunk/vpe/plugins: org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test and 1 other directory.
Author: dgolovin
Date: 2011-01-12 15:23:28 -0500 (Wed, 12 Jan 2011)
New Revision: 28150
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/src/org/jboss/tools/vpe/editor/VpeController.java
Log:
https://issues.jboss.org/browse/JBIDE-7745 Seam/JSF UI test fails on b2
fixed:
-
testNoDefaultLocaleForChangeAndRefresh(org.jboss.tools.jsf.vpe.jsf.test.jbide.TestFViewLocaleAttribute_JBIDE5218)
Time elapsed: 0.727 sec <<< FAILURE!
junit.framework.AssertionFailedError: Text is 'German Hello', but should be in
'en_GB' locale
- exceptions related to deferred messages ran through Display.asyncExec
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2011-01-12
18:59:48 UTC (rev 28149)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2011-01-12
20:23:28 UTC (rev 28150)
@@ -167,6 +167,7 @@
MozillaContextMenuListener, MozillaResizeListener,
MozillaAfterPaintListener, MozillaScrollListener {
+ public static final int DEFAULT_UPDATE_DELAY_TIME = 400;
private boolean visualEditorVisible = true;
private boolean synced = true;
StructuredTextEditor sourceEditor;
@@ -359,7 +360,7 @@
elReferenceListListener.addChangeListener(this);
// initialization of vpe update delay time
- vpeUpdateDelayTime = 400;
+ vpeUpdateDelayTime = DEFAULT_UPDATE_DELAY_TIME;
// pageContext.fireTaglibsChanged();
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-01-12
18:59:48 UTC (rev 28149)
+++
trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java 2011-01-12
20:23:28 UTC (rev 28150)
@@ -23,6 +23,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPage;
@@ -276,6 +277,15 @@
.openEditor(input, getEditorID(), true);
assertNotNull(part);
+ // It is needed to fix issues related with deferred messages processing like
+ // java.lang.NullPointerException
+ // at
org.eclipse.wst.sse.ui.internal.style.SemanticHighlightingReconciler.reconcile(SemanticHighlightingReconciler.java:115)
+ // at
org.eclipse.wst.sse.ui.internal.reconcile.DocumentRegionProcessor.endProcessing(DocumentRegionProcessor.java:119)
+ // at
org.eclipse.wst.sse.ui.internal.reconcile.DirtyRegionProcessor.run(DirtyRegionProcessor.java:682)
+ // at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
+ // it happen because test goes so fast and editor is got closed until deferred events
are processed
+ while (Display.getCurrent().readAndDispatch());
+
return part;
}