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

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2009-06-12 12:36:09 -0400 (Fri, 12 Jun 2009)
New Revision: 524

Modified:
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ejb/EjbTestBase.java
Log:
EJB test updated - isEJBDeployed() changed to reflect the change of EJBs' MBean name.

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java	2009-06-12 01:03:52 UTC (rev 523)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/ApplicationTestBaseAS5.java	2009-06-12 16:36:09 UTC (rev 524)
@@ -110,11 +110,15 @@
 
 
 
+	/* EJB */
 	public boolean isEJBDeployed(String ejbJarName) throws RuntimeException
 	{
 		try {
 			//String mBeanName = "jboss.j2ee:module=\""+ejbJarName+"\",service=EjbModule";
-			String mBeanName = "jboss.j2ee:module=\""+ejbJarName+"\",*";
+			//String mBeanName = "jboss.j2ee:module=\""+ejbJarName+"\",*";
+			// 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";
 			return isMBeanStateDeployedByQuery(mBeanName);
 		}
 		catch (Exception e) {
@@ -122,6 +126,7 @@
 		}
 	}
 
+	/* WAR */
 	public boolean isWarDeployed(String warName) throws RuntimeException
 	{
 		if (warName.endsWith(".war")) {
@@ -139,6 +144,7 @@
 		}
 	}
 
+	/* EAR */
 	public boolean isEarDeployed(String earName) throws RuntimeException
 	{
 		try {
@@ -154,6 +160,7 @@
 		}
 	}
 
+	/* RAR */
 	public boolean isRarDeployed(String rarName) throws RuntimeException
         {
                 try {
@@ -170,6 +177,7 @@
         }
 
 
+	/* RAR in EAR */
 	public boolean isRarInEarDeployed(String rarName, String earName) throws RuntimeException
 	{
 		try {

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ejb/EjbTestBase.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ejb/EjbTestBase.java	2009-06-12 01:03:52 UTC (rev 523)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/ejb/EjbTestBase.java	2009-06-12 16:36:09 UTC (rev 524)
@@ -123,7 +123,7 @@
 
 
 			// Use JMX to assert that the EJB components really did deploy successfully
-			assertTrue(isEJBDeployed(DEPLOYABLE_NAME));
+			assertTrue("JMX doesn't report '"+DEPLOYABLE_NAME+"' as deployed.", isEJBDeployed(DEPLOYABLE_NAME));
 
 			// Undeploy the EJB JAR
 			HtmlButtonInput deleteButton = getAppDeleteButton(DEPLOYABLE_NAME);