Author: yradtsevich Date: 2011-03-25 14:22:52 -0400 (Fri, 25 Mar 2011) New Revision: 30040 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ContextMenuDoubleInsertionTest_JBIDE3888.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/EditingSPecialSymbolsVPE_JBIDE3810.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ExceptionInVPEComments_JBIDE5143.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2219Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2774Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3127Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3396Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3441Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3617Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3632Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4337Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4534Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ValidatorTest.java trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/CustomSashFormTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/DnD_JBIDE5042_JBIDE6229_Test.java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java Log: https://issues.jboss.org/browse/JBIDE-8600 : Speed up executing of VPE tests - delays were decreased by 10 times and more for the tests where it is not critical Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ContextMenuDoubleInsertionTest_JBIDE3888.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ContextMenuDoubleInsertionTest_JBIDE3888.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ContextMenuDoubleInsertionTest_JBIDE3888.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -62,13 +62,13 @@ "Insert Action", insertionItem, //$NON-NLS-1$ sourceEditor, InsertType.INSERT_INTO); firstInsertAction.run(); - TestUtil.delay(2000); + TestUtil.delay(); textWidget.setText(""); final InsertAction2 secondInsertAction = new InsertAction2( "Insert Action", insertionItem, //$NON-NLS-1$ sourceEditor, InsertType.INSERT_INTO); secondInsertAction.run(); - TestUtil.delay(2000); + TestUtil.delay(); assertTrue(textWidget.getText() .contains(REQUIRED_STRING)); } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/EditingSPecialSymbolsVPE_JBIDE3810.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/EditingSPecialSymbolsVPE_JBIDE3810.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/EditingSPecialSymbolsVPE_JBIDE3810.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -49,7 +49,7 @@ IEditorInput editorInput = new FileEditorInput(file); JSPMultiPageEditor part = openEditor(editorInput); TestUtil.waitForIdle(); - TestUtil.delay(3000); + TestUtil.delay(); VpeController controller = TestUtil.getVpeController(part); Mouse mouse = new Mouse(controller, delay); mouse.click(clientX, clientY); @@ -86,7 +86,7 @@ 0); eventTarget.dispatchEvent(delKeyEvent); TestUtil.waitForIdle(); - TestUtil.delay(this.delay); + TestUtil.delay(); return this; } @@ -98,7 +98,7 @@ nsIDOMKeyEvent.DOM_VK_BACK_SPACE, 0); eventTarget.dispatchEvent(bsKeyEvent); TestUtil.waitForIdle(); - TestUtil.delay(this.delay); + TestUtil.delay(); return this; } @@ -111,7 +111,7 @@ nsIDOMKeyEvent.DOM_VK_LEFT, 0); eventTarget.dispatchEvent(leftArrowKeyEvent); TestUtil.waitForIdle(); - TestUtil.delay(this.delay); + TestUtil.delay(); return this; } } @@ -138,7 +138,7 @@ nsIDOMNSEvent.MOUSEDOWN, true); windowUtils.sendMouseEvent("mouseup", clientX, clientY, 0, 1, //$NON-NLS-1$ nsIDOMNSEvent.MOUSEUP, true); - TestUtil.delay(this.delay); + TestUtil.delay(); return this; } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ExceptionInVPEComments_JBIDE5143.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ExceptionInVPEComments_JBIDE5143.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ExceptionInVPEComments_JBIDE5143.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -38,7 +38,7 @@ JsfAllTests.IMPORT_PROJECT_NAME); IEditorInput editorInput = new FileEditorInput(file); JSPMultiPageEditor part = openEditor(editorInput); - TestUtil.delay(3000); + TestUtil.delay(); TestUtil.waitForIdle(); StyledText styledText = part.getSourceEditor().getTextViewer() .getTextWidget(); @@ -46,16 +46,16 @@ int offset = styledText.getOffsetAtLine(8); styledText.setCaretOffset(offset - delimiter.length() - 28); styledText.insert("-"); //$NON-NLS-1$ - TestUtil.delay(1000); + TestUtil.delay(); TestUtil.waitForIdle(); styledText.insert("-"); //$NON-NLS-1$ - TestUtil.delay(1000); + TestUtil.delay(); TestUtil.waitForIdle(); styledText.insert("!"); //$NON-NLS-1$ - TestUtil.delay(1000); + TestUtil.delay(); TestUtil.waitForIdle(); styledText.insert("<"); //$NON-NLS-1$ - TestUtil.delay(1000); + TestUtil.delay(); TestUtil.waitForIdle(); } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -67,7 +67,7 @@ } TestUtil.waitForIdle(); - TestUtil.delay(1000L); + TestUtil.delay(); if (getException() != null) { throw getException(); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2219Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2219Test.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2219Test.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -60,7 +60,7 @@ styledText.insert("Test "); //$NON-NLS-1$ styledText.setSelection(0, 1); assertTrue("Char count shouldn't be a 0",styledText.getCharCount()>2); //$NON-NLS-1$ - TestUtil.delay(500); + TestUtil.delay(); TestUtil.waitForJobs(); PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeEditor(part, false); TestUtil.waitForJobs(); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2774Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2774Test.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2774Test.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -63,7 +63,7 @@ assertNotNull(controller); controller.visualRefresh(); - TestUtil.delay(500); + TestUtil.delay(); Point selectionRangeAfterRefresh = part.getSourceEditor().getTextViewer().getSelectedRange(); assertEquals("Selection should be before and after refresh equals", selectionRangeBeforeRefresh,selectionRangeAfterRefresh); //$NON-NLS-1$ Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -77,7 +77,7 @@ */ JSPMultiPageEditor jspMultiPageEditor = (JSPMultiPageEditor) editorPart; TestUtil.getVpeController(jspMultiPageEditor).visualRefresh(); - TestUtil.delay(5); + TestUtil.delay(); TestUtil.waitForIdle(); //end of lines for testing visual refresh on external files Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3127Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3127Test.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3127Test.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -52,7 +52,7 @@ editorPart.maximizeVisual(); vpeController.visualRefresh(); //wait while refresh jobs start - TestUtil.delay(500); + TestUtil.delay(); TestUtil.waitForJobs(); if(getException()!=null) { throw new Exception(getException()); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3396Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3396Test.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3396Test.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -78,17 +78,17 @@ TestUtil.getVpeController(firstEditorPart); ELReferenceList.getInstance().setAllResources(this.firstPage, this.firstElValues); //wait for visual refresh - TestUtil.delay(1000); + TestUtil.delay(); TestUtil.waitForJobs(); //open second page and final IEditorInput secondInput = new FileEditorInput(this.secondPage); final JSPMultiPageEditor secondEditorPart = openEditor(secondInput); final VpeController secondPageVpeController = TestUtil.getVpeController(secondEditorPart); final int size = secondPageVpeController.getDomMapping().getVisualMap().size(); - TestUtil.delay(5000); + TestUtil.delay(); ELReferenceList.getInstance().setAllResources(this.secondPage, this.secondElValues); //wait for visual refresh - TestUtil.delay(5000); + TestUtil.delay(); final ResourceReference[] elResoReferences = ELReferenceList.getInstance().getAllResources(this.secondPage); for (final ResourceReference resourceReference : elResoReferences) { resourceReference.setProperties(resourceReference.getProperties()+'T'); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3441Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3441Test.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3441Test.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -57,7 +57,7 @@ for (int i = 0; i < 5; i++) { controller1.visualRefresh(); controller2.visualRefresh(); - TestUtil.delay(5000); + TestUtil.delay(); TestUtil.waitForJobs(); checkTaggedDivValue(controller1); checkTaggedDivValue(controller2); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3617Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3617Test.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3617Test.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -64,7 +64,7 @@ vpeController.visualRefresh(); TestUtil.waitForJobs(); try { - TestUtil.delay(500); + TestUtil.delay(); } catch (Throwable e) { fail("Seems like JBIDE-3617 has occured.\n" + e);//$NON-NLS-1$ } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3632Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3632Test.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3632Test.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -42,7 +42,7 @@ // delete one of " part.getSourceEditor().getTextViewer().getTextWidget().replaceTextRange(position, 1, ""); //$NON-NLS-1$ //wait while update job will be running - TestUtil.delay(600); + TestUtil.delay(); closeEditors(); if(getException()!=null) { throw getException(); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4337Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4337Test.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4337Test.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -38,7 +38,7 @@ int offset = TestUtil.getLinePositionOffcet(vpeController.getSourceEditor().getTextViewer(), 11, 23); styledText.setCaretOffset(offset); styledText.insert(" "); //$NON-NLS-1$ - TestUtil.delay(450); + TestUtil.delay(); TestUtil.waitForJobs(); assertEquals("Number of child nodes should be equal before and after change",headChildCount, //$NON-NLS-1$ vpeController.getVisualBuilder().getHeadNode().getChildNodes().getLength()); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4534Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4534Test.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE4534Test.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -98,7 +98,7 @@ this.nonUIJob.schedule(); while(this.nonUIJob.getState()!=Job.RUNNING) { - TestUtil.delay(4); + TestUtil.delay(); } IFile file = (IFile) TestUtil.getComponentPath("index.xhtml", //$NON-NLS-1$ JsfAllTests.IMPORT_JBIDE3247_PROJECT_NAME); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -313,7 +313,7 @@ viewer.getTextWidget().setCaretOffset(newPosition); TestUtil.waitForJobs(); - TestUtil.delay(1000); + TestUtil.delay(); SourceViewerConfiguration sourceViewerConfiguration = ((JSPTextEditor) part .getSourceEditor()).getSourceViewerConfigurationForTest(); // errase errors which can be on start of editor(for example xuklunner @@ -362,7 +362,7 @@ iContentAssistant.uninstall(); } finally { closeEditors(); - TestUtil.delay(1000L); + TestUtil.delay(); } return results; Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2170Test.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -286,11 +286,11 @@ assertNotNull(styledText); styledText.replaceTextRange(start, end - start, ""); - TestUtil.delay(500); + TestUtil.delay(); controller.visualRefresh(); - TestUtil.delay(500); + TestUtil.delay(); nsIDOMDocument visualDocument = TestUtil.getVpeVisualDocument(part); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JsfJbide2362Test.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -182,7 +182,7 @@ for (int j = 0; j < insertedString.length(); j++) { styledText.setCaretOffset(offset + j); styledText.insert(String.valueOf(insertedString.charAt(j))); - TestUtil.delay(50); + TestUtil.delay(); } // wait Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/RefreshBundles_JBIDE5460.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -54,6 +54,6 @@ assertNotNull("Editor is not opened", part); //$NON-NLS-1$ - TestUtil.delay(2000); + TestUtil.delay(); } } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ValidatorTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ValidatorTest.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/ValidatorTest.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -36,7 +36,7 @@ ValidationFramework.getDefault().validate(new IProject[] { project }, false, false, new NullProgressMonitor()); //wait while validation job starts - TestUtil.delay(200); + TestUtil.delay(); TestUtil.waitForJobs(); VpeDebugUtil.debugInfo("Validation time was "+((new Date()).getTime()-startValidationTime)/1000.0+"sec"); //$NON-NLS-1$//$NON-NLS-2$ } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/ComponentContentTest.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -340,7 +340,7 @@ nsIDOMElement result = null; while (result==null) { result = findElementById(controller, elementId); - TestUtil.delay(50); + TestUtil.delay(); if (result==null && ((System.currentTimeMillis()-start) > idle) ) throw new RuntimeException("A long running task detected"); //$NON-NLS-1$ } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/TestUtil.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -20,6 +20,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.text.ITextViewer; import org.eclipse.swt.widgets.Display; @@ -46,6 +47,10 @@ */ public class TestUtil { + /** + * + */ + /** The Constant COMPONENTS_PATH. */ public static final String COMPONENTS_PATH = "WebContent/pages/"; //$NON-NLS-1$ @@ -57,6 +62,7 @@ /** The Constant MAX_IDLE. */ public static final long MAX_IDLE = 15*1000L; + private static final long STANDARD_DELAY = 50L; /** * Gets the component path. @@ -142,6 +148,13 @@ } /** + * Process UI input but do not return for the {@link TestUtil#STANDARD_DELAY} interval. + */ + public static void delay() { + delay(STANDARD_DELAY); + } + + /** * Process UI input but do not return for the specified time interval. * * @param waitTimeMillis the number of milliseconds @@ -185,7 +198,7 @@ public static void waitForIdle(long maxIdle) { long start = System.currentTimeMillis(); while (!Job.getJobManager().isIdle()) { - delay(500); + delay(); if ( (System.currentTimeMillis()-start) > maxIdle ) { Job[] jobs = Job.getJobManager().find(null); StringBuffer jobsList = new StringBuffer("A long running task detected\n"); 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-03-25 17:25:46 UTC (rev 30039) +++ trunk/vpe/plugins/org.jboss.tools.vpe.base.test/src/org/jboss/tools/vpe/base/test/VpeTest.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -71,7 +71,7 @@ static { ClassLoaderUtil.init(); // wait for initialization - TestUtil.delay(3000); + TestUtil.delay(); JspEditorPlugin .getDefault() .getPreferenceStore() @@ -377,7 +377,7 @@ SelectionUtil.setSourceSelection(controller.getPageContext(), nodeMapping.getSourceNode(), 1, 0); - TestUtil.delay(50); + TestUtil.delay(); assertNotNull(getSelectedNode(xulRunnerEditor)); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/CustomSashFormTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/CustomSashFormTest.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/CustomSashFormTest.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -44,7 +44,7 @@ */ closeEditor(part); TestUtil.waitForJobs(); - TestUtil.delay(5000); + TestUtil.delay(); input = new FileEditorInput(file1); part = openEditor(input); visualEditor = (VpeEditorPart) part.getVisualEditor(); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/DnD_JBIDE5042_JBIDE6229_Test.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/DnD_JBIDE5042_JBIDE6229_Test.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/DnD_JBIDE5042_JBIDE6229_Test.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -176,7 +176,7 @@ eventListener.handleEvent(mouseDownEvent); TestUtil.waitForJobs(); - TestUtil.delay(100); + TestUtil.delay(); TestUtil.waitForJobs(); } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java 2011-03-25 17:25:46 UTC (rev 30039) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java 2011-03-25 18:22:52 UTC (rev 30040) @@ -169,7 +169,7 @@ handlerService .executeCommand(RotateEditorsHandler.COMMAND_ID, null); - TestUtil.delay(500); + TestUtil.delay(); int newVisualOrientation = editPart.getContainer().getOrientation(); String newPrefOrientation = preferences @@ -219,7 +219,7 @@ assertEquals(oldPrefBorderVisibility, oldUiBorderVisibility); handlerService.executeCommand(ShowBorderHandler.COMMAND_ID, null); - TestUtil.delay(500); + TestUtil.delay(); boolean newToogleState = ((Boolean) state.getValue()).booleanValue(); assertEquals(!oldToogleState, newToogleState); @@ -261,7 +261,7 @@ handlerService .executeCommand(ShowNonVisualTagsHandler.COMMAND_ID, null); - TestUtil.delay(500); + TestUtil.delay(); boolean newToogleState = ((Boolean) state.getValue()).booleanValue(); assertEquals(!oldToogleState, newToogleState); @@ -302,7 +302,7 @@ assertEquals(oldPrefBundleAsELVisibility, oldUiBundleAsELVisibility); handlerService.executeCommand(ShowBundleAsELHandler.COMMAND_ID, null); - TestUtil.delay(500); + TestUtil.delay(); boolean newToogleState = ((Boolean) state.getValue()).booleanValue(); assertEquals(!oldToogleState, newToogleState); @@ -344,7 +344,7 @@ handlerService.executeCommand(ShowTextFormattingHandler.COMMAND_ID, null); - TestUtil.delay(500); + TestUtil.delay(); boolean newToogleState = ((Boolean) state.getValue()).booleanValue(); assertEquals(!oldToogleState, newToogleState); @@ -376,7 +376,7 @@ // Open file in the VPE IEditorInput input = new FileEditorInput(fileToOpen); JSPMultiPageEditor multiPageEditor = openEditor(input); - TestUtil.delay(500); + TestUtil.delay(); // Open the 'Visual/Source' tab pageChange(multiPageEditor, 0); return multiPageEditor; @@ -392,7 +392,7 @@ pageChange.setAccessible(true); pageChange.invoke(multiPageEditor, index); multiPageEditor.pageChange(index); - TestUtil.delay(1500); + TestUtil.delay(); } // checks command state