Fix for #308856 (Update test suite to JUnit4 - Module jetty-jmx).

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1746 7e9141cc-0065-0410-87d8-b60c137991c4

VERSION.txt

@@ -1,6 +1,7 @@
 jetty-7.1.1-SNAPSHOT
  + 304803 Remove TypeUtil Integer and Long caches
  + 308857 Update test suite to JUnit4 - Module jetty-jndi
+ + 308856 Update test suite to JUnit4 - Module jetty-jmx
 
 jetty-7.1.0 5 May 2010
  + 306353 fixed cross context dispatch to root context.

jetty-jmx/pom.xml

@@ -38,7 +38,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
-          <archive>               
+          <archive>
             <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
           </archive>
         </configuration>
@@ -66,6 +66,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>${junit4-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ObjectMBeanTest.java

@@ -4,51 +4,32 @@
 // All rights reserved. This program and the accompanying materials
 // are made available under the terms of the Eclipse Public License v1.0
 // and Apache License v2.0 which accompanies this distribution.
-// The Eclipse Public License is available at 
+// The Eclipse Public License is available at
 // http://www.eclipse.org/legal/epl-v10.html
 // The Apache License v2.0 is available at
 // http://www.opensource.org/licenses/apache2.0.php
-// You may elect to redistribute this code under either of these licenses. 
+// You may elect to redistribute this code under either of these licenses.
 // ========================================================================
 
 package org.eclipse.jetty.jmx;
 
-
-import junit.framework.TestCase;
-
-import org.eclipse.jetty.server.Server;
-
 import com.acme.Derived;
+import org.eclipse.jetty.server.Server;
+import org.junit.Test;
 
-public class ObjectMBeanTest extends TestCase
+import static org.junit.Assert.assertTrue;
+
+public class ObjectMBeanTest
 {
-    public ObjectMBeanTest(String arg0)
-    {
-        super(arg0);
-    }
-
-    public static void main(String[] args)
-    {
-        junit.textui.TestRunner.run(ObjectMBeanTest.class);
-    }
-
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-    }
-
-    protected void tearDown() throws Exception
-    {
-        super.tearDown();
-    }
-    
+    @Test
     public void testMbeanInfo()
     {
         Derived derived = new Derived();
         ObjectMBean mbean = new ObjectMBean(derived);
         assertTrue(mbean.getMBeanInfo()!=null); // TODO do more than just run it
     }
-    
+
+    @Test
     public void testMbeanFor()
     {
         Derived derived = new Derived();