You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/01/04 08:28:53 UTC

[2/2] karaf git commit: Fix JmsTest itest

Fix JmsTest itest


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/09243217
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/09243217
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/09243217

Branch: refs/heads/karaf-2.3.x
Commit: 09243217ab0f9ba570a1818fc673e2128d336469
Parents: f688ca4
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sun Jan 4 08:28:35 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sun Jan 4 08:28:35 2015 +0100

----------------------------------------------------------------------
 .../test/java/org/apache/karaf/itests/JmsTest.java  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/09243217/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/JmsTest.java b/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
index 66ab608..e70a072 100644
--- a/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
@@ -16,9 +16,9 @@ package org.apache.karaf.itests;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-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.ops4j.pax.exam.junit.ExamReactorStrategy;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
@@ -29,15 +29,17 @@ import javax.management.remote.JMXConnector;
 import java.net.URI;
 import java.util.List;
 
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
+@RunWith(JUnit4TestRunner.class)
+@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
 public class JmsTest extends KarafTestSupport {
 
     @Before
     public void installJmsFeatureAndActiveMQBroker() throws Exception {
-        installAndAssertFeature("jms");
+        featuresService.installFeature("jms");
+        assertFeatureInstalled("jms");
         featuresService.addRepository(new URI("mvn:org.apache.activemq/activemq-karaf/5.10.0/xml/features"));
-        installAndAssertFeature("activemq-broker-noweb");
+        featuresService.installFeature("activemq-broker-noweb");
+        assertFeatureInstalled("activemq-broker-noweb");
     }
 
     @Test