Repository: activemq Updated Branches: refs/heads/trunk 2ba6689ee -> dc0996d1e
Restored most of the tests, see AMQ-4978 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/dc0996d1 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/dc0996d1 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/dc0996d1 Branch: refs/heads/trunk Commit: dc0996d1e5e133b4b112ee09871c905767668081 Parents: 2ba6689 Author: Kevin Earls <[email protected]> Authored: Tue Feb 18 14:44:53 2014 +0100 Committer: Kevin Earls <[email protected]> Committed: Tue Feb 18 14:44:53 2014 +0100 ---------------------------------------------------------------------- .../amqp/joram/JoramJmsNioPlusSslTest.java | 45 +++++++++++++------- 1 file changed, 30 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/dc0996d1/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioPlusSslTest.java ---------------------------------------------------------------------- diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioPlusSslTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioPlusSslTest.java index 7a6d9e9..89359c5 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioPlusSslTest.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioPlusSslTest.java @@ -24,34 +24,49 @@ import javax.net.ssl.TrustManager; import org.apache.activemq.transport.amqp.DefaultTrustManager; import org.junit.BeforeClass; +import org.junit.Ignore; 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.message.MessageBodyTest; +import org.objectweb.jtests.jms.conform.message.MessageDefaultTest; +import org.objectweb.jtests.jms.conform.message.MessageTypeTest; 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.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 - MessageHeaderTest.class - //QueueBrowserTest.class, - //MessageTypeTest.class, + MessageHeaderTest.class, + QueueBrowserTest.class, + MessageTypeTest.class, //,UnifiedSessionTest.class // https://issues.apache.org/jira/browse/AMQ-4375 - //TemporaryTopicTest.class, + TemporaryTopicTest.class, //,TopicConnectionTest.class // https://issues.apache.org/jira/browse/AMQ-4654 - //SelectorSyntaxTest.class, - //QueueSessionTest.class, - //SelectorTest.class, - //TemporaryQueueTest.class, - //ConnectionTest.class, - //SessionTest.class, - //JMSXPropertyTest.class, - //MessageBodyTest.class, - //MessageDefaultTest.class, - //MessagePropertyConversionTest.class, - //MessagePropertyTest.class + SelectorSyntaxTest.class, + QueueSessionTest.class, + SelectorTest.class, + TemporaryQueueTest.class, + ConnectionTest.class, + SessionTest.class, + JMSXPropertyTest.class, + MessageBodyTest.class, + MessageDefaultTest.class, + MessagePropertyConversionTest.class, + MessagePropertyTest.class }) public class JoramJmsNioPlusSslTest {
