Clean up Joram test classes and enable all tests now using new client.
This commit is contained in:
Timothy Bish 2015-03-24 13:29:24 -04:00
parent 197dcb162e
commit cdb60d74b8
4 changed files with 55 additions and 45 deletions

View File

@ -42,19 +42,19 @@ import org.objectweb.jtests.jms.conform.selector.SelectorSyntaxTest;
import org.objectweb.jtests.jms.conform.selector.SelectorTest;
import org.objectweb.jtests.jms.conform.session.QueueSessionTest;
import org.objectweb.jtests.jms.conform.session.SessionTest;
import org.objectweb.jtests.jms.conform.session.TopicSessionTest;
import org.objectweb.jtests.jms.conform.topic.TemporaryTopicTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@RunWith(Suite.class)
@Suite.SuiteClasses({
// TopicSessionTest.class, // Hangs, see https://issues.apache.org/jira/browse/PROTON-154
TopicSessionTest.class,
MessageHeaderTest.class,
QueueBrowserTest.class,
MessageTypeTest.class,
//,UnifiedSessionTest.class // https://issues.apache.org/jira/browse/AMQ-4375
TemporaryTopicTest.class,
TopicConnectionTest.class, // https://issues.apache.org/jira/browse/AMQ-4654
TopicConnectionTest.class,
SelectorSyntaxTest.class,
QueueSessionTest.class,
SelectorTest.class,
@ -76,6 +76,7 @@ public class JoramJmsNioPlusSslTest {
public Timeout to = new Timeout(10 * 1000);
private static SSLContext def;
@BeforeClass
public static void beforeClass() throws Exception {
System.setProperty("joram.jms.test.file", getJmsTestFileName());
@ -85,6 +86,7 @@ public class JoramJmsNioPlusSslTest {
def = SSLContext.getDefault();
SSLContext.setDefault(ctx);
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty("joram.jms.test.file");

View File

@ -30,12 +30,13 @@ import org.objectweb.jtests.jms.conform.message.headers.MessageHeaderTest;
import org.objectweb.jtests.jms.conform.message.properties.JMSXPropertyTest;
import org.objectweb.jtests.jms.conform.message.properties.MessagePropertyConversionTest;
import org.objectweb.jtests.jms.conform.message.properties.MessagePropertyTest;
import org.objectweb.jtests.jms.conform.queue.QueueBrowserTest;
import org.objectweb.jtests.jms.conform.queue.TemporaryQueueTest;
import org.objectweb.jtests.jms.conform.selector.SelectorSyntaxTest;
import org.objectweb.jtests.jms.conform.selector.SelectorTest;
import org.objectweb.jtests.jms.conform.session.QueueSessionTest;
import org.objectweb.jtests.jms.conform.session.SessionTest;
import org.objectweb.jtests.jms.conform.session.UnifiedSessionTest;
import org.objectweb.jtests.jms.conform.session.TopicSessionTest;
import org.objectweb.jtests.jms.conform.topic.TemporaryTopicTest;
/**
@ -43,11 +44,10 @@ import org.objectweb.jtests.jms.conform.topic.TemporaryTopicTest;
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({
// TopicSessionTest.class, // Hangs, see https://issues.apache.org/jira/browse/PROTON-154
TopicSessionTest.class,
MessageHeaderTest.class,
// QueueBrowserTest.class, // https://issues.apache.org/jira/browse/AMQ-4641
QueueBrowserTest.class,
MessageTypeTest.class,
UnifiedSessionTest.class, // https://issues.apache.org/jira/browse/AMQ-4375
TemporaryTopicTest.class,
TopicConnectionTest.class,
SelectorSyntaxTest.class,
@ -64,6 +64,7 @@ import org.objectweb.jtests.jms.conform.topic.TemporaryTopicTest;
})
public class JoramJmsNioTest {
@Rule
public Timeout timeout = new Timeout(10 * 1000);

View File

@ -16,10 +16,12 @@
*/
package org.apache.activemq.transport.amqp.joram;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.rules.Timeout;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.objectweb.jtests.jms.conform.connection.ConnectionTest;
import org.objectweb.jtests.jms.conform.connection.TopicConnectionTest;
import org.objectweb.jtests.jms.conform.message.MessageBodyTest;
@ -35,41 +37,46 @@ import org.objectweb.jtests.jms.conform.selector.SelectorSyntaxTest;
import org.objectweb.jtests.jms.conform.selector.SelectorTest;
import org.objectweb.jtests.jms.conform.session.QueueSessionTest;
import org.objectweb.jtests.jms.conform.session.SessionTest;
import org.objectweb.jtests.jms.conform.session.TopicSessionTest;
import org.objectweb.jtests.jms.conform.topic.TemporaryTopicTest;
public class JoramJmsTest extends TestCase {
@RunWith(Suite.class)
@Suite.SuiteClasses({
TopicSessionTest.class,
MessageHeaderTest.class,
QueueBrowserTest.class,
MessageTypeTest.class,
TemporaryTopicTest.class,
TopicConnectionTest.class,
SelectorSyntaxTest.class,
QueueSessionTest.class,
SelectorTest.class,
TemporaryQueueTest.class,
ConnectionTest.class,
SessionTest.class,
JMSXPropertyTest.class,
MessageBodyTest.class,
MessageDefaultTest.class,
MessagePropertyConversionTest.class,
MessagePropertyTest.class
})
public static Test suite() {
TestSuite suite = new TestSuite();
public class JoramJmsTest {
// TODO: Fix these tests..
// Fails due to
// https://issues.apache.org/jira/browse/PROTON-154
// suite.addTestSuite(TopicSessionTest.class);
@Rule
public Timeout timeout = new Timeout(10 * 1000);
// Passing tests
suite.addTestSuite(MessageHeaderTest.class);
suite.addTestSuite(QueueBrowserTest.class);
suite.addTestSuite(MessageTypeTest.class);
// suite.addTestSuite(UnifiedSessionTest.class); // https://issues.apache.org/jira/browse/AMQ-4375
suite.addTestSuite(TemporaryTopicTest.class);
suite.addTestSuite(TopicConnectionTest.class);
suite.addTestSuite(SelectorSyntaxTest.class);
suite.addTestSuite(QueueSessionTest.class);
suite.addTestSuite(SelectorTest.class);
suite.addTestSuite(TemporaryQueueTest.class);
suite.addTestSuite(ConnectionTest.class);
suite.addTestSuite(SessionTest.class);
suite.addTestSuite(JMSXPropertyTest.class);
suite.addTestSuite(MessageBodyTest.class);
suite.addTestSuite(MessageDefaultTest.class);
suite.addTestSuite(MessagePropertyConversionTest.class);
suite.addTestSuite(MessagePropertyTest.class);
return suite;
@BeforeClass
public static void beforeClass() throws Exception {
System.setProperty("joram.jms.test.file", getJmsTestFileName());
}
public static void main(String[] args) {
junit.textui.TestRunner.run(suite());
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty("joram.jms.test.file");
}
public static String getJmsTestFileName() {
return "provider.properties";
}
}

View File

@ -28,6 +28,7 @@ import org.junit.rules.Timeout;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.objectweb.jtests.jms.conform.connection.ConnectionTest;
import org.objectweb.jtests.jms.conform.connection.TopicConnectionTest;
import org.objectweb.jtests.jms.conform.message.MessageBodyTest;
import org.objectweb.jtests.jms.conform.message.MessageDefaultTest;
import org.objectweb.jtests.jms.conform.message.MessageTypeTest;
@ -41,20 +42,19 @@ import org.objectweb.jtests.jms.conform.selector.SelectorSyntaxTest;
import org.objectweb.jtests.jms.conform.selector.SelectorTest;
import org.objectweb.jtests.jms.conform.session.QueueSessionTest;
import org.objectweb.jtests.jms.conform.session.SessionTest;
import org.objectweb.jtests.jms.conform.session.UnifiedSessionTest;
import org.objectweb.jtests.jms.conform.session.TopicSessionTest;
import org.objectweb.jtests.jms.conform.topic.TemporaryTopicTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@RunWith(Suite.class)
@Suite.SuiteClasses({
// TopicSessionTest.class, // Hangs, see https://issues.apache.org/jira/browse/PROTON-154
TopicSessionTest.class,
MessageHeaderTest.class,
QueueBrowserTest.class,
MessageTypeTest.class,
UnifiedSessionTest.class, // https://issues.apache.org/jira/browse/AMQ-4375
TemporaryTopicTest.class,
//,TopicConnectionTest.class // https://issues.apache.org/jira/browse/AMQ-4654
TopicConnectionTest.class,
SelectorSyntaxTest.class,
QueueSessionTest.class,
SelectorTest.class,
@ -85,13 +85,13 @@ public class JoramSslTest {
def = SSLContext.getDefault();
SSLContext.setDefault(ctx);
}
@AfterClass
public static void afterClass() throws Exception {
System.clearProperty("joram.jms.test.file");
SSLContext.setDefault(def);
}
public static String getJmsTestFileName() {
return "providerSSL.properties";
}