You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/10/04 19:43:29 UTC
[2/2] activemq-artemis git commit: ARTEMIS-737 small improvements on
junit tests
ARTEMIS-737 small improvements on junit tests
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/fe24c5e9
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/fe24c5e9
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/fe24c5e9
Branch: refs/heads/master
Commit: fe24c5e9a486c00154e92b7870f87e9b989a6073
Parents: 372fd19
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Sep 29 14:51:05 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Oct 4 15:38:26 2016 -0400
----------------------------------------------------------------------
.../artemis/junit/EmbeddedJMSResource.java | 30 ++++++++++--
.../junit/EmbeddedJMSResourceQueueTest.java | 2 +-
.../activemq/artemis/junit/PlainTest.java | 48 ++++++++++++++++++++
3 files changed, 76 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fe24c5e9/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java
----------------------------------------------------------------------
diff --git a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java
index 539ddee..7d5d3f0 100644
--- a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java
+++ b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java
@@ -46,6 +46,7 @@ import org.apache.activemq.artemis.core.server.BindingQueryResult;
import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
+import org.apache.activemq.artemis.jms.client.DefaultConnectionProperties;
import org.apache.activemq.artemis.jms.server.config.JMSConfiguration;
import org.apache.activemq.artemis.jms.server.config.impl.FileJMSConfiguration;
import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl;
@@ -89,11 +90,34 @@ public class EmbeddedJMSResource extends ExternalResource {
* Create a default EmbeddedJMSResource
*/
public EmbeddedJMSResource() {
- configuration = new ConfigurationImpl().setName(SERVER_NAME).setPersistenceEnabled(false).setSecurityEnabled(false).addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
+ this(false);
+ }
- jmsConfiguration = new JMSConfigurationImpl();
+ /**
+ * Create a default EmbeddedJMSResource
+ */
+ public EmbeddedJMSResource(boolean useNetty) {
+ try {
+ configuration = new ConfigurationImpl().setName(SERVER_NAME).setPersistenceEnabled(false).setSecurityEnabled(false).addAcceptorConfiguration("invm", "vm://0");
- init();
+ if (useNetty) {
+ configuration.addAcceptorConfiguration("netty", DefaultConnectionProperties.DEFAULT_BROKER_BIND_URL);
+ }
+
+ jmsConfiguration = new JMSConfigurationImpl();
+
+ init();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * The acceptor used
+ */
+ public EmbeddedJMSResource addAcceptor(String name, String uri) throws Exception {
+ configuration.addAcceptorConfiguration(name, uri);
+ return this;
}
/**
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fe24c5e9/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceQueueTest.java
----------------------------------------------------------------------
diff --git a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceQueueTest.java b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceQueueTest.java
index bb2bf6b..09051c9 100644
--- a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceQueueTest.java
+++ b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/EmbeddedJMSResourceQueueTest.java
@@ -108,4 +108,4 @@ public class EmbeddedJMSResourceQueueTest {
pushed = jmsServer.pushMessageWithProperties(TEST_DESTINATION_NAME, (Serializable) TEST_BODY, TEST_PROPERTIES);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fe24c5e9/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/PlainTest.java
----------------------------------------------------------------------
diff --git a/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/PlainTest.java b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/PlainTest.java
new file mode 100644
index 0000000..80be184
--- /dev/null
+++ b/artemis-junit/src/test/java/org/apache/activemq/artemis/junit/PlainTest.java
@@ -0,0 +1,48 @@
+/*
+ * 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.artemis.junit;
+
+import javax.jms.Connection;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+
+import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+
+public class PlainTest {
+
+ @Rule
+ public EmbeddedJMSResource server = new EmbeddedJMSResource(true);
+
+ @Test
+ public void testPlain() throws Exception {
+ ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory();
+ Connection connection = cf.createConnection();
+ Session session = connection.createSession();
+ MessageProducer producer = session.createProducer(session.createQueue("queue"));
+ producer.send(session.createTextMessage("hello"));
+ connection.start();
+ MessageConsumer consumer = session.createConsumer(session.createQueue("queue"));
+ Assert.assertNotNull(consumer.receive(5000));
+ connection.close();
+
+ }
+
+}