/**
 * 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.transport.amqp.joram;

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;
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.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;

/**
 * Run the JoramJmsTests using amqp+nio
 */
@RunWith(Suite.class)
@Suite.SuiteClasses({
    // TopicSessionTest.class,    // Hangs, see https://issues.apache.org/jira/browse/PROTON-154
    MessageHeaderTest.class
    // QueueBrowserTest.class,  // https://issues.apache.org/jira/browse/AMQ-4641
    //MessageTypeTest.class,
    // UnifiedSessionTest.class,  // https://issues.apache.org/jira/browse/AMQ-4375
    //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 class JoramJmsNioTest {
    @Rule
    public Timeout timeout = new Timeout(10 * 1000);

    @BeforeClass
    public static void beforeClass() throws Exception {
        System.setProperty("joram.jms.test.file", getJmsTestFileName());
    }

    public static String getJmsTestFileName() {
        return "providerNIO.properties";
    }
}

@@ -2261,25 +2261,26 @@
 erTest.class
+,
 %0A
-
     // Queue
@@ -2349,26 +2349,24 @@
 MQ-4641%0A    
-//
 MessageTypeT
@@ -2460,26 +2460,24 @@
 MQ-4375%0A    
-//
 TemporaryTop
@@ -2494,18 +2494,16 @@
 ss,%0A    
-//
 TopicCon
@@ -2517,34 +2517,32 @@
 Test.class,%0A    
-//
 SelectorSyntaxTe
@@ -2555,18 +2555,16 @@
 ss,%0A    
-//
 QueueSes
@@ -2583,18 +2583,16 @@
 ss,%0A    
-//
 Selector
@@ -2607,18 +2607,16 @@
 ss,%0A    
-//
 Temporar
@@ -2637,18 +2637,16 @@
 ss,%0A    
-//
 Connecti
@@ -2663,18 +2663,16 @@
 ss,%0A    
-//
 SessionT
@@ -2686,18 +2686,16 @@
 ss,%0A    
-//
 JMSXProp
@@ -2710,26 +2710,24 @@
 .class,%0A    
-//
 MessageBodyT
@@ -2737,26 +2737,24 @@
 .class,%0A    
-//
 MessageDefau
@@ -2763,34 +2763,32 @@
 Test.class,%0A    
-//
 MessagePropertyC
@@ -2812,18 +2812,16 @@
 ss,%0A    
-//
 MessageP
@@ -2841,16 +2841,17 @@
 lass%0A%7D)%0A
+%0A
 public c

Enable some of the NIO joram tests so we can get an idea of what the state of things is now that Proton and QPid client's are updated.