Author: ozizka(a)redhat.com
Date: 2009-07-28 12:45:23 -0400 (Tue, 28 Jul 2009)
New Revision: 602
Modified:
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java
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
Log:
* EarTest updated - JMX names changed.
Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java
===================================================================
---
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java 2009-07-28
16:23:01 UTC (rev 601)
+++
trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java 2009-07-28
16:45:23 UTC (rev 602)
@@ -119,10 +119,16 @@
{
try {
//String mBeanName =
"jboss.j2ee:module=\""+ejbJarName+"\",service=EjbModule";
- //String mBeanName =
"jboss.j2ee:module=\""+ejbJarName+"\",*";
+
+ // jboss.j2ee:module="sessiona.jar",service=EjbModule
+ String mBeanName =
"jboss.j2ee:module=\""+ejbJarName+"\",*";
+ //
id="jboss.j2ee:module="sessiona.jar",service=EjbModule",type=Component
+ //String mBeanName =
"jboss.deployment:id="jboss.j2ee:module="sessiona.jar",service=EjbModule",type=Component";
+ //
// rajesh: ozizka, seems to have changed between AS 5.1.Beta1 and CR1. so the test
cases should be updated i guess.
// ear=BasicEJB3.jar,jar=BasicEJB3.jar,service=EJB3
- String mBeanName =
"jboss.j2ee:ear="+ejbJarName+",jar="+ejbJarName+",service=EJB3";
+ //String mBeanName =
"jboss.j2ee:ear="+ejbJarName+",jar="+ejbJarName+",service=EJB3";
+
return isMBeanStateDeployedByQuery(mBeanName);
}
catch (Exception e) {
@@ -151,6 +157,7 @@
/* EAR */
public boolean isEarDeployed(String earName) throws RuntimeException
{
+
//jboss.deployment:id="vfszip:/home/brq/.../jboss-5.0.0.Beta/server/all/deploy/JBossCacheTest-by-fdrabek.ear/",type=Deployment
try {
//String query = "jboss.deployment:id=\"vfszip:" +
// System.getProperty("jsfunit.deploy.dir") + "/" + earName +
"/\",*";
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-07-28
16:23:01 UTC (rev 601)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ear/EarTest.java 2009-07-28
16:45:23 UTC (rev 602)
@@ -108,9 +108,13 @@
checkClientAndServerMessages(expectedMessage, expectedMessage, false);
// Use JMX to assert that the EAR components really did deploy successfully.
- //id="vfszip:/home/brq/ozizka/JoprEmbedded/jboss-as-5.x/build/output/jboss-5.1.0.Beta1/server/default/deploy/eardeployment.ear/",type=Deployment
- //id="vfszip:/home/ondra/work/JOPRembedded/embjopr-svn-trunk/jsfunit/target/jboss5x/deploy/eardeployment.ear",*
not found.
+
+ //
id="vfszip:/home/brq/ozizka/JoprEmbedded/jboss-as-5.x/build/output/jboss-5.1.0.Beta1/server/default/deploy/eardeployment.ear/",type=Deployment
+ //
id="vfszip:/home/ondra/work/JOPRembedded/embjopr-svn-trunk/jsfunit/target/jboss5x/deploy/eardeployment.ear",*
not found.
assertTrue("JMX doesn't report EAR as deployed: eardeployment.ear",
isEarDeployed(DEPLOYABLE_NAME));
+ //assertTrue("JMX doesn't report EAR as deployed: eardeployment.ear",
ejtt.deployment.isDeployedAccordingToJMX(APP_TYPE, DEPLOYABLE_NAME) );
+
+ //
id="jboss.j2ee:module="sessiona.jar",service=EjbModule",type=Component
assertTrue("JMX doesn't report EJB sessiona.jar as deployed.",
isEJBDeployed("sessiona.jar"));
assertTrue("JMX doesn't report EJB sessionb.jar as deployed.",
isEJBDeployed("sessionb.jar"));
}
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-07-28
16:23:01 UTC (rev 601)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java 2009-07-28
16:45:23 UTC (rev 602)
@@ -742,14 +742,12 @@
// Undeploy.
log.info("Undeploying "+DEPLOYABLE_NAME);
undeployWAR(DEPLOYABLE_NAME); // EMBJOPR-109 here
- DebugUtils.writeFile("target/DUD_RETRY-undeploy.html",
client.getPageAsText());///
assertFalse( "Deployable "+DEPLOYABLE_NAME+" shouldn't be listed as
deployed after undeployment.",
ejtt.deployment.isDeployedAccordingToEmbJopr(DeployableTypes.WAR, DEPLOYABLE_NAME,
false) );
// Deploy the same war again.
log.info("Deploying "+DEPLOYABLE_NAME+" again.");
deployWarRepeatedly( appFilePath );
- DebugUtils.writeFile("target/DUD_RETRY-deploy.html",
client.getPageAsText());///
assertTrue( "Deployable "+DEPLOYABLE_NAME+" should be listed as
deployed after deployment.",
ejtt.deployment.isDeployedAccordingToEmbJopr(DeployableTypes.WAR, DEPLOYABLE_NAME,
false) );