You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ke...@apache.org on 2014/04/08 10:51:46 UTC
git commit: Fix for AMQ-5135,
added amqp karaf verification via roundtrip test
Repository: activemq
Updated Branches:
refs/heads/trunk 307005ab4 -> 2eaf675c7
Fix for AMQ-5135, added amqp karaf verification via roundtrip test
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/2eaf675c
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/2eaf675c
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/2eaf675c
Branch: refs/heads/trunk
Commit: 2eaf675c73d233f842d88a4e59d86ddfc9c6c75e
Parents: 307005a
Author: Kevin Earls <ke...@kevinearls.com>
Authored: Tue Apr 8 10:51:37 2014 +0200
Committer: Kevin Earls <ke...@kevinearls.com>
Committed: Tue Apr 8 10:51:37 2014 +0200
----------------------------------------------------------------------
activemq-karaf-itest/pom.xml | 11 ++++
.../karaf/itest/AbstractJmsFeatureTest.java | 17 ++++--
.../itest/ActiveMQAMQPBrokerFeatureTest.java | 62 ++++++++++++++++++++
3 files changed, 84 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/2eaf675c/activemq-karaf-itest/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml
index 5cfc35b..a7008c6 100644
--- a/activemq-karaf-itest/pom.xml
+++ b/activemq-karaf-itest/pom.xml
@@ -147,6 +147,17 @@
<version>${org.osgi.core-version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>proton-jms</artifactId>
+ <version>${qpid-proton-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.qpid</groupId>
+ <artifactId>qpid-amqp-1-0-client-jms</artifactId>
+ <version>${qpid-jms-version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.camel.karaf</groupId>
http://git-wip-us.apache.org/repos/asf/activemq/blob/2eaf675c/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractJmsFeatureTest.java
----------------------------------------------------------------------
diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractJmsFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractJmsFeatureTest.java
index 5fa3616..9e38e86 100644
--- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractJmsFeatureTest.java
+++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractJmsFeatureTest.java
@@ -22,6 +22,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.channels.FileChannel;
import javax.jms.Connection;
+import javax.jms.JMSException;
import javax.jms.MessageConsumer;
import javax.jms.Session;
import javax.jms.TextMessage;
@@ -50,9 +51,7 @@ public abstract class AbstractJmsFeatureTest extends AbstractFeatureTest {
}
protected String consumeMessage(String nameAndPayload) throws Exception {
- ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory();
- Connection connection = factory.createConnection(AbstractFeatureTest.USER, AbstractFeatureTest.PASSWORD);
- connection.start();
+ Connection connection = getConnection();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageConsumer consumer = session.createConsumer(session.createQueue(nameAndPayload));
TextMessage message = (TextMessage) consumer.receive(10000);
@@ -62,11 +61,17 @@ public abstract class AbstractJmsFeatureTest extends AbstractFeatureTest {
}
protected void produceMessage(String nameAndPayload) throws Exception {
- ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory();
- Connection connection = factory.createConnection(AbstractFeatureTest.USER, AbstractFeatureTest.PASSWORD);
- connection.start();
+ Connection connection = getConnection();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
session.createProducer(session.createQueue(nameAndPayload)).send(session.createTextMessage(nameAndPayload));
connection.close();
}
+
+ protected Connection getConnection() throws JMSException {
+ ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory();
+ Connection connection = factory.createConnection(AbstractFeatureTest.USER, AbstractFeatureTest.PASSWORD);
+ connection.start();
+
+ return connection;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq/blob/2eaf675c/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java
----------------------------------------------------------------------
diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java
new file mode 100644
index 0000000..9dc2328
--- /dev/null
+++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQAMQPBrokerFeatureTest.java
@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.karaf.itest;
+
+import org.apache.qpid.amqp_1_0.jms.impl.ConnectionFactoryImpl;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.CoreOptions;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+
+@RunWith(JUnit4TestRunner.class)
+public class ActiveMQAMQPBrokerFeatureTest extends ActiveMQBrokerFeatureTest {
+ private static final Integer AMQP_PORT = 61636;
+
+ @Configuration
+ public static Option[] configure() {
+ Option[] activeMQOptions = configure("activemq");
+
+ MavenArtifactProvisionOption qpidClient = CoreOptions.mavenBundle("org.apache.qpid", "qpid-amqp-1-0-client").versionAsInProject();
+ MavenArtifactProvisionOption qpidClientJms = CoreOptions.mavenBundle("org.apache.qpid", "qpid-amqp-1-0-client-jms").versionAsInProject();
+ MavenArtifactProvisionOption qpidCommon = CoreOptions.mavenBundle("org.apache.qpid", "qpid-amqp-1-0-common").versionAsInProject();
+ MavenArtifactProvisionOption geronimoJms = CoreOptions.mavenBundle("org.apache.geronimo.specs", "geronimo-jms_1.1_spec").versionAsInProject();
+ MavenArtifactProvisionOption geronimoJta = CoreOptions.mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec","1.1.1");
+
+ Option[] options = append(qpidClient, activeMQOptions);
+ options = append(qpidClientJms, options);
+ options = append(qpidCommon, options);
+ options = append(geronimoJms, options);
+ options = append(geronimoJta, options);
+
+ Option[] configuredOptions = configureBrokerStart(options);
+ return configuredOptions;
+ }
+
+ @Override
+ protected Connection getConnection() throws JMSException {
+ ConnectionFactoryImpl factory = new ConnectionFactoryImpl("localhost", AMQP_PORT, AbstractFeatureTest.USER, AbstractFeatureTest.PASSWORD);
+ Connection connection = factory.createConnection();
+ connection.start();
+
+ return connection;
+ }
+}