[jbosstools-commits] JBoss Tools SVN: r17461 - trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test.

[jbosstools-commits at lists.jboss.org]

Author: mareshkau
Date: 2009-09-04 10:20:37 -0400 (Fri, 04 Sep 2009)
New Revision: 17461

Modified:
   trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
Log:
fixing errors in junit tests

Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java	2009-09-04 14:11:32 UTC (rev 17460)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java	2009-09-04 14:20:37 UTC (rev 17461)
@@ -180,10 +180,8 @@
 		controller.getVisualBuilder().setShowInvisibleTags(true);
 		controller.visualRefresh();
 
-		TestUtil.waitForIdle();
-
 		// find visual element and check if it is not null
-		visualElement = findElementById(controller, elementId);
+		visualElement = findElementById(controller, elementId,TestUtil.MAX_IDLE);
 		assertNotNull(visualElement);
 
 		// generate text for invisible tag
@@ -312,8 +310,29 @@
 	 * 
 	 * @param controller
 	 * @param elementId
+	 * @param idle try element for some time period, for example when we need
+	 * to wait for refresh job
 	 * @return
 	 */
+	protected nsIDOMElement findElementById(VpeController controller,
+			String elementId, long idle) {
+		long start = System.currentTimeMillis();
+		nsIDOMElement result = null;
+		while (result==null) {
+			result = findElementById(controller, elementId);
+			TestUtil.delay(50);
+			if (result==null && ((System.currentTimeMillis()-start) > idle) ) 
+				throw new RuntimeException("A long running task detected"); //$NON-NLS-1$
+		}
+		return result;
+	}	
+	/**
+	 * find visual element by "id" entered in source part of vpe
+	 * 
+	 * @param controller
+	 * @param elementId
+	 * @return
+	 */
 	protected nsIDOMNode findNode(VpeController controller, Node node) {
 
 		VpeNodeMapping nodeMapping = controller.getDomMapping().getNodeMapping(