[embjopr-commits] EMBJOPR SVN: r655 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: as5/app/war and 1 other directories.
embjopr-commits at lists.jboss.org
embjopr-commits at lists.jboss.org
Sat Aug 8 16:51:57 EDT 2009
Author: ozizka at redhat.com
Date: 2009-08-08 16:51:56 -0400 (Sat, 08 Aug 2009)
New Revision: 655
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as4/WarTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
Log:
* WarTest updated.
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as4/WarTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as4/WarTest.java 2009-08-08 19:48:51 UTC (rev 654)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as4/WarTest.java 2009-08-08 20:51:56 UTC (rev 655)
@@ -28,13 +28,14 @@
import java.util.*;
import junit.framework.Test;
import junit.framework.TestSuite;
-import java.util.Map;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
import javax.servlet.http.HttpServletRequest;
import com.gargoylesoftware.htmlunit.WebClient;
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException;
+import org.jboss.jopr.jsfunit.exceptions.HtmlElementNotFoundException;
import org.jboss.mx.util.MBeanServerLocator;
@@ -56,7 +57,7 @@
return new TestSuite(WarTest.class);
}
- public void testBasicWarDeployment() throws IOException
+ public void XtestBasicWarDeployment() throws IOException, EmbJoprTestException
{
// click the nave tree
HtmlAnchor warLink = getNavTreeLink(NAV_WAR);
@@ -71,6 +72,8 @@
fileInput.setValueAttribute(System.getProperty("jsfunit.testdata") + "/war/hellothere.war");
client.click("createContentForm:addButton");
+ try {
+
// assert that the success message appeared on the client side
assertTrue(client.getPageAsText().contains("hellothere.war created successfully"));
@@ -83,6 +86,8 @@
// Use JMX to assert that the WAR really did deploy successfully
assertTrue(isWarDeployed("hellothere.war"));
+
+
// use HtmlUnit to test the newly deployed war in a new WebClient session
// note that I have full access to the FacesContext and the previous request
HttpServletRequest request =
@@ -92,13 +97,16 @@
HtmlPage page = (HtmlPage)webClient.getPage("http://localhost:" + port + "/hellothere/hello.jsp");
assertTrue(page.asText().contains("HELLO WORLD"));
- // Undeploy the WAR
- HtmlButtonInput deleteButton = getAppDeleteButton("hellothere.war");
- deleteButton.click();
+ }
+ finally {
+ // Undeploy the WAR
+ ejtt.deployment.undeployViaEmbJopr(DeployableTypes.WAR, "hellothere.war");
- // This assert doesn't work. jopr does remove the WAR, but for some
- // reason, JBoss doesn't undeploy the MBeans
- //assertFalse(isWarDeployed("hellothere.war"));
+ // This assert doesn't work. jopr does remove the WAR, but for some
+ // reason, JBoss doesn't undeploy the MBeans
+ //assertFalse(isWarDeployed("hellothere.war"));
+ }
+
}
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-08-08 19:48:51 UTC (rev 654)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java 2009-08-08 20:51:56 UTC (rev 655)
@@ -77,7 +77,7 @@
* deployed. Undeploy the archive.
*
*/
- public void testBasicWarDeployment()
+ public void testBasicWarDeployment()
throws IOException, HtmlElementNotFoundException, ActionNotAvailableException
{
@@ -102,8 +102,10 @@
(HttpServletRequest)FacesContext.getCurrentInstance().getExternalContext().getRequest();
int port = request.getLocalPort();
WebClient webClient = new WebClient();
- HtmlPage page = (HtmlPage)webClient.getPage("http://localhost:" + port + "/hellothere/hello.jsp");
- assertTrue(page.asText().contains("HELLO WORLD"));
+ final String testPageUrl = "http://localhost:" + port + "/hellothere/hello.jsp";
+ HtmlPage page = (HtmlPage)webClient.getPage(testPageUrl);
+ assertTrue( "Test page '"+testPageUrl+"' should contain 'HELLO WORLD'. Instead, it is: "+page.asText(),
+ page.asText().contains("HELLO WORLD"));
}
finally {
@@ -121,7 +123,7 @@
<virtual-host>snert.home.bsd.de</virtual-host>
</jboss-web>
*/
- public void testWarWithVirtualHosts()
+ public void XtestWarWithVirtualHosts()
throws IOException, EmbJoprTestException
{
@@ -243,7 +245,7 @@
* Tries to deploy a invalid WAR (with invalid descriptor)
* and checks that EmbJopr rejects this deployment.
*/
- public void testBadWarRedeploy() throws IOException, EmbJoprTestException {
+ public void XtestBadWarRedeploy() throws IOException, EmbJoprTestException {
final String DEPLOYABLE_NAME = AppConstants.WAR_FILENAME_MALFORMED_APP;
@@ -272,7 +274,7 @@
* Various ways to navigate to a WAR application:
* Nav tree, apps listing, WARs listing.
*/
- public void testNavigationToWar() throws IOException, HtmlElementNotFoundException, ActionOutOfSyncException, ActionNotAvailableException, EmbJoprTestException, InterruptedException, ActionOutOfSyncException
+ public void XtestNavigationToWar() throws IOException, HtmlElementNotFoundException, ActionOutOfSyncException, ActionNotAvailableException, EmbJoprTestException, InterruptedException, ActionOutOfSyncException
{
// JBossAS Servers node
@@ -415,7 +417,7 @@
*
* Was failing because of: EMBJOPR-110 (missing / at the beginning of the path)
*/
- public void testWarSummaryTab() throws EmbJoprTestException, IOException, Exception {
+ public void XtestWarSummaryTab() throws EmbJoprTestException, IOException, Exception {
final int DEPLOY_TIMEOUT_SEC = 120;
@@ -640,7 +642,7 @@
* Was failing because of: EMBJOPR-109
* FAILS: EMBJOPR-172
*/
- public void testWarRedeployment() throws IOException, EmbJoprTestException {
+ public void XtestWarRedeployment() throws IOException, EmbJoprTestException {
final String DEPLOYABLE_NAME = BASIC_WAR_06;
@@ -684,7 +686,7 @@
*
* Fails because of EMBJOPR-125
*/
- public void testWarDeployUndeployDeploy() throws IOException, EmbJoprTestException {
+ public void XtestWarDeployUndeployDeploy() throws IOException, EmbJoprTestException {
final String DEPLOYABLE_NAME = BASIC_WAR_DUD;
@@ -728,7 +730,7 @@
* Deploys the WAR, undeploys it and deploys again.
* All these actions are done using EmbJopr.
*/
- public void testWarDeployUndeployDeployRetryOnErrors() throws IOException, EmbJoprTestException {
+ public void XtestWarDeployUndeployDeployRetryOnErrors() throws IOException, EmbJoprTestException {
final String DEPLOYABLE_NAME = BASIC_WAR_DUD_RETRY;
@@ -812,7 +814,7 @@
*
* FAILS because of: EMBJOPR-110 (missing / at the beginning of the path)
*/
- public void testWarMetricsTab() throws IOException, EmbJoprTestException {
+ public void XtestWarMetricsTab() throws IOException, EmbJoprTestException {
final String DEPLOYABLE_NAME = BASIC_WAR_08;
@@ -857,7 +859,7 @@
*
* FAILS because some of the values are read-only. EMBJOPR-96
*/
- public void testWarMetricsTabRefreshButton() throws IOException, EmbJoprTestException, HtmlElementNotFoundException, Exception {
+ public void XtestWarMetricsTabRefreshButton() throws IOException, EmbJoprTestException, HtmlElementNotFoundException, Exception {
final String DEPLOYABLE_NAME = BASIC_WAR_09;
@@ -917,7 +919,7 @@
* Should we wait more? Or is it caused by failures of some previous tests?
*
*/
- public void testDeployUnpackedWar() throws IOException, EmbJoprTestException {
+ public void XtestDeployUnpackedWar() throws IOException, EmbJoprTestException {
// Deploy the unpacked WAR.
@@ -967,7 +969,7 @@
* Stops and starts the WAR using buttons in the Control tab, and checks
* whether it's really stopped and started by sending HTTP requests.
*/
- public void testStopAndStartWar() throws IOException, EmbJoprTestException
+ public void XtestStopAndStartWar() throws IOException, EmbJoprTestException
{
final String DEPLOYABLE_NAME = BASIC_WAR_STOPSTART;
@@ -1063,7 +1065,7 @@
*
* FAILS: EMBJOPR-172
*/
- public void testRestartWar() throws IOException, EmbJoprTestException
+ public void XtestRestartWar() throws IOException, EmbJoprTestException
{
final String DEPLOYABLE_NAME = BASIC_WAR_RESTART;
@@ -1148,7 +1150,7 @@
* Deploys a WAR with bad farchive extension (.zip)
* and checks whether EmbJopr reports deployment failure.
*/
- public void testDeployWarWithIncorrectExtension() throws IOException, EmbJoprTestException
+ public void XtestDeployWarWithIncorrectExtension() throws IOException, EmbJoprTestException
{
final String DEPLOYABLE_NAME = WAR_UNPACKED_ZIP;
@@ -1183,7 +1185,7 @@
/**
* Deploys a WAR and checks that it doesn't appear under the Embedded Web App's node.
*/
- public void testStandaloneWarDoesntAppearInEmbeddedWars() throws IOException, EmbJoprTestException
+ public void XtestStandaloneWarDoesntAppearInEmbeddedWars() throws IOException, EmbJoprTestException
{
final String DEPLOYABLE_NAME = BASIC_WAR_10;
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-08-08 19:48:51 UTC (rev 654)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-08-08 20:51:56 UTC (rev 655)
@@ -2390,7 +2390,7 @@
)
throws EmbJoprTestException, IOException
{
- waitActivelyForDeployment(type, name, intervalMS, retries, null);
+ waitActivelyForDeployment(type, name, intervalMS, retries, currentTest);
}
/**
More information about the embjopr-commits
mailing list