Author: jbonofre
Date: Sun Jun 8 06:31:54 2014
New Revision: 1601198
URL: http://svn.apache.org/r1601198
Log:
Merge branch 'ARIES-1006' into trunk
Modified:
aries/trunk/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java
Modified:
aries/trunk/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java?rev=1601198&r1=1601197&r2=1601198&view=diff
==============================================================================
---
aries/trunk/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java
(original)
+++
aries/trunk/jmx/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/MBeanTest.java
Sun Jun 8 06:31:54 2014
@@ -31,13 +31,16 @@ import org.apache.aries.jmx.whiteboard.i
import org.apache.aries.jmx.whiteboard.integration.helper2.TestClass2;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.osgi.framework.ServiceRegistration;
/**
* The <code>MBeanTest</code> tests MBean registration with MBean Servers
*/
-@RunWith(JUnit4TestRunner.class)
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
public class MBeanTest extends IntegrationTestBase {
@Test
