Author: ozizka(a)redhat.com Date: 2009-05-19 13:15:27 -0400 (Tue, 19 May 2009) New Revision: 446 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.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 17:02:22 UTC (rev 445) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java 2009-05-19 17:15:27 UTC (rev 446) @@ -793,8 +793,8 @@ try { // Wait until the EAR is UP. - ejtt.getNavTree().getNodeByLabel(NAV_EAR).click(); - ejtt.deployment.waitActivelyForDeployment(DeployableTypes.EAR, DEPLOYABLE_NAME, 3000, 15, this); + ejtt.getNavTree().getNodeByLabel(APP_TYPE.getNavTreeLabel()).click(); + ejtt.deployment.waitActivelyForDeployment(DeployableTypes.EAR, DEPLOYABLE_NAME, 3000, 30, this); // Assert that the app is running. page = (HtmlPage)webClient.getPage(testPageUrl); @@ -806,7 +806,7 @@ try { undeployEar(DEPLOYABLE_NAME); }catch( Exception ex ){ - log.error("Caught exception when undeploying: "+ex, ex); + log.error("Caught an exception when undeploying: "+ex, ex); } } 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-19 17:02:22 UTC (rev 445) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-05-19 17:15:27 UTC (rev 446) @@ -20,6 +20,8 @@ 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; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.jboss.jopr.jsfunit.AppConstants; @@ -115,6 +117,11 @@ return client.getContentPage().getEnclosingWindow().getWebClient().getJavaScriptEngine(); } + public int getEmbJoprPort(){ + return ( (HttpServletRequest)FacesContext.getCurrentInstance() + .getExternalContext().getRequest() ).getLocalPort(); + } + /** * @returns JavaScript object, as returned by JavaScriptEngine#execute(). */