Author: dgolovin Date: 2011-01-12 15:40:22 -0500 (Wed, 12 Jan 2011) New Revision: 28152 Modified: branches/jbosstools-3.2.0.CR1/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java branches/jbosstools-3.2.0.CR1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java branches/jbosstools-3.2.0.CR1/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/.project branches/jbosstools-3.2.0.CR1/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.project Log: https://issues.jboss.org/browse/JBIDE-7745 Seam/JSF UI test fails on b2 merge from trunk revisions #28151,#28150 - 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 validation builder removed where it isn't required Modified: branches/jbosstools-3.2.0.CR1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- branches/jbosstools-3.2.0.CR1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2011-01-12 20:24:18 UTC (rev 28151) +++ branches/jbosstools-3.2.0.CR1/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2011-01-12 20:40:22 UTC (rev 28152) @@ -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: branches/jbosstools-3.2.0.CR1/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java =================================================================== --- branches/jbosstools-3.2.0.CR1/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java 2011-01-12 20:24:18 UTC (rev 28151) +++ branches/jbosstools-3.2.0.CR1/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java 2011-01-12 20:40:22 UTC (rev 28152) @@ -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; } Modified: branches/jbosstools-3.2.0.CR1/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/.project =================================================================== --- branches/jbosstools-3.2.0.CR1/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/.project 2011-01-12 20:24:18 UTC (rev 28151) +++ branches/jbosstools-3.2.0.CR1/vpe/tests/org.jboss.tools.vpe.spring.test/resources/SpringTest/.project 2011-01-12 20:40:22 UTC (rev 28152) @@ -7,36 +7,11 @@ </projects> <buildSpec> <buildCommand> - <name>org.eclipse.ajdt.core.ajbuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> <name>org.eclipse.wst.common.project.facet.core.builder</name> <arguments> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.maven.ide.eclipse.maven2Builder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.springframework.ide.eclipse.core.springbuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> <name>org.jboss.tools.jst.web.kb.kbbuilder</name> <arguments> </arguments> Modified: branches/jbosstools-3.2.0.CR1/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.project =================================================================== --- branches/jbosstools-3.2.0.CR1/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.project 2011-01-12 20:24:18 UTC (rev 28151) +++ branches/jbosstools-3.2.0.CR1/vpe/tests/org.jboss.tools.vpe.ui.test/resources/TestProject/.project 2011-01-12 20:40:22 UTC (rev 28152) @@ -15,11 +15,6 @@ <arguments> </arguments> </buildCommand> - <buildCommand> - <name>org.jboss.tools.common.verification.verifybuilder</name> - <arguments> - </arguments> - </buildCommand> </buildSpec> <natures> <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>