[embjopr-commits] EMBJOPR SVN: r409 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util.

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2009-05-11 11:48:34 -0400 (Mon, 11 May 2009)
New Revision: 409

Modified:
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
Log:
EJTT - fixed deployViaEmbJoprRepeatedly(), this should make testAppsPagination pass.

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java	2009-05-08 13:23:19 UTC (rev 408)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java	2009-05-11 15:48:34 UTC (rev 409)
@@ -1587,7 +1587,12 @@
 
 
 
-		public void deployViaEmbJoprRepeatedly( final AppConstants.DeployableTypes type, final String filePath )
+		public void deployViaEmbJoprRepeatedly( final AppConstants.DeployableTypes type, final String filePath ) throws IOException, HtmlElementNotFoundException, EmbJoprTestException {
+			deployViaEmbJoprRepeatedly( type, filePath, 5000, 8 );
+		}
+
+
+		public void deployViaEmbJoprRepeatedly( final AppConstants.DeployableTypes type, final String filePath, int interval, int repeats )
 					throws IOException, HtmlElementNotFoundException, EmbJoprTestException
 		{
 
@@ -1622,14 +1627,14 @@
 						*/
 
 						// Check whether the WAR is listed in EmbJopr.
-						log.debug("Looking for listed WAR: "+fileName);
-						boolean listed = deployment.isDeployedAccordingToEmbJopr(DeployableTypes.WAR, fileName, true);
+						log.debug("Looking for listed "+type.name()+": "+fileName);
+						boolean listed = deployment.isDeployedAccordingToEmbJopr(type, fileName, true);
 						if( listed )
 							return true;
 						else
 							return false;
 					}
-				}).dumpPageOnTimeout(currentTest).throwOnTimeout().waitWithTimeout(5000, 8);
+				}).dumpPageOnTimeout(currentTest).throwOnTimeout().waitWithTimeout(interval, repeats);
 
 			}
 			catch( Exception ex ){