/**
 * 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.fusesource.amqpjms.jms.joram;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;

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.headers.MessageHeaderTest;
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.TemporaryQueueTest;
import org.objectweb.jtests.jms.conform.selector.SelectorTest;
import org.objectweb.jtests.jms.conform.topic.TemporaryTopicTest;

public class JoramJmsTest extends TestCase {

    public static Test suite() {
        TestSuite suite = new TestSuite();

        // TODO: Fix these tests..
        // Fails due to
        // https://issues.apache.org/jira/browse/PROTON-154
        // suite.addTestSuite(TopicSessionTest.class);

//        suite.addTestSuite(QueueBrowserTest.class);
//        suite.addTestSuite(MessageTypeTest.class);
//        suite.addTestSuite(UnifiedSessionTest.class);
//        suite.addTestSuite(SelectorSyntaxTest.class);
//        suite.addTestSuite(QueueSessionTest.class);
//        suite.addTestSuite(SessionTest.class);
//        suite.addTestSuite(JMSXPropertyTest.class);

        suite.addTestSuite(SelectorTest.class);
        suite.addTestSuite(MessageHeaderTest.class);
        suite.addTestSuite(TemporaryTopicTest.class);
        suite.addTestSuite(TemporaryQueueTest.class);
        suite.addTestSuite(TopicConnectionTest.class);
        suite.addTestSuite(ConnectionTest.class);
        suite.addTestSuite(MessageBodyTest.class);
        suite.addTestSuite(MessageDefaultTest.class);
        suite.addTestSuite(MessagePropertyConversionTest.class);
        suite.addTestSuite(MessagePropertyTest.class);

        return suite;
    }

    public static void main(String[] args) {
        junit.textui.TestRunner.run(suite());
    }
}

@@ -1573,24 +1573,159 @@
 tor.Selector
+SyntaxTest;%0Aimport org.objectweb.jtests.jms.conform.selector.SelectorTest;%0Aimport org.objectweb.jtests.jms.conform.session.QueueSession
 Test;%0Aimport
@@ -2275,30 +2275,28 @@
 stSuite(
-SelectorSyntax
+JMSXProperty
 Test.cla
@@ -2329,21 +2329,16 @@
 stSuite(
-Queue
 SessionT
@@ -2341,34 +2341,33 @@
 ionTest.class);%0A
-//
+%0A
         suite.ad
@@ -2369,32 +2369,37 @@
 te.addTestSuite(
+Queue
 SessionTest.clas
@@ -2394,34 +2394,32 @@
 ionTest.class);%0A
-//
         suite.ad
@@ -2425,36 +2425,38 @@
 ddTestSuite(
-JMSXProperty
+SelectorSyntax
 Test.class);
@@ -2448,33 +2448,32 @@
 taxTest.class);%0A
-%0A
         suite.ad

Enable additional Joram tests now that some TX support exists.