You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2023/09/28 13:26:56 UTC
[qpid-jms] 01/04: QPIDJMS-593: remove superfluous tests, inc joram, to better align with main/2.x
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch 1.x
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
commit 6d253947be5688e6e132b27f104428abf32fc921
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu Sep 28 11:26:17 2023 +0100
QPIDJMS-593: remove superfluous tests, inc joram, to better align with main/2.x
---
pom.xml | 1 -
.../qpid-jms-activemq-tests/pom.xml | 11 --
.../org/apache/qpid/jms/JmsWSConnectionTest.java | 29 ----
.../org/apache/qpid/jms/joram/ActiveMQAdmin.java | 180 ---------------------
.../apache/qpid/jms/joram/JoramConnectionTest.java | 56 -------
.../qpid/jms/joram/JoramJMSXPropertyTest.java | 56 -------
.../qpid/jms/joram/JoramMessageBodyTest.java | 56 -------
.../qpid/jms/joram/JoramMessageDefaultTest.java | 56 -------
.../qpid/jms/joram/JoramMessageHeaderTest.java | 56 -------
.../joram/JoramMessagePropertyConversionTest.java | 56 -------
.../qpid/jms/joram/JoramMessagePropertyTest.java | 56 -------
.../qpid/jms/joram/JoramMessageTypeTest.java | 56 -------
.../qpid/jms/joram/JoramQueueBrowserTest.java | 56 -------
.../qpid/jms/joram/JoramQueueSessionTest.java | 56 -------
.../qpid/jms/joram/JoramSelectorSyntaxTest.java | 56 -------
.../apache/qpid/jms/joram/JoramSelectorTest.java | 56 -------
.../apache/qpid/jms/joram/JoramSessionTest.java | 56 -------
.../qpid/jms/joram/JoramTemporaryQueueTest.java | 56 -------
.../qpid/jms/joram/JoramTemporaryTopicTest.java | 56 -------
.../qpid/jms/joram/JoramTopicConnectionTest.java | 56 -------
.../qpid/jms/joram/JoramTopicSessionTest.java | 56 -------
.../src/test/resources/provider.properties | 20 ---
22 files changed, 1193 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8e898af9..f5d175c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,6 @@
<netty-tcnative-version>2.0.61.Final</netty-tcnative-version>
<activemq-version>5.18.1</activemq-version>
<junit-version>4.13.2</junit-version>
- <fuse-joram-tests-version>1.0</fuse-joram-tests-version>
<jetty-version>9.4.51.v20230217</jetty-version>
<mockito-version>5.4.0</mockito-version>
<hamcrest-version>2.2</hamcrest-version>
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml b/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
index 18e05f53..db89cf44 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
@@ -76,17 +76,6 @@
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.fusesource.joram-jms-tests</groupId>
- <artifactId>joram-jms-tests</artifactId>
- <version>${fuse-joram-tests-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jndi</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-server</artifactId>
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsWSConnectionTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsWSConnectionTest.java
index 7002e26f..61dea42a 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsWSConnectionTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsWSConnectionTest.java
@@ -37,7 +37,6 @@ import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
@@ -112,39 +111,11 @@ public class JmsWSConnectionTest {
}
}
- @Ignore("Broker is not respecting max binary message size")
- @Test(timeout = 30000)
- public void testSendLargeMessageToClientFromAMQP() throws Exception {
- JmsConnectionFactory factory = new JmsConnectionFactory(getConnectionURI());
- JmsConnection connection = (JmsConnection) factory.createConnection();
-
- sendLargeMessageViaAMQP();
-
- try {
- Session session = connection.createSession();
- Queue queue = session.createQueue(getQueueName());
- connection.start();
-
- MessageConsumer consumer = session.createConsumer(queue);
- Message message = consumer.receive(1000);
-
- assertNotNull(message);
- assertTrue(message instanceof BytesMessage);
- } finally {
- connection.close();
- }
- }
-
protected void sendLargeMessageViaOpenWire() throws Exception {
ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost?create=false");
doSendLargeMessageViaOpenWire(factory.createConnection());
}
- protected void sendLargeMessageViaAMQP() throws Exception {
- JmsConnectionFactory factory = new JmsConnectionFactory(getConnectionURI());
- doSendLargeMessageViaOpenWire(factory.createConnection());
- }
-
protected void doSendLargeMessageViaOpenWire(Connection connection) throws Exception {
try {
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/ActiveMQAdmin.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/ActiveMQAdmin.java
deleted file mode 100644
index f745a526..00000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/ActiveMQAdmin.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * 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.qpid.jms.joram;
-
-import java.io.File;
-import java.net.URI;
-import java.util.Hashtable;
-
-import javax.jms.ConnectionFactory;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.TransportConnector;
-import org.apache.qpid.jms.JmsConnectionFactory;
-import org.apache.qpid.jms.JmsQueue;
-import org.apache.qpid.jms.JmsTopic;
-import org.objectweb.jtests.jms.admin.Admin;
-
-/**
- *
- */
-public class ActiveMQAdmin implements Admin {
-
- Context context;
- {
- try {
- // Use the jetty JNDI context since it's mutable.
- final Hashtable<String, String> env = new Hashtable<String, String>();
- env.put("java.naming.factory.initial", "org.eclipse.jetty.jndi.InitialContextFactory");
- env.put("java.naming.factory.url.pkgs", "org.eclipse.jetty.jndi");
- ;
- context = new InitialContext(env);
- } catch (NamingException e) {
- throw new RuntimeException(e);
- }
- }
-
- protected BrokerService createBroker() throws Exception {
- return BrokerFactory.createBroker(
- new URI("broker://()/localhost?persistent=false&useJmx=false&schedulerSupport=false"));
- }
-
- @Override
- public String getName() {
- return getClass().getName();
- }
-
- static BrokerService broker;
- static int port;
-
- @Override
- public void startServer() throws Exception {
- if (broker != null) {
- stopServer();
- }
- if (System.getProperty("basedir") == null) {
- File file = new File(".");
- System.setProperty("basedir", file.getAbsolutePath());
- }
- broker = createBroker();
- TransportConnector connector = broker.addConnector(getConnectorURI());
- broker.start();
- port = connector.getConnectUri().getPort();
- }
-
- protected String getConnectorURI() {
- return "amqp://localhost:0";
- }
-
- @Override
- public void stopServer() throws Exception {
- broker.stop();
- broker = null;
- }
-
- @Override
- public void start() throws Exception {
- }
-
- @Override
- public void stop() throws Exception {
- }
-
- @Override
- public Context createContext() throws NamingException {
- return context;
- }
-
- @Override
- public void createQueue(String name) {
- try {
- context.bind(name, new JmsQueue(name));
- } catch (NamingException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public void createTopic(String name) {
- try {
- context.bind(name, new JmsTopic(name));
- } catch (NamingException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public void deleteQueue(String name) {
- try {
- context.unbind(name);
- } catch (NamingException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public void deleteTopic(String name) {
- try {
- context.unbind(name);
- } catch (NamingException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public void createConnectionFactory(String name) {
- try {
- final ConnectionFactory factory = new JmsConnectionFactory("amqp://localhost:" + port);
- context.bind(name, factory);
- } catch (NamingException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public void deleteConnectionFactory(String name) {
- try {
- context.unbind(name);
- } catch (NamingException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public void createQueueConnectionFactory(String name) {
- createConnectionFactory(name);
- }
-
- @Override
- public void createTopicConnectionFactory(String name) {
- createConnectionFactory(name);
- }
-
- @Override
- public void deleteQueueConnectionFactory(String name) {
- deleteConnectionFactory(name);
- }
-
- @Override
- public void deleteTopicConnectionFactory(String name) {
- deleteConnectionFactory(name);
- }
-}
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramConnectionTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramConnectionTest.java
deleted file mode 100644
index c9c59a4e..00000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramConnectionTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.qpid.jms.joram;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.junit.After;
-import org.junit.Before;
-import org.objectweb.jtests.jms.conform.connection.ConnectionTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Runs the Joram ConnectionTest
- */
-public class JoramConnectionTest extends ConnectionTest {
-
- private final Logger LOG = LoggerFactory.getLogger(getClass());
-
- public JoramConnectionTest(String name) {
- super(name);
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- LOG.info("========== Starting test: " + getName() + " ==========");
- super.setUp();
- }
-
- @After
- @Override
- public void tearDown() throws Exception {
- LOG.info("========== Finsished test: " + getName() + " ==========");
- super.tearDown();
- }
-
- public static Test suite() {
- return new TestSuite(JoramConnectionTest.class);
- }
-}
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramJMSXPropertyTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramJMSXPropertyTest.java
deleted file mode 100644
index 455c89f8..00000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramJMSXPropertyTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.qpid.jms.joram;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.junit.After;
-import org.junit.Before;
-import org.objectweb.jtests.jms.conform.message.properties.JMSXPropertyTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Runs the Joram JMSXPropertyTest
- */
-public class JoramJMSXPropertyTest extends JMSXPropertyTest {
-
- private final Logger LOG = LoggerFactory.getLogger(getClass());
-
- public JoramJMSXPropertyTest(String name) {
- super(name);
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- LOG.info("========== Starting test: " + getName() + " ==========");
- super.setUp();
- }
-
- @After
- @Override
- public void tearDown() throws Exception {
- LOG.info("========== Finsished test: " + getName() + " ==========");
- super.tearDown();
- }
-
- public static Test suite() {
- return new TestSuite(JoramJMSXPropertyTest.class);
- }
-}
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramMessageBodyTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramMessageBodyTest.java
deleted file mode 100644
index e47df56e..00000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramMessageBodyTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.qpid.jms.joram;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.junit.After;
-import org.junit.Before;
-import org.objectweb.jtests.jms.conform.message.MessageBodyTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Runs the Joram JMS MessageBodyTest
- */
-public class JoramMessageBodyTest extends MessageBodyTest {
-
- private final Logger LOG = LoggerFactory.getLogger(getClass());
-
- public JoramMessageBodyTest(String name) {
- super(name);
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- LOG.info("========== Starting test: " + getName() + " ==========");
- super.setUp();
- }
-
- @After
- @Override
- public void tearDown() throws Exception {
- LOG.info("========== Finsished test: " + getName() + " ==========");
- super.tearDown();
- }
-
- public static Test suite() {
- return new TestSuite(JoramMessageBodyTest.class);
- }
-}
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramMessageDefaultTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramMessageDefaultTest.java
deleted file mode 100644
index 3aca0878..00000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramMessageDefaultTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.qpid.jms.joram;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.junit.After;
-import org.junit.Before;
-import org.objectweb.jtests.jms.conform.message.MessageDefaultTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Runs the Joram MessageDefaultTest
- */
-public class JoramMessageDefaultTest extends MessageDefaultTest {
-
- private final Logger LOG = LoggerFactory.getLogger(getClass());
-
- public JoramMessageDefaultTest(String name) {
- super(name);
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- LOG.info("========== Starting test: " + getName() + " ==========");
- super.setUp();
- }
-
- @After
- @Override
- public void tearDown() throws Exception {
- LOG.info("========== Finsished test: " + getName() + " ==========");
- super.tearDown();
- }
-
- public static Test suite() {
- return new TestSuite(JoramMessageDefaultTest.class);
- }
-}
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramMessageHeaderTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramMessageHeaderTest.java
deleted file mode 100644
index 37e951b7..00000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramMessageHeaderTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.qpid.jms.joram;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.junit.After;
-import org.junit.Before;
-import org.objectweb.jtests.jms.conform.message.headers.MessageHeaderTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Runs the Joram MessageHeaderTest
- */
-public class JoramMessageHeaderTest extends MessageHeaderTest {
-
- private final Logger LOG = LoggerFactory.getLogger(getClass());
-
- public JoramMessageHeaderTest(String name) {
- super(name);
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- LOG.info("========== Starting test: " + getName() + " ==========");
- super.setUp();
- }
-
- @After
- @Override
- public void tearDown() throws Exception {
- LOG.info("========== Finsished test: " + getName() + " ==========");
- super.tearDown();
- }
-
- public static Test suite() {
- return new TestSuite(JoramMessageHeaderTest.class);
- }
-}
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramMessagePropertyConversionTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramMessagePropertyConversionTest.java
deleted file mode 100644
index 2d698739..00000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramMessagePropertyConversionTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.qpid.jms.joram;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.junit.After;
-import org.junit.Before;
-import org.objectweb.jtests.jms.conform.message.properties.MessagePropertyConversionTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Runs the Joram MessagePropertyConversionTest
- */
-public class JoramMessagePropertyConversionTest extends MessagePropertyConversionTest {
-
- private final Logger LOG = LoggerFactory.getLogger(getClass());
-
- public JoramMessagePropertyConversionTest(String name) {
- super(name);
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- LOG.info("========== Starting test: " + getName() + " ==========");
- super.setUp();
- }
-
- @After
- @Override
- public void tearDown() throws Exception {
- LOG.info("========== Finsished test: " + getName() + " ==========");
- super.tearDown();
- }
-
- public static Test suite() {
- return new TestSuite(JoramMessagePropertyConversionTest.class);
- }
-}
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramMessagePropertyTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramMessagePropertyTest.java
deleted file mode 100644
index 875cdfd4..00000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramMessagePropertyTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.qpid.jms.joram;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.junit.After;
-import org.junit.Before;
-import org.objectweb.jtests.jms.conform.message.properties.MessagePropertyTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Runs the Joram JoramMessagePropertyTest
- */
-public class JoramMessagePropertyTest extends MessagePropertyTest {
-
- private final Logger LOG = LoggerFactory.getLogger(getClass());
-
- public JoramMessagePropertyTest(String name) {
- super(name);
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- LOG.info("========== Starting test: " + getName() + " ==========");
- super.setUp();
- }
-
- @After
- @Override
- public void tearDown() throws Exception {
- LOG.info("========== Finsished test: " + getName() + " ==========");
- super.tearDown();
- }
-
- public static Test suite() {
- return new TestSuite(JoramMessagePropertyTest.class);
- }
-}
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramMessageTypeTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramMessageTypeTest.java
deleted file mode 100644
index e614253d..00000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramMessageTypeTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.qpid.jms.joram;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.junit.After;
-import org.junit.Before;
-import org.objectweb.jtests.jms.conform.message.MessageTypeTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Runs the Joram MessageTypeTest
- */
-public class JoramMessageTypeTest extends MessageTypeTest {
-
- private final Logger LOG = LoggerFactory.getLogger(getClass());
-
- public JoramMessageTypeTest(String name) {
- super(name);
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- LOG.info("========== Starting test: " + getName() + " ==========");
- super.setUp();
- }
-
- @After
- @Override
- public void tearDown() throws Exception {
- LOG.info("========== Finsished test: " + getName() + " ==========");
- super.tearDown();
- }
-
- public static Test suite() {
- return new TestSuite(JoramMessageTypeTest.class);
- }
-}
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramQueueBrowserTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramQueueBrowserTest.java
deleted file mode 100644
index 01198ffc..00000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramQueueBrowserTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.qpid.jms.joram;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.junit.After;
-import org.junit.Before;
-import org.objectweb.jtests.jms.conform.queue.QueueBrowserTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Runs the Joram QueueBrowserTest
- */
-public class JoramQueueBrowserTest extends QueueBrowserTest {
-
- private final Logger LOG = LoggerFactory.getLogger(getClass());
-
- public JoramQueueBrowserTest(String name) {
- super(name);
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- LOG.info("========== Starting test: " + getName() + " ==========");
- super.setUp();
- }
-
- @After
- @Override
- public void tearDown() throws Exception {
- LOG.info("========== Finsished test: " + getName() + " ==========");
- super.tearDown();
- }
-
- public static Test suite() {
- return new TestSuite(JoramQueueBrowserTest.class);
- }
-}
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramQueueSessionTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramQueueSessionTest.java
deleted file mode 100644
index 1d514511..00000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramQueueSessionTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.qpid.jms.joram;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.junit.After;
-import org.junit.Before;
-import org.objectweb.jtests.jms.conform.session.QueueSessionTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Runs the Joram QueueSessionTest
- */
-public class JoramQueueSessionTest extends QueueSessionTest {
-
- private final Logger LOG = LoggerFactory.getLogger(getClass());
-
- public JoramQueueSessionTest(String name) {
- super(name);
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- LOG.info("========== Starting test: " + getName() + " ==========");
- super.setUp();
- }
-
- @After
- @Override
- public void tearDown() throws Exception {
- LOG.info("========== Finsished test: " + getName() + " ==========");
- super.tearDown();
- }
-
- public static Test suite() {
- return new TestSuite(JoramQueueSessionTest.class);
- }
-}
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramSelectorSyntaxTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramSelectorSyntaxTest.java
deleted file mode 100644
index fe362ff0..00000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramSelectorSyntaxTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.qpid.jms.joram;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.junit.After;
-import org.junit.Before;
-import org.objectweb.jtests.jms.conform.selector.SelectorSyntaxTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Runs the Joram SelectorSyntaxTest
- */
-public class JoramSelectorSyntaxTest extends SelectorSyntaxTest {
-
- private final Logger LOG = LoggerFactory.getLogger(getClass());
-
- public JoramSelectorSyntaxTest(String name) {
- super(name);
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- LOG.info("========== Starting test: " + getName() + " ==========");
- super.setUp();
- }
-
- @After
- @Override
- public void tearDown() throws Exception {
- LOG.info("========== Finsished test: " + getName() + " ==========");
- super.tearDown();
- }
-
- public static Test suite() {
- return new TestSuite(JoramSelectorSyntaxTest.class);
- }
-}
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramSelectorTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramSelectorTest.java
deleted file mode 100644
index 941c8ab7..00000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramSelectorTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.qpid.jms.joram;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.junit.After;
-import org.junit.Before;
-import org.objectweb.jtests.jms.conform.selector.SelectorTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Runs the Joram SelectorTest
- */
-public class JoramSelectorTest extends SelectorTest {
-
- private final Logger LOG = LoggerFactory.getLogger(getClass());
-
- public JoramSelectorTest(String name) {
- super(name);
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- LOG.info("========== Starting test: " + getName() + " ==========");
- super.setUp();
- }
-
- @After
- @Override
- public void tearDown() throws Exception {
- LOG.info("========== Finsished test: " + getName() + " ==========");
- super.tearDown();
- }
-
- public static Test suite() {
- return new TestSuite(JoramSelectorTest.class);
- }
-}
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramSessionTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramSessionTest.java
deleted file mode 100644
index ff95e84b..00000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramSessionTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.qpid.jms.joram;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.junit.After;
-import org.junit.Before;
-import org.objectweb.jtests.jms.conform.session.SessionTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Runs the Joram SessionTest
- */
-public class JoramSessionTest extends SessionTest {
-
- private final Logger LOG = LoggerFactory.getLogger(getClass());
-
- public JoramSessionTest(String name) {
- super(name);
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- LOG.info("========== Starting test: " + getName() + " ==========");
- super.setUp();
- }
-
- @After
- @Override
- public void tearDown() throws Exception {
- LOG.info("========== Finsished test: " + getName() + " ==========");
- super.tearDown();
- }
-
- public static Test suite() {
- return new TestSuite(JoramSessionTest.class);
- }
-}
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramTemporaryQueueTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramTemporaryQueueTest.java
deleted file mode 100644
index ad6672b1..00000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramTemporaryQueueTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.qpid.jms.joram;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.junit.After;
-import org.junit.Before;
-import org.objectweb.jtests.jms.conform.queue.TemporaryQueueTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Runs the Joram TemporaryQueueTest
- */
-public class JoramTemporaryQueueTest extends TemporaryQueueTest {
-
- private final Logger LOG = LoggerFactory.getLogger(getClass());
-
- public JoramTemporaryQueueTest(String name) {
- super(name);
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- LOG.info("========== Starting test: " + getName() + " ==========");
- super.setUp();
- }
-
- @After
- @Override
- public void tearDown() throws Exception {
- LOG.info("========== Finsished test: " + getName() + " ==========");
- super.tearDown();
- }
-
- public static Test suite() {
- return new TestSuite(JoramTemporaryQueueTest.class);
- }
-}
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramTemporaryTopicTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramTemporaryTopicTest.java
deleted file mode 100644
index 9c69870e..00000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramTemporaryTopicTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.qpid.jms.joram;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.junit.After;
-import org.junit.Before;
-import org.objectweb.jtests.jms.conform.topic.TemporaryTopicTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Runs the Joram TemporaryTopicTest
- */
-public class JoramTemporaryTopicTest extends TemporaryTopicTest {
-
- private final Logger LOG = LoggerFactory.getLogger(getClass());
-
- public JoramTemporaryTopicTest(String name) {
- super(name);
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- LOG.info("========== Starting test: " + getName() + " ==========");
- super.setUp();
- }
-
- @After
- @Override
- public void tearDown() throws Exception {
- LOG.info("========== Finsished test: " + getName() + " ==========");
- super.tearDown();
- }
-
- public static Test suite() {
- return new TestSuite(JoramTemporaryTopicTest.class);
- }
-}
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramTopicConnectionTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramTopicConnectionTest.java
deleted file mode 100644
index fef02149..00000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramTopicConnectionTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.qpid.jms.joram;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.junit.After;
-import org.junit.Before;
-import org.objectweb.jtests.jms.conform.connection.TopicConnectionTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Runs the Joram TopicConnectionTest
- */
-public class JoramTopicConnectionTest extends TopicConnectionTest {
-
- private final Logger LOG = LoggerFactory.getLogger(getClass());
-
- public JoramTopicConnectionTest(String name) {
- super(name);
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- LOG.info("========== Starting test: " + getName() + " ==========");
- super.setUp();
- }
-
- @After
- @Override
- public void tearDown() throws Exception {
- LOG.info("========== Finsished test: " + getName() + " ==========");
- super.tearDown();
- }
-
- public static Test suite() {
- return new TestSuite(JoramTopicConnectionTest.class);
- }
-}
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramTopicSessionTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramTopicSessionTest.java
deleted file mode 100644
index 31b04c02..00000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/joram/JoramTopicSessionTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.qpid.jms.joram;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.junit.After;
-import org.junit.Before;
-import org.objectweb.jtests.jms.conform.session.TopicSessionTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Runs the Joram TopicSessionTest
- */
-public class JoramTopicSessionTest extends TopicSessionTest {
-
- private final Logger LOG = LoggerFactory.getLogger(getClass());
-
- public JoramTopicSessionTest(String name) {
- super(name);
- }
-
- @Before
- @Override
- public void setUp() throws Exception {
- LOG.info("========== Starting test: " + getName() + " ==========");
- super.setUp();
- }
-
- @After
- @Override
- public void tearDown() throws Exception {
- LOG.info("========== Finsished test: " + getName() + " ==========");
- super.tearDown();
- }
-
- public static Test suite() {
- return new TestSuite(JoramTopicSessionTest.class);
- }
-}
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/provider.properties b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/provider.properties
deleted file mode 100644
index 33d06f9a..00000000
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/provider.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-## ---------------------------------------------------------------------------
-## 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.
-## ---------------------------------------------------------------------------
-
-# This config file is used by the joram jms tests.
-#
-jms.provider.admin.class=org.apache.qpid.jms.joram.ActiveMQAdmin
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org