[jboss-cvs] JBossAS SVN: r98039 - in trunk/system-jmx: src and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Dec 19 22:56:40 EST 2009
Author: bstansberry at jboss.com
Date: 2009-12-19 22:56:40 -0500 (Sat, 19 Dec 2009)
New Revision: 98039
Added:
trunk/system-jmx/src/test/
trunk/system-jmx/src/test/java/
trunk/system-jmx/src/test/java/org/
trunk/system-jmx/src/test/resources/
trunk/system-jmx/src/test/resources/jar1/
trunk/system-jmx/src/test/resources/jar2/
trunk/system-jmx/src/test/resources/org/
Removed:
trunk/system-jmx/src/resources/tests-support/jar1/
trunk/system-jmx/src/resources/tests-support/jar2/
trunk/system-jmx/src/resources/tests/org/
trunk/system-jmx/src/tests/org/
Modified:
trunk/system-jmx/.classpath
trunk/system-jmx/pom.xml
trunk/system-jmx/src/test/java/org/jboss/test/system/controller/integration/support/TestServiceControllerLifecycleCallback.java
trunk/system-jmx/src/test/java/org/jboss/test/system/controller/integration/test/AbstractJMXAnnotationTest.java
trunk/system-jmx/src/test/java/org/jboss/test/system/controller/support/ContainedMBeanService.java
trunk/system-jmx/src/test/java/org/jboss/test/system/controller/support/ContainedMBeanServiceMBean.java
Log:
[JBAS-7566] Get system-jmx module tests working via maven
Modified: trunk/system-jmx/.classpath
===================================================================
--- trunk/system-jmx/.classpath 2009-12-19 23:46:53 UTC (rev 98038)
+++ trunk/system-jmx/.classpath 2009-12-20 03:56:40 UTC (rev 98039)
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="src" path="src/test/java"/>
+ <classpathentry kind="src" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Modified: trunk/system-jmx/pom.xml
===================================================================
--- trunk/system-jmx/pom.xml 2009-12-19 23:46:53 UTC (rev 98038)
+++ trunk/system-jmx/pom.xml 2009-12-20 03:56:40 UTC (rev 98039)
@@ -31,7 +31,15 @@
<descriptorSourceDirectory>src/assembly</descriptorSourceDirectory>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
</plugins>
+
</build>
<dependencies>
<!-- Compile (global dependencies) -->
@@ -104,7 +112,33 @@
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>smoke-tests</id>
+ <activation><activeByDefault>false</activeByDefault></activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>org/jboss/**/*TestCase.java</include>
+ </includes>
+ <skipTests>false</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+ </profiles>
</project>
Copied: trunk/system-jmx/src/test/java/org (from rev 97866, trunk/system-jmx/src/tests/org)
Modified: trunk/system-jmx/src/test/java/org/jboss/test/system/controller/integration/support/TestServiceControllerLifecycleCallback.java
===================================================================
--- trunk/system-jmx/src/tests/org/jboss/test/system/controller/integration/support/TestServiceControllerLifecycleCallback.java 2009-12-15 23:29:17 UTC (rev 97866)
+++ trunk/system-jmx/src/test/java/org/jboss/test/system/controller/integration/support/TestServiceControllerLifecycleCallback.java 2009-12-20 03:56:40 UTC (rev 98039)
@@ -73,13 +73,15 @@
JMX jmx = readJmxAnnotation(context);
ObjectName objectName = createObjectName(context, jmx);
- Class<?> intfClass = null;
+ @SuppressWarnings("unchecked")
+ Class intfClass = null;
boolean registerDirectly = false;
if (jmx != null)
{
intfClass = jmx.exposedInterface();
registerDirectly = jmx.registerDirectly();
}
+ @SuppressWarnings("unchecked")
Object mbean = (registerDirectly ? context.getTarget() : new StandardMBean(context.getTarget(), intfClass));
mbeanServer.registerMBean(mbean, objectName);
try
Modified: trunk/system-jmx/src/test/java/org/jboss/test/system/controller/integration/test/AbstractJMXAnnotationTest.java
===================================================================
--- trunk/system-jmx/src/tests/org/jboss/test/system/controller/integration/test/AbstractJMXAnnotationTest.java 2009-12-15 23:29:17 UTC (rev 97866)
+++ trunk/system-jmx/src/test/java/org/jboss/test/system/controller/integration/test/AbstractJMXAnnotationTest.java 2009-12-20 03:56:40 UTC (rev 98039)
@@ -76,13 +76,22 @@
protected MBeanServer createMBeanServer()
{
- return MBeanServerFactory.createMBeanServer("jboss");
+ MBeanServer result = MBeanServerFactory.createMBeanServer("jboss");
+ MBeanServerLocator.setJBoss(result);
+ return result;
}
public void tearDown() throws Exception
{
- MBeanServerLocator.setJBoss(null);
- MBeanServerFactory.releaseMBeanServer(getServer());
+ try
+ {
+ super.tearDown();
+ }
+ finally
+ {
+ MBeanServerLocator.setJBoss(null);
+ MBeanServerFactory.releaseMBeanServer(getServer());
+ }
}
}
}
\ No newline at end of file
Modified: trunk/system-jmx/src/test/java/org/jboss/test/system/controller/support/ContainedMBeanService.java
===================================================================
--- trunk/system-jmx/src/tests/org/jboss/test/system/controller/support/ContainedMBeanService.java 2009-12-15 23:29:17 UTC (rev 97866)
+++ trunk/system-jmx/src/test/java/org/jboss/test/system/controller/support/ContainedMBeanService.java 2009-12-20 03:56:40 UTC (rev 98039)
@@ -32,7 +32,7 @@
* An mbean that creates and starts mbeans outside of the SARDeployer.
*
* @author Scott.Stark at jboss.org
- * @version $Revision:$
+ * @version $Revision$
*/
public class ContainedMBeanService extends ServiceMBeanSupport
implements ContainedMBeanServiceMBean
Modified: trunk/system-jmx/src/test/java/org/jboss/test/system/controller/support/ContainedMBeanServiceMBean.java
===================================================================
--- trunk/system-jmx/src/tests/org/jboss/test/system/controller/support/ContainedMBeanServiceMBean.java 2009-12-15 23:29:17 UTC (rev 97866)
+++ trunk/system-jmx/src/test/java/org/jboss/test/system/controller/support/ContainedMBeanServiceMBean.java 2009-12-20 03:56:40 UTC (rev 98039)
@@ -30,7 +30,7 @@
* The mbean interface for ContainedMBeanService
*
* @author Scott.Stark at jboss.org
- * @version $Revision:$
+ * @version $Revision$
*/
public interface ContainedMBeanServiceMBean extends ServiceMBean
{
Copied: trunk/system-jmx/src/test/resources/jar1 (from rev 97866, trunk/system-jmx/src/resources/tests-support/jar1)
Copied: trunk/system-jmx/src/test/resources/jar2 (from rev 97866, trunk/system-jmx/src/resources/tests-support/jar2)
Copied: trunk/system-jmx/src/test/resources/org (from rev 97866, trunk/system-jmx/src/resources/tests/org)
More information about the jboss-cvs-commits
mailing list