karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [karaf] branch master updated: [KARAF-6139] Fix JmsTest itest
Date Wed, 06 Feb 2019 17:08:54 GMT
This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 9ed5b69  [KARAF-6139] Fix JmsTest itest
     new 6963899  Merge pull request #759 from jbonofre/KARAF-6139
9ed5b69 is described below

commit 9ed5b6996e7a7791db0c214efa8abb7ccae1f1d2
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
AuthorDate: Wed Feb 6 15:25:06 2019 +0100

    [KARAF-6139] Fix JmsTest itest
---
 .../main/java/org/apache/karaf/itests/KarafTestSupport.java    |  1 -
 itests/test/src/test/java/org/apache/karaf/itests/JmsTest.java | 10 ++++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java b/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java
index d92e0fd..7110abb 100644
--- a/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java
+++ b/itests/common/src/main/java/org/apache/karaf/itests/KarafTestSupport.java
@@ -62,7 +62,6 @@ import org.ops4j.pax.exam.karaf.container.internal.JavaVersionUtil;
 import org.ops4j.pax.exam.karaf.options.KarafDistributionOption;
 import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
 import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
-import org.ops4j.pax.exam.options.extra.EnvironmentOption;
 import org.ops4j.pax.exam.options.extra.VMOption;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/JmsTest.java b/itests/test/src/test/java/org/apache/karaf/itests/JmsTest.java
index 87a27d1..66a279d 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/JmsTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/JmsTest.java
@@ -48,13 +48,15 @@ public class JmsTest extends KarafTestSupport {
                         "mvn:org.apache.karaf.features/enterprise-legacy/" + version + "/xml/features,
" +
                         "mvn:org.apache.karaf.features/standard/" + version + "/xml/features,
" +
                         "mvn:org.apache.activemq/activemq-karaf/" + System.getProperty("activemq.version")
+ "/xml/features"));
-        options.add(editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresBoot",
-        "instance,package,log,ssh,framework,system,eventadmin,feature,shell,management,service,jaas,deployer,diagnostic,wrap,bundle,config,kar,aries-blueprint,shell-compat,activemq-broker-noweb"));
         return options.toArray(new Option[options.size()]);
     }
 
     @Test(timeout = 60000)
     public void testCommands() throws Exception {
+        System.out.println("== Installing ActiveMQ");
+        featureService.installFeature("aries-blueprint");
+        featureService.installFeature("activemq-broker-noweb");
+
         System.out.println("== Installing JMS feature");
         featureService.installFeature("jms");
         featureService.installFeature("pax-jms-activemq");
@@ -100,6 +102,10 @@ public class JmsTest extends KarafTestSupport {
 
     @Test
     public void testMBean() throws Exception {
+        System.out.println("== Installing ActiveMQ");
+        featureService.installFeature("aries-blueprint");
+        featureService.installFeature("activemq-broker-noweb");
+
         System.out.println("== Installing JMS feature");
         featureService.installFeature("jms");
         featureService.installFeature("pax-jms-activemq");


Mime
View raw message