EMBJOPR SVN: r454 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations.
by embjopr-commits＠lists.jboss.org
Author: fjuma
Date: 2009-05-20 10:00:24 -0400 (Wed, 20 May 2009)
New Revision: 454
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSSecurityTest.java
Log:
Made a minor modification to the JMS security tests.
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSSecurityTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSSecurityTest.java 2009-05-19 19:44:36 UTC (rev 453)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSSecurityTest.java 2009-05-20 14:00:24 UTC (rev 454)
@@ -141,6 +141,7 @@
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
expectedMetrics.put(ALL_MSG_COUNT, "1");
+ expectedMetrics.put(ALL_SUB_COUNT, "1");
checkDestinationMetrics(jndiName, expectedMetrics, getTopicSummaryMetrics(),
DestinationType.TOPIC);
@@ -290,6 +291,7 @@
Map<String, String> expectedMetrics = new LinkedHashMap<String, String>();
expectedMetrics.put(MSG_COUNT, "1");
+ expectedMetrics.put(CONSUMER_COUNT, "0");
checkDestinationMetrics(jndiName, expectedMetrics, getQueueSummaryMetrics(),
DestinationType.QUEUE);
15 years, 7 months
EMBJOPR SVN: r453 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-05-19 15:44:36 -0400 (Tue, 19 May 2009)
New Revision: 453
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
Log:
Browser selection fixed
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-05-19 19:28:06 UTC (rev 452)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-05-19 19:44:36 UTC (rev 453)
@@ -136,7 +136,7 @@
// Initial JSF request
- WebClientSpec wcSpec = new WebClientSpec("/", BrowserVersion.FIREFOX_3);
+ WebClientSpec wcSpec = new WebClientSpec("/", browser);
// This is temporary because embedded Jopr can't find /js/rhq.js
wcSpec.getWebClient().setThrowExceptionOnFailingStatusCode(true);
15 years, 7 months
EMBJOPR SVN: r452 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5: jmsDestinations and 1 other directory.
by embjopr-commits＠lists.jboss.org
Author: fjuma
Date: 2009-05-19 15:28:06 -0400 (Tue, 19 May 2009)
New Revision: 452
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSTest.java
Log:
Updated the metrics tests for connection factories and JMS destinations so that the metrics on the "Summary" page are now checked as well. (See JOPR-146)
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryTest.java 2009-05-19 18:40:39 UTC (rev 451)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/connfactories/ConnFactoryTest.java 2009-05-19 19:28:06 UTC (rev 452)
@@ -283,9 +283,9 @@
protected ArrayList<String> getConnFactorySummaryMetrics() {
ArrayList<String> connFactorySummaryMetrics = new ArrayList<String>();
- // The metrics we need to check on the summary tab
- // TODO: add the summary page metrics that need to be checked -
- // currently no summary metrics are displayed on the page (EMBJOPR-90)
+ // The metrics that appear on the "Summary" page
+ connFactorySummaryMetrics.add(AVAILABLE_CONNECTION_COUNT);
+ connFactorySummaryMetrics.add(CONNECTION_COUNT);
return connFactorySummaryMetrics;
}
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSTest.java 2009-05-19 18:40:39 UTC (rev 451)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSTest.java 2009-05-19 19:28:06 UTC (rev 452)
@@ -543,9 +543,9 @@
protected ArrayList<String> getTopicSummaryMetrics() {
ArrayList<String> topicSummaryMetrics = new ArrayList<String>();
- // The metrics we need to check on the summary tab
- // TODO: add the summary page metrics that need to be checked -
- // currently no summary metrics are displayed on the page (EMBJOPR-90)
+ // The metrics that appear on the "Summary" page
+ topicSummaryMetrics.add(ALL_MSG_COUNT);
+ topicSummaryMetrics.add(ALL_SUB_COUNT);
return topicSummaryMetrics;
}
@@ -557,9 +557,9 @@
protected ArrayList<String> getQueueSummaryMetrics() {
ArrayList<String> queueSummaryMetrics = new ArrayList<String>();
- // The metrics we need to check on the summary tab
- // TODO: add the summary page metrics that need to be checked -
- // currently no summary metrics are displayed on the page (EMBJOPR-90)
+ // The metrics that appear on the "Summary" page
+ queueSummaryMetrics.add(CONSUMER_COUNT);
+ queueSummaryMetrics.add(MSG_COUNT);
return queueSummaryMetrics;
}
15 years, 7 months
EMBJOPR SVN: r451 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5: jmsDestinations and 1 other directory.
by embjopr-commits＠lists.jboss.org
Author: fjuma
Date: 2009-05-19 14:40:39 -0400 (Tue, 19 May 2009)
New Revision: 451
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java
Log:
Modifying the tests for the "Start" and "Stop" operations for Queues and Topics so we can track JOPR-198.
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java 2009-05-19 18:36:18 UTC (rev 450)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java 2009-05-19 18:40:39 UTC (rev 451)
@@ -132,6 +132,9 @@
public static final String TABLE_CELL_END_DELIM = "</td>";
public static final String TABLE_ROW_DELIM = "<tr>";
public static final String TABLE_ROW_END_DELIM = "</tr>";
+ public static final String STATUS = "Status";
+ public static final String UP = "UP";
+ public static final String DOWN = "DOWN";
// Datasource and Connection Factory properties to check during the "List Statistics" tests
public String[] listStatisticsProps = new String[] { "blocking-timeout-millis", "idle-timeout-minutes",
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java 2009-05-19 18:36:18 UTC (rev 450)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jmsDestinations/JMSOperationsTest.java 2009-05-19 18:40:39 UTC (rev 451)
@@ -37,6 +37,8 @@
import javax.jms.Queue;
import org.jboss.jms.destination.JBossDestination;
import javax.management.ObjectName;
+import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit.ContentTableRow;
+import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit;
/**
* This class contains operations tests for JMS topics and queues.
@@ -1280,6 +1282,26 @@
}
assertEquals(errorMessage, isActiveDestination, inActiveDestinationsList);
+ // Make sure the "Status" of the destination is correctly displayed in
+ // the destinations table (see JOPR-198)
+ String expectedStatus = "";
+
+ // The operation will be "Start" or "Stop"
+ if(operationName.equals(START)) {
+ expectedStatus = UP;
+ } else {
+ expectedStatus = DOWN;
+ }
+
+ clickNavTreeLink(destinationType.getNavLabel());
+
+ ContentTableRow destinationRow = ejtt.getTabMenu().getTabContentBox().
+ findLinkRowInDataTableUsingPagination(jndiName);
+ assertNotNull("Row containing '" + jndiName + "' was not found in the table", destinationRow);
+
+ String actualStatus = destinationRow.getCellTextByColumnName(STATUS);
+ assertEquals("The status of the destination is not correct: ", expectedStatus, actualStatus);
+
// Clean up
disconnect();
deleteDestination(destinationType, jndiName);
@@ -1310,7 +1332,7 @@
assertTrue("Expected empty list but was: '" + shortenedResult + "'",
actualOperationResults.contains(EMPTY_LIST));
}
-
+
// Clean up
disconnect();
deleteDestination(DestinationType.TOPIC, jndiName);
15 years, 7 months
EMBJOPR SVN: r450 - trunk/jsfunit.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-05-19 14:36:18 -0400 (Tue, 19 May 2009)
New Revision: 450
Modified:
trunk/jsfunit/pom.xml
Log:
JSFUNIT POM: Added ${htmlunit.browser} to cargo plugin. Should trigger the usage of IE7.
15 years, 7 months
EMBJOPR SVN: r449 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-05-19 14:26:30 -0400 (Tue, 19 May 2009)
New Revision: 449
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java
Log:
EAR tests updated.
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:40:25 UTC (rev 448)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java 2009-05-19 18:26:30 UTC (rev 449)
@@ -1126,17 +1126,23 @@
// Check that the old app is deployed.
ejtt.deployment.waitActivelyForDeployment(APP_TYPE, DEPLOYABLE_NAME, 3000, 15);
+ // The deployable with different name shouldn't remain deployed.
+ ejtt.sleep(2000); // Give AS some time...
+ assertFalse( ejtt.deployment.isDeployedAccordingToEmbJopr(APP_TYPE, DEPLOYABLE_NAME2, false) );
+
}
finally {
try {
- undeployEar( DEPLOYABLE_NAME );
- }catch( Exception ex ){
- log.error("Caught exception when undeploying: "+ex, ex);
+ // undeployEar( DEPLOYABLE_NAME );
+ ejtt.deployment.undeployViaEmbJopr(APP_TYPE, DEPLOYABLE_NAME);
+ }catch( EmbJoprTestException ex ){
+ log.error("Caught exception when undeploying '"+DEPLOYABLE_NAME+"': "+ex);
}
try {
- undeployEar( DEPLOYABLE_NAME2 );
- }catch( Exception ex ){
- log.error("Caught exception when undeploying: "+ex, ex);
+ //undeployEar( DEPLOYABLE_NAME2 );
+ ejtt.deployment.undeployViaEmbJopr(APP_TYPE, DEPLOYABLE_NAME2);
+ }catch( EmbJoprTestException ex ){
+ log.error("Caught expected exception when undeploying '"+DEPLOYABLE_NAME2+"': "+ex);
}
}
15 years, 7 months
EMBJOPR SVN: r448 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-05-19 13:40:25 -0400 (Tue, 19 May 2009)
New Revision: 448
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java
Log:
EAR tests: testBadEarRedeployment renamed to testEarMalformedDescriptorDeployment().
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:38:29 UTC (rev 447)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java 2009-05-19 17:40:25 UTC (rev 448)
@@ -189,7 +189,7 @@
verify the archive has been deployed successfully.
*/
- public void testBadEarRedeploy() throws IOException, EmbJoprTestException {
+ public void testEarMalformedDescriptorDeployment() throws IOException, EmbJoprTestException {
final String DEPLOYABLE_NAME = EAR_MALFORMED_APP_FILENAME;
15 years, 7 months
EMBJOPR SVN: r447 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)redhat.com
Date: 2009-05-19 13:38:29 -0400 (Tue, 19 May 2009)
New Revision: 447
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java
Log:
EAR tests updated.
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:15:27 UTC (rev 446)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java 2009-05-19 17:38:29 UTC (rev 447)
@@ -189,16 +189,25 @@
verify the archive has been deployed successfully.
*/
- public void testBadEarRedeploy() throws IOException, HtmlElementNotFoundException, ActionNotAvailableException {
+ public void testBadEarRedeploy() throws IOException, EmbJoprTestException {
+ final String DEPLOYABLE_NAME = EAR_MALFORMED_APP_FILENAME;
+
try {
- String earFilePath = System.getProperty(SYSPROP_TESTDATA_DIR) + "/ear/"+EAR_MALFORMED_APP_FILENAME;
- deployEar(earFilePath);
+ String earFilePath = ejtt.getTestDataDir() + "/ear/"+DEPLOYABLE_NAME;
+ //deployEar(earFilePath);
+ ejtt.deployment.deployViaEmbJopr(APP_TYPE, earFilePath);
checkClientAndServerMessages("Failed to create Resource", "Failed to create Resource", true);
+
+ if( ejtt.deployment.isDeployedAccordingToEmbJopr(APP_TYPE, DEPLOYABLE_NAME)){
+ ejtt.deployment.undeployViaEmbJopr(APP_TYPE, DEPLOYABLE_NAME);
+ throw new EmbJoprTestException("An EAR witt malformed descriptor " +
+ "stays deployed after the deployment failed.");
+ }
}
finally {
- undeployEar(BASIC_EAR);
+
}
}
@@ -1049,8 +1058,8 @@
try {
// Deploy the EAR.
- String appFilePath = ejtt.getTestDataDir() + "/"+DeployableTypes.EAR.getDataDir()+"/"+DEPLOYABLE_NAME;
- ejtt.deployment.deployViaEmbJopr( DeployableTypes.EAR, appFilePath );
+ String appFilePath = ejtt.getTestDataDir() + "/"+APP_TYPE.getDataDir()+"/"+DEPLOYABLE_NAME;
+ ejtt.deployment.deployViaEmbJopr( APP_TYPE, appFilePath );
// Check that we get an error message.
assertTrue( "We should get an error message.", server.getFacesMessages().hasNext() );
@@ -1059,14 +1068,15 @@
// Check that the EAR is not listed as deployed.
assertFalse( "The EAR should not be listed as deployed.",
- ejtt.deployment.isDeployedAccordingToEmbJopr(DeployableTypes.EAR, DEPLOYABLE_NAME, false) );
+ ejtt.deployment.isDeployedAccordingToEmbJopr(APP_TYPE, DEPLOYABLE_NAME, false) );
}
finally {
try {
- undeployEar(DEPLOYABLE_NAME);
- }catch( Exception ex ){
- log.error("Caught exception when undeploying: "+ex, ex);
+ //undeployEar(DEPLOYABLE_NAME);
+ ejtt.deployment.undeployViaEmbJopr(APP_TYPE, DEPLOYABLE_NAME);
+ }catch( EmbJoprTestException ex ){
+ log.info("Caught expected exception when undeploying: "+ex);
}
}
15 years, 7 months
EMBJOPR SVN: r446 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: util and 1 other directory.
by embjopr-commits＠lists.jboss.org
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().
*/
15 years, 7 months
EMBJOPR SVN: r445 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5: app/war and 1 other directories.
by embjopr-commits＠lists.jboss.org
Author: ozizka(a)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 {
15 years, 7 months