[embjopr-commits] EMBJOPR SVN: r558 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: as5 and 3 other directories.

[embjopr-commits at lists.jboss.org]

Author: ozizka at redhat.com
Date: 2009-07-14 15:44:29 -0400 (Tue, 14 Jul 2009)
New Revision: 558

Added:
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/hbn/
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/hbn/HibernateTest.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTest.java
Modified:
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java
   trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java
Log:
 * Ejb tests updated.
 * Hibernate and JBoss Cache test stubs created.

Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java	2009-07-14 19:33:13 UTC (rev 557)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java	2009-07-14 19:44:29 UTC (rev 558)
@@ -61,13 +61,17 @@
 
 			static{
 				EJB2.jmxMBeanNameFormat = "jboss.j2ee:module=\"%s\",service=EjbModule";
-				EJB3.jmxMBeanNameFormat = "jboss.j2ee:ear=%1s,jar=%1s,service=EJB3";
+				EJB3.jmxMBeanNameFormat = "jboss.j2ee:ear=%1$s,jar=%1$s,service=EJB3";
 			}
 
 			private String jmxMBeanNameFormat;
 			private void setJmxMBeanNameFormat( String name ){ this.jmxMBeanNameFormat = name; }
 			public String getJmxMBeanNameFormat(){ return this.jmxMBeanNameFormat; }
-			public String formatJmxMBeanName( String deployableName ){ return String.format(this.jmxMBeanNameFormat, deployableName); }
+			public String formatJmxMBeanName( String deployableName ){
+				if( null == this.jmxMBeanNameFormat )
+					throw new UnsupportedOperationException("JMX name for "+this.toString()+" is not filled (yet).");
+				return String.format(this.jmxMBeanNameFormat, deployableName);
+			}
 
 
 

Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/hbn/HibernateTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/hbn/HibernateTest.java	                        (rev 0)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/hbn/HibernateTest.java	2009-07-14 19:44:29 UTC (rev 558)
@@ -0,0 +1,37 @@
+package org.jboss.jopr.jsfunit.as5.hbn;
+
+import java.io.IOException;
+import org.jboss.jopr.jsfunit.ApplicationTestBaseAS5;
+import org.jboss.jopr.jsfunit.exceptions.HtmlElementNotFoundException;
+
+/**
+ *
+ * @author Ondrej Zizka
+ * 
+ * TODO: Implement when Hbn support comes to EmbJopr.
+ */
+public class HibernateTest extends ApplicationTestBaseAS5 {
+
+	
+	public final DeployableTypes APP_TYPE = DeployableTypes.HBN;
+
+
+
+	public void testHibernateSummary() throws HtmlElementNotFoundException {
+		fail("Hibernate not present yet.");
+
+		ejtt.navTree.getNodeByLabel(APP_TYPE.getNavTreeLabel());
+	}
+
+
+
+	public void testHibernateMetrics() throws HtmlElementNotFoundException, IOException {
+		fail("Hibernate not present yet.");
+
+		ejtt.navTree.getNodeByLabel(APP_TYPE.getNavTreeLabel());
+
+		ejtt.tabMenu.clickMetricsTab();
+
+	}
+
+}// class

Added: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTest.java
===================================================================
--- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTest.java	                        (rev 0)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTest.java	2009-07-14 19:44:29 UTC (rev 558)
@@ -0,0 +1,37 @@
+package org.jboss.jopr.jsfunit.as5.jbcache;
+
+import java.io.IOException;
+import org.jboss.jopr.jsfunit.ApplicationTestBaseAS5;
+import org.jboss.jopr.jsfunit.exceptions.HtmlElementNotFoundException;
+
+/**
+ *
+ * @author Ondrej Zizka
+ * 
+ * TODO: Implement when JBoss Cache support comes to EmbJopr.
+ */
+public class JBossCacheTest extends ApplicationTestBaseAS5 {
+
+	
+	public final DeployableTypes APP_TYPE = DeployableTypes.JBCACHE;
+
+
+	
+	public void testHibernateSummary() throws HtmlElementNotFoundException {
+		fail("JBoss Cache not present yet.");
+
+		ejtt.navTree.getNodeByLabel(APP_TYPE.getNavTreeLabel());
+	}
+
+
+	
+	public void testHibernateMetrics() throws HtmlElementNotFoundException, IOException {
+		fail("JBoss Cache not present yet.");
+
+		ejtt.navTree.getNodeByLabel(APP_TYPE.getNavTreeLabel());
+
+		ejtt.tabMenu.clickMetricsTab();
+
+	}
+
+}// class

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-07-14 19:33:13 UTC (rev 557)
+++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java	2009-07-14 19:44:29 UTC (rev 558)
@@ -1723,10 +1723,7 @@
 						throws EmbJoprTestException, IOException
 		{
 			// Get the MBean name.
-			String mBeanNameFormat = type.getJmxMBeanNameFormat();
-			if( null == mBeanNameFormat )
-				throw new UnsupportedOperationException("JMX name for this filled yet.");
-			String mBeanName = String.format( mBeanNameFormat, deployableName );
+			String mBeanName = type.formatJmxMBeanName(deployableName);
 
 
 			// Check whether the mBean is deployed.