[embjopr-commits] EMBJOPR SVN: r445 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5: app/war and 1 other directories.

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2009-05-19 13:02:22 -0400 (Tue, 19 May 2009)
New Revision: 445

Modified:
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/embwar/EmbWarTest.java
Log:
Apps tests timeouts extended.

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java	2009-05-19 15:31:44 UTC (rev 444)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java	2009-05-19 17:02:22 UTC (rev 445)
@@ -30,8 +30,6 @@
 import com.gargoylesoftware.htmlunit.html.*;
 import java.io.*;
 import java.util.*;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
 import javax.faces.application.FacesMessage;
 import javax.faces.context.FacesContext;
 import javax.servlet.http.HttpServletRequest;
@@ -43,8 +41,6 @@
 import org.apache.commons.lang.math.RandomUtils;
 import org.jboss.jopr.jsfunit.AppConstants.DeployableTypes;
 import org.jboss.jopr.jsfunit.exceptions.*;
-import org.jboss.jopr.jsfunit.util.Condition;
-import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit;
 import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit.*;
 import org.w3c.dom.Node;
 
@@ -745,7 +741,7 @@
 		try {
 				// Loop, wait for the app to appear.
 				log.info("Waiting for EAR to appear.");
-				ejtt.deployment.waitActivelyForDeployment( DeployableTypes.EAR, EAR_UNPACKED, 5000, 24, this);
+				ejtt.deployment.waitActivelyForDeployment( DeployableTypes.EAR, EAR_UNPACKED, 5000, 35, this);
 
 
 				ejtt.getNavTree().getNodeByLabel(NAV_EAR).click();

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java	2009-05-19 15:31:44 UTC (rev 444)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java	2009-05-19 17:02:22 UTC (rev 445)
@@ -137,7 +137,11 @@
 			checkClientAndServerMessages("Failed to create Resource", "Failed to create Resource", true);
 		}
 		finally {
-			undeployWAR(DEPLOYABLE_NAME);
+			try {
+				undeployWAR(DEPLOYABLE_NAME);
+			} catch (Exception ex) {
+				log.info("Caught expected exception during undeploy: "+ex);
+			}
 		}
 	}
 
@@ -1107,10 +1111,12 @@
 				FileUtils.copyFile( new File(fileSrcPath), new File(fileDestPath) );
 			}
 
+			ejtt.sleep(10000); // Wait for 10 sec - let AS crunch up the deployment.
+
 			// Wait for them to get displayed and UP.
 			for (int i = 0; i < APP_COPIES; i++) {
 				String deployableName = String.format(fileNamePattern, i);
-				ejtt.deployment.waitActivelyForDeployment(APP_TYPE, deployableName, 5000, 10);
+				ejtt.deployment.waitActivelyForDeployment(APP_TYPE, deployableName, 5000, 30);
 			}
 
 		}

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/embwar/EmbWarTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/embwar/EmbWarTest.java	2009-05-19 15:31:44 UTC (rev 444)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/embwar/EmbWarTest.java	2009-05-19 17:02:22 UTC (rev 445)
@@ -45,7 +45,7 @@
 			if( null == embWarLink )
 				throw new EmbJoprTestException("Embedded WAR '"+EAR_WITH_WAR_EMB__WAR_NAME+"' not listed.");
 
-			ejtt.deployment.waitActivelyForDeployment(APP_TYPE, EAR_WITH_WAR_EMB__WAR_NAME, 5000, 12);
+			ejtt.deployment.waitActivelyForDeployment(APP_TYPE, EAR_WITH_WAR_EMB__WAR_NAME, 5000, 30);
 
 		}
 		finally {