You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2016/10/17 20:17:25 UTC

[1/3] qpid-interop-test git commit: QPIDIT-43 QPIDIT-44 QPIDIT-45: Added framework for new tests: AMQP features test, AMQP and JMS DTX and large content tests

Repository: qpid-interop-test
Updated Branches:
  refs/heads/master aa01b8e0c -> 138dc7d1e


http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-python/src/jms_messages_test/Sender.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/jms_messages_test/Sender.py b/shims/qpid-proton-python/src/jms_messages_test/Sender.py
index 33a6acd..16c3770 100755
--- a/shims/qpid-proton-python/src/jms_messages_test/Sender.py
+++ b/shims/qpid-proton-python/src/jms_messages_test/Sender.py
@@ -29,27 +29,13 @@ from struct import pack, unpack
 import sys
 from traceback import format_exc
 
+from qpid_interop_test.jms_types import create_annotation
 from proton import byte, char, float32, int32, Message, short, symbol
 from proton.handlers import MessagingHandler
 from proton.reactor import Container
 from qpid_interop_test.interop_test_errors import InteropTestError
 
-# These values must tie in with the Qpid-JMS client values found in
-# org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport
-QPID_JMS_TYPE_ANNOTATION_NAME = symbol(u'x-opt-jms-msg-type')
-QPID_JMS_TYPE_ANNOTATIONS = {
-    'JMS_MESSAGE_TYPE': byte(0),
-    'JMS_BYTESMESSAGE_TYPE': byte(3),
-    'JMS_MAPMESSAGE_TYPE': byte(2),
-    'JMS_OBJECTMESSAGE_TYPE': byte(1),
-    'JMS_STREAMMESSAGE_TYPE': byte(4),
-    'JMS_TEXTMESSAGE_TYPE': byte(5)
-    }
-def create_annotation(jms_msg_type):
-    """Function which creates a message annotation for JMS message type as used by the Qpid JMS client"""
-    return {QPID_JMS_TYPE_ANNOTATION_NAME: QPID_JMS_TYPE_ANNOTATIONS[jms_msg_type]}
-
-class JmsSenderShim(MessagingHandler):
+class JmsMessagesTestSender(MessagingHandler):
     """
     This shim sends JMS messages of a particular JMS message type according to the test parameters list. This list
     contains three maps:
@@ -61,7 +47,7 @@ class JmsSenderShim(MessagingHandler):
     with (or without) JMS headers and properties.
     """
     def __init__(self, broker_ip_addr, queue_name, jms_msg_type, test_parameters_list):
-        super(JmsSenderShim, self).__init__()
+        super(JmsMessagesTestSender, self).__init__()
         self.broker_ip_addr = broker_ip_addr
         self.queue_name = queue_name
         self.jms_msg_type = jms_msg_type
@@ -83,13 +69,13 @@ class JmsSenderShim(MessagingHandler):
                     return
 
     def on_connection_error(self, event):
-        print 'JmsSenderShim.on_connection_error'
+        print 'JmsMessagesTestSender.on_connection_error'
 
     def on_session_error(self, event):
-        print 'JmsSenderShim.on_session_error'
+        print 'JmsMessagesTestSender.on_session_error'
 
     def on_link_error(self, event):
-        print 'JmsSenderShim.on_link_error'
+        print 'JmsMessagesTestSender.on_link_error'
 
     def on_accepted(self, event):
         """Event callback for when a sent message is accepted by the broker"""
@@ -142,16 +128,16 @@ class JmsSenderShim(MessagingHandler):
         elif self.jms_msg_type == 'JMS_TEXTMESSAGE_TYPE':
             return self._create_jms_textmessage(test_value)
         else:
-            print 'jms-send: Unsupported JMS message type "%s"' % self.jms_msg_type
+            print 'JmsMessagesTestSender: Unsupported JMS message type "%s"' % self.jms_msg_type
             return None
 
     def _create_jms_message(self, test_value_type, test_value):
         """Create a JMS message type (without message body)"""
         if test_value_type != 'none':
-            raise InteropTestError('JmsSenderShim._create_jms_message: Unknown or unsupported subtype "%s"' %
+            raise InteropTestError('JmsMessagesTestSender._create_jms_message: Unknown or unsupported subtype "%s"' %
                                    test_value_type)
         if test_value is not None:
-            raise InteropTestError('JmsSenderShim._create_jms_message: Invalid value "%s" for subtype "%s"' %
+            raise InteropTestError('JmsMessagesTestSender._create_jms_message: Invalid value "%s" for subtype "%s"' %
                                    (test_value, test_value_type))
         return Message(id=(self.sent+1),
                        content_type='application/octet-stream',
@@ -183,7 +169,7 @@ class JmsSenderShim(MessagingHandler):
             test_value_str = str(test_value) # remove unicode
             body_bytes = pack('!H', len(test_value_str)) + test_value_str
         else:
-            raise InteropTestError('JmsSenderShim._create_jms_bytesmessage: Unknown or unsupported subtype "%s"' %
+            raise InteropTestError('JmsMessagesTestSender._create_jms_bytesmessage: Unknown or unsupported subtype "%s"' %
                                    test_value_type)
         return Message(id=(self.sent+1),
                        body=body_bytes,
@@ -214,7 +200,7 @@ class JmsSenderShim(MessagingHandler):
         elif test_value_type == 'string':
             value = test_value
         else:
-            raise InteropTestError('JmsSenderShim._create_jms_mapmessage: Unknown or unsupported subtype "%s"' %
+            raise InteropTestError('JmsMessagesTestSender._create_jms_mapmessage: Unknown or unsupported subtype "%s"' %
                                    test_value_type)
         return Message(id=(self.sent+1),
                        body={name: value},
@@ -240,7 +226,7 @@ class JmsSenderShim(MessagingHandler):
                                 java_class_str])
         out_str_list = out_str.split('\n')[:-1] # remove trailing \n
         if out_str_list[0] != java_class_str:
-            raise InteropTestError('JmsSenderShim._s_get_java_obj_binary(): Call to JavaObjToBytes failed\n%s' %
+            raise InteropTestError('JmsMessagesTestSender._s_get_java_obj_binary(): Call to JavaObjToBytes failed\n%s' %
                                    out_str)
         return out_str_list[1].decode('hex')
 
@@ -267,7 +253,7 @@ class JmsSenderShim(MessagingHandler):
         elif test_value_type == 'string':
             body_list = [test_value]
         else:
-            raise InteropTestError('JmsSenderShim._create_jms_streammessage: Unknown or unsupported subtype "%s"' %
+            raise InteropTestError('JmsMessagesTestSender._create_jms_streammessage: Unknown or unsupported subtype "%s"' %
                                    test_value_type)
         return Message(id=(self.sent+1),
                        body=body_list,
@@ -291,7 +277,8 @@ class JmsSenderShim(MessagingHandler):
 #print '#### sys.argv=%s' % sys.argv
 #print '>>> test_values=%s' % loads(sys.argv[4])
 try:
-    Container(JmsSenderShim(sys.argv[1], sys.argv[2], sys.argv[3], loads(sys.argv[4]))).run()
+    SENDER = JmsMessagesTestSender(sys.argv[1], sys.argv[2], sys.argv[3], loads(sys.argv[4]))
+    Container(SENDER).run()
 except KeyboardInterrupt:
     pass
 except Exception as exc:

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/src/python/qpid_interop_test/amqp_dtx_test.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/amqp_dtx_test.py b/src/python/qpid_interop_test/amqp_dtx_test.py
new file mode 100644
index 0000000..3c02f1e
--- /dev/null
+++ b/src/python/qpid_interop_test/amqp_dtx_test.py
@@ -0,0 +1,136 @@
+#!/usr/bin/env python
+
+"""
+Module to test AMQP distributed transactions across different clients
+"""
+
+#
+# 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.
+#
+
+import argparse
+import sys
+import unittest
+
+#from itertools import product
+#from json import dumps
+from os import getenv, path
+#from time import mktime, time
+#from uuid import UUID, uuid4
+
+from proton import symbol
+#import qpid_interop_test.broker_properties
+import qpid_interop_test.shims
+#from qpid_interop_test.test_type_map import TestTypeMap
+
+# TODO: propose a sensible default when installation details are worked out
+QPID_INTEROP_TEST_HOME = getenv('QPID_INTEROP_TEST_HOME')
+if QPID_INTEROP_TEST_HOME is None:
+    print 'ERROR: Environment variable QPID_INTEROP_TEST_HOME is not set'
+    sys.exit(1)
+
+
+class AmqpDtxTestCase(unittest.TestCase):
+    """
+    Abstract base class for AMQP distributed transactions (DTX) test cases
+    """
+
+    def run_test(self):
+        """
+        Run this test by invoking the shim send method to send the test values, followed by the shim receive method
+        to receive the values. Finally, compare the sent values with the received values.
+        """
+        pass
+
+
+# SHIM_MAP contains an instance of each client language shim that is to be tested as a part of this test. For
+# every shim in this list, a test is dynamically constructed which tests it against itself as well as every
+# other shim in the list.
+#
+# As new shims are added, add them into this map to have them included in the test cases.
+PROTON_CPP_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'build', 'amqp_dtx_test',
+                                     'Receiver')
+PROTON_CPP_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'build', 'amqp_dtx_test',
+                                   'Sender')
+PROTON_PYTHON_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python', 'src', 'amqp_dtx_test',
+                                        'Receiver.py')
+PROTON_PYTHON_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python', 'src', 'amqp_dtx_test',
+                                      'Sender.py')
+
+SHIM_MAP = {qpid_interop_test.shims.ProtonCppShim.NAME: \
+                qpid_interop_test.shims.ProtonCppShim(PROTON_CPP_SENDER_SHIM, PROTON_CPP_RECEIVER_SHIM),
+            qpid_interop_test.shims.ProtonPythonShim.NAME: \
+                qpid_interop_test.shims.ProtonPythonShim(PROTON_PYTHON_SENDER_SHIM, PROTON_PYTHON_RECEIVER_SHIM),
+           }
+
+
+class TestOptions(object):
+    """
+    Class controlling command-line arguments used to control the test.
+    """
+    def __init__(self):
+        parser = argparse.ArgumentParser(description='Qpid-interop AMQP client interoparability test suite '
+                                         'for AMQP distrubuted (dtx) transactions')
+        parser.add_argument('--broker', action='store', default='localhost:5672', metavar='BROKER:PORT',
+                            help='Broker against which to run test suite.')
+        parser.add_argument('--exclude-shim', action='append', metavar='SHIM-NAME',
+                            help='Name of shim to exclude. Supported shims:\n%s' % sorted(SHIM_MAP.keys()))
+        self.args = parser.parse_args()
+
+
+#--- Main program start ---
+
+if __name__ == '__main__':
+
+    ARGS = TestOptions().args
+    #print 'ARGS:', ARGS # debug
+
+    # Connect to broker to find broker type
+    CONNECTION_PROPS = qpid_interop_test.broker_properties.get_broker_properties(ARGS.broker)
+    if CONNECTION_PROPS is None:
+        print 'WARNING: Unable to get connection properties - unknown broker'
+        BROKER = 'unknown'
+    else:
+        BROKER = CONNECTION_PROPS[symbol(u'product')] if symbol(u'product') in CONNECTION_PROPS \
+                 else '<product not found>'
+        BROKER_VERSION = CONNECTION_PROPS[symbol(u'version')] if symbol(u'version') in CONNECTION_PROPS \
+                         else '<version not found>'
+        BROKER_PLATFORM = CONNECTION_PROPS[symbol(u'platform')] if symbol(u'platform') in CONNECTION_PROPS \
+                          else '<platform not found>'
+        print 'Test Broker: %s v.%s on %s' % (BROKER, BROKER_VERSION, BROKER_PLATFORM)
+        print
+        sys.stdout.flush()
+
+    # TEST_CASE_CLASSES is a list that collects all the test classes that are constructed. One class is constructed
+    # per AMQP type used as the key in map AmqpPrimitiveTypes.TYPE_MAP.
+    TEST_CASE_CLASSES = []
+
+    # TEST_SUITE is the final suite of tests that will be run and which contains all the dynamically created
+    # type classes, each of which contains a test for the combinations of client shims
+    TEST_SUITE = unittest.TestSuite()
+
+    # Remove shims excluded from the command-line
+    if ARGS.exclude_shim is not None:
+        for shim in ARGS.exclude_shim:
+            SHIM_MAP.pop(shim)
+    # Create test classes dynamically
+
+    # Finally, run all the dynamically created tests
+    RES = unittest.TextTestRunner(verbosity=2).run(TEST_SUITE)
+    if not RES.wasSuccessful():
+        sys.exit(1) # Errors or failures present

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/src/python/qpid_interop_test/amqp_features_test.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/amqp_features_test.py b/src/python/qpid_interop_test/amqp_features_test.py
new file mode 100644
index 0000000..c80e051
--- /dev/null
+++ b/src/python/qpid_interop_test/amqp_features_test.py
@@ -0,0 +1,136 @@
+#!/usr/bin/env python
+
+"""
+Module to test AMQP features across different clients
+"""
+
+#
+# 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.
+#
+
+import argparse
+import sys
+import unittest
+
+#from itertools import product
+#from json import dumps
+from os import getenv, path
+#from time import mktime, time
+#from uuid import UUID, uuid4
+
+from proton import symbol
+#import qpid_interop_test.broker_properties
+import qpid_interop_test.shims
+#from qpid_interop_test.test_type_map import TestTypeMap
+
+# TODO: propose a sensible default when installation details are worked out
+QPID_INTEROP_TEST_HOME = getenv('QPID_INTEROP_TEST_HOME')
+if QPID_INTEROP_TEST_HOME is None:
+    print 'ERROR: Environment variable QPID_INTEROP_TEST_HOME is not set'
+    sys.exit(1)
+
+
+class AmqpFeaturesTestCase(unittest.TestCase):
+    """
+    Abstract base class for AMQP message features test cases
+    """
+
+    def run_test(self):
+        """
+        Run this test by invoking the shim send method to send the test values, followed by the shim receive method
+        to receive the values. Finally, compare the sent values with the received values.
+        """
+        pass
+
+
+# SHIM_MAP contains an instance of each client language shim that is to be tested as a part of this test. For
+# every shim in this list, a test is dynamically constructed which tests it against itself as well as every
+# other shim in the list.
+#
+# As new shims are added, add them into this map to have them included in the test cases.
+PROTON_CPP_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'build', 'amqp_features_test',
+                                     'Receiver')
+PROTON_CPP_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'build', 'amqp_features_test',
+                                   'Sender')
+PROTON_PYTHON_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python', 'src',
+                                        'amqp_features_test', 'Receiver.py')
+PROTON_PYTHON_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python', 'src',
+                                      'amqp_features_test', 'Sender.py')
+
+SHIM_MAP = {qpid_interop_test.shims.ProtonCppShim.NAME: \
+                qpid_interop_test.shims.ProtonCppShim(PROTON_CPP_SENDER_SHIM, PROTON_CPP_RECEIVER_SHIM),
+            qpid_interop_test.shims.ProtonPythonShim.NAME: \
+                qpid_interop_test.shims.ProtonPythonShim(PROTON_PYTHON_SENDER_SHIM, PROTON_PYTHON_RECEIVER_SHIM),
+           }
+
+
+class TestOptions(object):
+    """
+    Class controlling command-line arguments used to control the test.
+    """
+    def __init__(self):
+        parser = argparse.ArgumentParser(description='Qpid-interop AMQP client interoparability test suite '
+                                         'for AMQP messaging features')
+        parser.add_argument('--broker', action='store', default='localhost:5672', metavar='BROKER:PORT',
+                            help='Broker against which to run test suite.')
+        parser.add_argument('--exclude-shim', action='append', metavar='SHIM-NAME',
+                            help='Name of shim to exclude. Supported shims:\n%s' % sorted(SHIM_MAP.keys()))
+        self.args = parser.parse_args()
+
+
+#--- Main program start ---
+
+if __name__ == '__main__':
+
+    ARGS = TestOptions().args
+    #print 'ARGS:', ARGS # debug
+
+    # Connect to broker to find broker type
+    CONNECTION_PROPS = qpid_interop_test.broker_properties.get_broker_properties(ARGS.broker)
+    if CONNECTION_PROPS is None:
+        print 'WARNING: Unable to get connection properties - unknown broker'
+        BROKER = 'unknown'
+    else:
+        BROKER = CONNECTION_PROPS[symbol(u'product')] if symbol(u'product') in CONNECTION_PROPS \
+                 else '<product not found>'
+        BROKER_VERSION = CONNECTION_PROPS[symbol(u'version')] if symbol(u'version') in CONNECTION_PROPS \
+                         else '<version not found>'
+        BROKER_PLATFORM = CONNECTION_PROPS[symbol(u'platform')] if symbol(u'platform') in CONNECTION_PROPS \
+                          else '<platform not found>'
+        print 'Test Broker: %s v.%s on %s' % (BROKER, BROKER_VERSION, BROKER_PLATFORM)
+        print
+        sys.stdout.flush()
+
+    # TEST_CASE_CLASSES is a list that collects all the test classes that are constructed. One class is constructed
+    # per AMQP type used as the key in map AmqpPrimitiveTypes.TYPE_MAP.
+    TEST_CASE_CLASSES = []
+
+    # TEST_SUITE is the final suite of tests that will be run and which contains all the dynamically created
+    # type classes, each of which contains a test for the combinations of client shims
+    TEST_SUITE = unittest.TestSuite()
+
+    # Remove shims excluded from the command-line
+    if ARGS.exclude_shim is not None:
+        for shim in ARGS.exclude_shim:
+            SHIM_MAP.pop(shim)
+    # Create test classes dynamically
+
+    # Finally, run all the dynamically created tests
+    RES = unittest.TextTestRunner(verbosity=2).run(TEST_SUITE)
+    if not RES.wasSuccessful():
+        sys.exit(1) # Errors or failures present

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/src/python/qpid_interop_test/amqp_large_content_test.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/amqp_large_content_test.py b/src/python/qpid_interop_test/amqp_large_content_test.py
new file mode 100644
index 0000000..497e8d5
--- /dev/null
+++ b/src/python/qpid_interop_test/amqp_large_content_test.py
@@ -0,0 +1,156 @@
+#!/usr/bin/env python
+
+"""
+Module to test AMQP messages with large content (bodies and headers/properties) across different clients
+"""
+
+#
+# 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.
+#
+
+import argparse
+import sys
+import unittest
+
+#from itertools import product
+#from json import dumps
+from os import getenv, path
+#from time import mktime, time
+#from uuid import UUID, uuid4
+
+from proton import symbol
+#import qpid_interop_test.broker_properties
+import qpid_interop_test.shims
+#from qpid_interop_test.test_type_map import TestTypeMap
+
+# TODO: propose a sensible default when installation details are worked out
+QPID_INTEROP_TEST_HOME = getenv('QPID_INTEROP_TEST_HOME')
+if QPID_INTEROP_TEST_HOME is None:
+    print 'ERROR: Environment variable QPID_INTEROP_TEST_HOME is not set'
+    sys.exit(1)
+
+
+
+class AmqpVariableSizeTypes(TestTypeMap):
+    """
+    Class which contains all the described AMQP primitive types and the test values to be used in testing.
+    """
+
+    VARIABLE_SIZE_TYPE_MAP = {
+        'binary': b'abcdefghijklmnopqrstuvwxyz0123456789',
+        'string': u'abcdefghijklmnopqrstuvwxyz0123456789',
+        'symbol': 'abcdefghijklmnopqrstuvwxyz0123456789',
+        'list': [],
+        'map': {},
+        'array': [],
+        }
+
+    # This section contains tests that should be skipped because of know issues that would cause the test to fail.
+    # As the issues are resolved, these should be removed.
+    BROKER_SKIP = {}
+
+
+class AmqpLargeContentTestCase(unittest.TestCase):
+    """
+    Abstract base class for AMQP large content test cases
+    """
+
+    def run_test(self):
+        """
+        Run this test by invoking the shim send method to send the test values, followed by the shim receive method
+        to receive the values. Finally, compare the sent values with the received values.
+        """
+        pass
+
+
+# SHIM_MAP contains an instance of each client language shim that is to be tested as a part of this test. For
+# every shim in this list, a test is dynamically constructed which tests it against itself as well as every
+# other shim in the list.
+#
+# As new shims are added, add them into this map to have them included in the test cases.
+PROTON_CPP_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'build',
+                                     'amqp_large_content_test', 'Receiver')
+PROTON_CPP_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'build',
+                                   'amqp_large_content_test', 'Sender')
+PROTON_PYTHON_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python', 'src',
+                                        'amqp_large_content_test', 'Receiver.py')
+PROTON_PYTHON_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python', 'src',
+                                      'amqp_large_content_test', 'Sender.py')
+
+SHIM_MAP = {qpid_interop_test.shims.ProtonCppShim.NAME: \
+                qpid_interop_test.shims.ProtonCppShim(PROTON_CPP_SENDER_SHIM, PROTON_CPP_RECEIVER_SHIM),
+            qpid_interop_test.shims.ProtonPythonShim.NAME: \
+                qpid_interop_test.shims.ProtonPythonShim(PROTON_PYTHON_SENDER_SHIM, PROTON_PYTHON_RECEIVER_SHIM),
+           }
+
+
+class TestOptions(object):
+    """
+    Class controlling command-line arguments used to control the test.
+    """
+    def __init__(self):
+        parser = argparse.ArgumentParser(description='Qpid-interop AMQP client interoparability test suite '
+                                         'for AMQP messages with large content')
+        parser.add_argument('--broker', action='store', default='localhost:5672', metavar='BROKER:PORT',
+                            help='Broker against which to run test suite.')
+        parser.add_argument('--exclude-shim', action='append', metavar='SHIM-NAME',
+                            help='Name of shim to exclude. Supported shims:\n%s' % sorted(SHIM_MAP.keys()))
+        self.args = parser.parse_args()
+
+
+#--- Main program start ---
+
+if __name__ == '__main__':
+
+    ARGS = TestOptions().args
+    #print 'ARGS:', ARGS # debug
+
+    # Connect to broker to find broker type
+    CONNECTION_PROPS = qpid_interop_test.broker_properties.get_broker_properties(ARGS.broker)
+    if CONNECTION_PROPS is None:
+        print 'WARNING: Unable to get connection properties - unknown broker'
+        BROKER = 'unknown'
+    else:
+        BROKER = CONNECTION_PROPS[symbol(u'product')] if symbol(u'product') in CONNECTION_PROPS \
+                 else '<product not found>'
+        BROKER_VERSION = CONNECTION_PROPS[symbol(u'version')] if symbol(u'version') in CONNECTION_PROPS \
+                         else '<version not found>'
+        BROKER_PLATFORM = CONNECTION_PROPS[symbol(u'platform')] if symbol(u'platform') in CONNECTION_PROPS \
+                          else '<platform not found>'
+        print 'Test Broker: %s v.%s on %s' % (BROKER, BROKER_VERSION, BROKER_PLATFORM)
+        print
+        sys.stdout.flush()
+
+    # TEST_CASE_CLASSES is a list that collects all the test classes that are constructed. One class is constructed
+    # per AMQP type used as the key in map AmqpPrimitiveTypes.TYPE_MAP.
+    TEST_CASE_CLASSES = []
+
+    # TEST_SUITE is the final suite of tests that will be run and which contains all the dynamically created
+    # type classes, each of which contains a test for the combinations of client shims
+    TEST_SUITE = unittest.TestSuite()
+
+    # Remove shims excluded from the command-line
+    if ARGS.exclude_shim is not None:
+        for shim in ARGS.exclude_shim:
+            SHIM_MAP.pop(shim)
+    # Create test classes dynamically
+
+    # Finally, run all the dynamically created tests
+    RES = unittest.TextTestRunner(verbosity=2).run(TEST_SUITE)
+    if not RES.wasSuccessful():
+        sys.exit(1) # Errors or failures present

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/src/python/qpid_interop_test/amqp_types_test.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/amqp_types_test.py b/src/python/qpid_interop_test/amqp_types_test.py
index bde21f3..a61dfc6 100755
--- a/src/python/qpid_interop_test/amqp_types_test.py
+++ b/src/python/qpid_interop_test/amqp_types_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 """
-Module to test AMQP primitive types across different APIs
+Module to test AMQP primitive types across different clients
 """
 
 #

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/src/python/qpid_interop_test/jms_dtx_test.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/jms_dtx_test.py b/src/python/qpid_interop_test/jms_dtx_test.py
new file mode 100755
index 0000000..62588a8
--- /dev/null
+++ b/src/python/qpid_interop_test/jms_dtx_test.py
@@ -0,0 +1,144 @@
+#!/usr/bin/env python
+
+"""
+Module to test JMS distributed transactions (DTX) across different JMS clients
+"""
+
+#
+# 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.
+#
+
+import argparse
+import sys
+import unittest
+
+#from itertools import product
+#from json import dumps
+from os import getenv, path
+
+from proton import symbol
+#import qpid_interop_test.broker_properties
+import qpid_interop_test.shims
+#from qpid_interop_test.test_type_map import TestTypeMap
+
+
+# TODO: propose a sensible default when installation details are worked out
+QPID_INTEROP_TEST_HOME = getenv('QPID_INTEROP_TEST_HOME')
+if QPID_INTEROP_TEST_HOME is None:
+    print 'ERROR: Environment variable QPID_INTEROP_TEST_HOME is not set'
+    sys.exit(1)
+MAVEN_REPO_PATH = getenv('MAVEN_REPO_PATH', path.join(getenv('HOME'), '.m2', 'repository'))
+
+
+
+class JmsDtxTypeTestCase(unittest.TestCase):
+    """
+    Abstract base class for JMS DTX test cases
+    """
+
+    def run_test(self, broker_addr, jms_message_type, test_values, send_shim, receive_shim):
+        """
+        Run this test by invoking the shim send method to send the test values, followed by the shim receive method
+        to receive the values. Finally, compare the sent values with the received values.
+        """
+        pass
+
+
+PROTON_CPP_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'build',
+                                     'jms_dtx_test', 'Receiver')
+PROTON_CPP_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'build',
+                                   'jms_dtx_test', 'Sender')
+PROTON_PYTHON_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python', 'src',
+                                        'jms_dtx_test', 'Receiver.py')
+PROTON_PYTHON_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python', 'src',
+                                      'jms_dtx_test', 'Sender.py')
+QIT_JMS_CLASSPATH_FILE = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-jms', 'cp.txt')
+with open(QIT_JMS_CLASSPATH_FILE, 'r') as classpath_file:
+    QIT_JMS_CLASSPATH = classpath_file.read()
+QPID_JMS_RECEIVER_SHIM = 'org.apache.qpid.interop_test.jms_dtx_test.Receiver'
+QPID_JMS_SENDER_SHIM = 'org.apache.qpid.interop_test.jms_dtx_test.Sender'
+
+# SHIM_MAP contains an instance of each client language shim that is to be tested as a part of this test. For
+# every shim in this list, a test is dynamically constructed which tests it against itself as well as every
+# other shim in the list.
+#
+# As new shims are added, add them into this map to have them included in the test cases.
+SHIM_MAP = {qpid_interop_test.shims.ProtonCppShim.NAME: \
+                qpid_interop_test.shims.ProtonCppShim(PROTON_CPP_SENDER_SHIM, PROTON_CPP_RECEIVER_SHIM),
+            qpid_interop_test.shims.ProtonPythonShim.NAME: \
+                qpid_interop_test.shims.ProtonPythonShim(PROTON_PYTHON_SENDER_SHIM, PROTON_PYTHON_RECEIVER_SHIM),
+            qpid_interop_test.shims.QpidJmsShim.NAME: \
+                qpid_interop_test.shims.QpidJmsShim(QIT_JMS_CLASSPATH, QPID_JMS_SENDER_SHIM, QPID_JMS_RECEIVER_SHIM),
+           }
+
+# TODO: Complete the test options to give fine control over running tests
+class TestOptions(object):
+    """
+    Class controlling command-line arguments used to control the test.
+    """
+    def __init__(self,):
+        parser = argparse.ArgumentParser(description='Qpid-interop AMQP client interoparability test suite '
+                                         'for JMS distrubuted (dtx) transactions')
+        parser.add_argument('--broker', action='store', default='localhost:5672', metavar='BROKER:PORT',
+                            help='Broker against which to run test suite.')
+        parser.add_argument('--exclude-shim', action='append', metavar='SHIM-NAME',
+                            help='Name of shim to exclude. Supported shims:\n%s' % sorted(SHIM_MAP.keys()))
+        self.args = parser.parse_args()
+
+
+#--- Main program start ---
+
+if __name__ == '__main__':
+
+    ARGS = TestOptions().args
+    #print 'ARGS:', ARGS # debug
+
+    # Connect to broker to find broker type
+    CONNECTION_PROPS = qpid_interop_test.broker_properties.get_broker_properties(ARGS.broker)
+    if CONNECTION_PROPS is None:
+        print 'WARNING: Unable to get connection properties - unknown broker'
+        BROKER = 'unknown'
+    else:
+        BROKER = CONNECTION_PROPS[symbol(u'product')] if symbol(u'product') in CONNECTION_PROPS \
+                 else '<product not found>'
+        BROKER_VERSION = CONNECTION_PROPS[symbol(u'version')] if symbol(u'version') in CONNECTION_PROPS \
+                         else '<version not found>'
+        BROKER_PLATFORM = CONNECTION_PROPS[symbol(u'platform')] if symbol(u'platform') in CONNECTION_PROPS \
+                          else '<platform not found>'
+        print 'Test Broker: %s v.%s on %s' % (BROKER, BROKER_VERSION, BROKER_PLATFORM)
+        print
+        sys.stdout.flush()
+
+    # TEST_CASE_CLASSES is a list that collects all the test classes that are constructed. One class is constructed
+    # per AMQP type used as the key in map JmsMessageTypes.TYPE_MAP.
+    TEST_CASE_CLASSES = []
+
+    # TEST_SUITE is the final suite of tests that will be run and which contains all the dynamically created
+    # type classes, each of which contains a test for the combinations of client shims
+    TEST_SUITE = unittest.TestSuite()
+
+    # Remove shims excluded from the command-line
+    if ARGS.exclude_shim is not None:
+        for shim in ARGS.exclude_shim:
+            SHIM_MAP.pop(shim)
+    # Create test classes dynamically
+
+    # Finally, run all the dynamically created tests
+    RES = unittest.TextTestRunner(verbosity=2).run(TEST_SUITE)
+    if not RES.wasSuccessful():
+        sys.exit(1)

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/src/python/qpid_interop_test/jms_hdrs_props_test.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/jms_hdrs_props_test.py b/src/python/qpid_interop_test/jms_hdrs_props_test.py
index 92a40d1..1edb054 100755
--- a/src/python/qpid_interop_test/jms_hdrs_props_test.py
+++ b/src/python/qpid_interop_test/jms_hdrs_props_test.py
@@ -610,7 +610,7 @@ class TestOptions(object):
     """
     def __init__(self,):
         parser = argparse.ArgumentParser(description='Qpid-interop AMQP client interoparability test suite '
-                                         'for JMS message types')
+                                         'for JMS headers and properties')
         parser.add_argument('--broker', action='store', default='localhost:5672', metavar='BROKER:PORT',
                             help='Broker against which to run test suite.')
 #        test_group = parser.add_mutually_exclusive_group()

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/src/python/qpid_interop_test/jms_large_content_test.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/jms_large_content_test.py b/src/python/qpid_interop_test/jms_large_content_test.py
new file mode 100755
index 0000000..6387060
--- /dev/null
+++ b/src/python/qpid_interop_test/jms_large_content_test.py
@@ -0,0 +1,144 @@
+#!/usr/bin/env python
+
+"""
+Module to test JMS messages containing large content (either message bodies or properties) across different JMS clients
+"""
+
+#
+# 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.
+#
+
+import argparse
+import sys
+import unittest
+
+#from itertools import product
+#from json import dumps
+from os import getenv, path
+
+from proton import symbol
+#import qpid_interop_test.broker_properties
+import qpid_interop_test.shims
+#from qpid_interop_test.test_type_map import TestTypeMap
+
+
+# TODO: propose a sensible default when installation details are worked out
+QPID_INTEROP_TEST_HOME = getenv('QPID_INTEROP_TEST_HOME')
+if QPID_INTEROP_TEST_HOME is None:
+    print 'ERROR: Environment variable QPID_INTEROP_TEST_HOME is not set'
+    sys.exit(1)
+MAVEN_REPO_PATH = getenv('MAVEN_REPO_PATH', path.join(getenv('HOME'), '.m2', 'repository'))
+
+
+
+class JmsLargeContentTypeTestCase(unittest.TestCase):
+    """
+    Abstract base class for JMS large content test cases
+    """
+
+    def run_test(self, broker_addr, jms_message_type, test_values, send_shim, receive_shim):
+        """
+        Run this test by invoking the shim send method to send the test values, followed by the shim receive method
+        to receive the values. Finally, compare the sent values with the received values.
+        """
+        pass
+
+
+PROTON_CPP_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'build',
+                                     'jms_large_content_test', 'Receiver')
+PROTON_CPP_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'build',
+                                   'jms_large_content_test', 'Sender')
+PROTON_PYTHON_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python', 'src',
+                                        'jms_large_content_test', 'Receiver.py')
+PROTON_PYTHON_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python', 'src',
+                                      'jms_large_content_test', 'Sender.py')
+QIT_JMS_CLASSPATH_FILE = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-jms', 'cp.txt')
+with open(QIT_JMS_CLASSPATH_FILE, 'r') as classpath_file:
+    QIT_JMS_CLASSPATH = classpath_file.read()
+QPID_JMS_RECEIVER_SHIM = 'org.apache.qpid.interop_test.jms_large_content_test.Receiver'
+QPID_JMS_SENDER_SHIM = 'org.apache.qpid.interop_test.jms_large_content_test.Sender'
+
+# SHIM_MAP contains an instance of each client language shim that is to be tested as a part of this test. For
+# every shim in this list, a test is dynamically constructed which tests it against itself as well as every
+# other shim in the list.
+#
+# As new shims are added, add them into this map to have them included in the test cases.
+SHIM_MAP = {qpid_interop_test.shims.ProtonCppShim.NAME: \
+                qpid_interop_test.shims.ProtonCppShim(PROTON_CPP_SENDER_SHIM, PROTON_CPP_RECEIVER_SHIM),
+            qpid_interop_test.shims.ProtonPythonShim.NAME: \
+                qpid_interop_test.shims.ProtonPythonShim(PROTON_PYTHON_SENDER_SHIM, PROTON_PYTHON_RECEIVER_SHIM),
+            qpid_interop_test.shims.QpidJmsShim.NAME: \
+                qpid_interop_test.shims.QpidJmsShim(QIT_JMS_CLASSPATH, QPID_JMS_SENDER_SHIM, QPID_JMS_RECEIVER_SHIM),
+           }
+
+# TODO: Complete the test options to give fine control over running tests
+class TestOptions(object):
+    """
+    Class controlling command-line arguments used to control the test.
+    """
+    def __init__(self,):
+        parser = argparse.ArgumentParser(description='Qpid-interop AMQP client interoparability test suite '
+                                         'for JMS messages containing large content')
+        parser.add_argument('--broker', action='store', default='localhost:5672', metavar='BROKER:PORT',
+                            help='Broker against which to run test suite.')
+        parser.add_argument('--exclude-shim', action='append', metavar='SHIM-NAME',
+                            help='Name of shim to exclude. Supported shims:\n%s' % sorted(SHIM_MAP.keys()))
+        self.args = parser.parse_args()
+
+
+#--- Main program start ---
+
+if __name__ == '__main__':
+
+    ARGS = TestOptions().args
+    #print 'ARGS:', ARGS # debug
+
+    # Connect to broker to find broker type
+    CONNECTION_PROPS = qpid_interop_test.broker_properties.get_broker_properties(ARGS.broker)
+    if CONNECTION_PROPS is None:
+        print 'WARNING: Unable to get connection properties - unknown broker'
+        BROKER = 'unknown'
+    else:
+        BROKER = CONNECTION_PROPS[symbol(u'product')] if symbol(u'product') in CONNECTION_PROPS \
+                 else '<product not found>'
+        BROKER_VERSION = CONNECTION_PROPS[symbol(u'version')] if symbol(u'version') in CONNECTION_PROPS \
+                         else '<version not found>'
+        BROKER_PLATFORM = CONNECTION_PROPS[symbol(u'platform')] if symbol(u'platform') in CONNECTION_PROPS \
+                          else '<platform not found>'
+        print 'Test Broker: %s v.%s on %s' % (BROKER, BROKER_VERSION, BROKER_PLATFORM)
+        print
+        sys.stdout.flush()
+
+    # TEST_CASE_CLASSES is a list that collects all the test classes that are constructed. One class is constructed
+    # per AMQP type used as the key in map JmsMessageTypes.TYPE_MAP.
+    TEST_CASE_CLASSES = []
+
+    # TEST_SUITE is the final suite of tests that will be run and which contains all the dynamically created
+    # type classes, each of which contains a test for the combinations of client shims
+    TEST_SUITE = unittest.TestSuite()
+
+    # Remove shims excluded from the command-line
+    if ARGS.exclude_shim is not None:
+        for shim in ARGS.exclude_shim:
+            SHIM_MAP.pop(shim)
+    # Create test classes dynamically
+
+    # Finally, run all the dynamically created tests
+    RES = unittest.TextTestRunner(verbosity=2).run(TEST_SUITE)
+    if not RES.wasSuccessful():
+        sys.exit(1)

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/src/python/qpid_interop_test/jms_types.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/jms_types.py b/src/python/qpid_interop_test/jms_types.py
new file mode 100644
index 0000000..32745da
--- /dev/null
+++ b/src/python/qpid_interop_test/jms_types.py
@@ -0,0 +1,39 @@
+"""
+Common JMS types and definitions as implemented by QpidJMS
+"""
+
+#
+# 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.
+#
+
+from proton import byte, symbol
+
+QPID_JMS_TYPE_ANNOTATION_NAME = symbol(u'x-opt-jms-msg-type')
+
+QPID_JMS_TYPE_ANNOTATIONS = {
+    'JMS_MESSAGE_TYPE': byte(0),
+    'JMS_BYTESMESSAGE_TYPE': byte(3),
+    'JMS_MAPMESSAGE_TYPE': byte(2),
+    'JMS_OBJECTMESSAGE_TYPE': byte(1),
+    'JMS_STREAMMESSAGE_TYPE': byte(4),
+    'JMS_TEXTMESSAGE_TYPE': byte(5)
+    }
+
+def create_annotation(jms_msg_type):
+    """Function which creates a message annotation for JMS message type as used by the Qpid JMS client"""
+    return {QPID_JMS_TYPE_ANNOTATION_NAME: QPID_JMS_TYPE_ANNOTATIONS[jms_msg_type]}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


[3/3] qpid-interop-test git commit: QPIDIT-43 QPIDIT-44 QPIDIT-45: Added framework for new tests: AMQP features test, AMQP and JMS DTX and large content tests

Posted by kp...@apache.org.
QPIDIT-43 QPIDIT-44 QPIDIT-45: Added framework for new tests: AMQP features test, AMQP and JMS DTX and large content tests


Project: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/commit/138dc7d1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/138dc7d1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/138dc7d1

Branch: refs/heads/master
Commit: 138dc7d1ea271c824fd45a0b574b69c07a8101e4
Parents: aa01b8e
Author: Kim van der Riet <kp...@apache.org>
Authored: Mon Oct 17 16:16:55 2016 -0400
Committer: Kim van der Riet <kp...@apache.org>
Committed: Mon Oct 17 16:16:55 2016 -0400

----------------------------------------------------------------------
 .../amqp_types_test/Receiver.java               | 274 -------------
 .../amqp_types_test/Sender.java                 | 260 ------------
 .../jms_dtx_test/Receiver.java                  | 407 +++++++++++++++++++
 .../qpid_interop_test/jms_dtx_test/Sender.java  | 113 +++++
 .../jms_large_content_test/Receiver.java        | 407 +++++++++++++++++++
 .../jms_large_content_test/Sender.java          | 113 +++++
 shims/qpid-proton-cpp/src/CMakeLists.txt        | 129 +++---
 .../src/qpidit/amqp_dtx_test/Receiver.cpp       |  43 ++
 .../src/qpidit/amqp_dtx_test/Receiver.hpp       |  39 ++
 .../src/qpidit/amqp_dtx_test/Sender.cpp         |  43 ++
 .../src/qpidit/amqp_dtx_test/Sender.hpp         |  39 ++
 .../src/qpidit/amqp_features_test/Receiver.cpp  |  43 ++
 .../src/qpidit/amqp_features_test/Receiver.hpp  |  39 ++
 .../src/qpidit/amqp_features_test/Sender.cpp    |  44 ++
 .../src/qpidit/amqp_features_test/Sender.hpp    |  39 ++
 .../qpidit/amqp_large_content_test/Receiver.cpp |  43 ++
 .../qpidit/amqp_large_content_test/Receiver.hpp |  39 ++
 .../qpidit/amqp_large_content_test/Sender.cpp   |  43 ++
 .../qpidit/amqp_large_content_test/Sender.hpp   |  40 ++
 .../src/qpidit/jms_dtx_test/Receiver.cpp        |  43 ++
 .../src/qpidit/jms_dtx_test/Receiver.hpp        |  39 ++
 .../src/qpidit/jms_dtx_test/Sender.cpp          |  43 ++
 .../src/qpidit/jms_dtx_test/Sender.hpp          |  39 ++
 .../src/qpidit/jms_hdrs_props_test/Receiver.cpp |  13 +-
 .../src/qpidit/jms_hdrs_props_test/Receiver.hpp |   3 +-
 .../src/qpidit/jms_hdrs_props_test/Sender.hpp   |   1 -
 .../qpidit/jms_large_content_test/Receiver.cpp  |  43 ++
 .../qpidit/jms_large_content_test/Receiver.hpp  |  39 ++
 .../qpidit/jms_large_content_test/Sender.cpp    |  43 ++
 .../qpidit/jms_large_content_test/Sender.hpp    |  39 ++
 .../src/qpidit/jms_messages_test/Receiver.hpp   |   1 -
 .../src/qpidit/jms_messages_test/Sender.hpp     |   1 -
 .../src/amqp_dtx_test/Receiver.py               |  75 ++++
 .../src/amqp_dtx_test/Sender.py                 |  94 +++++
 .../src/amqp_features_test/Receiver.py          |  75 ++++
 .../src/amqp_features_test/Sender.py            |  94 +++++
 .../src/amqp_large_content_test/Receiver.py     |  75 ++++
 .../src/amqp_large_content_test/Sender.py       |  94 +++++
 .../src/amqp_types_test/Receiver.py             |  16 +-
 .../src/amqp_types_test/Sender.py               |  14 +-
 .../src/jms_dtx_test/Receiver.py                |  76 ++++
 .../src/jms_dtx_test/Sender.py                  |  95 +++++
 .../src/jms_hdrs_props_test/Receiver.py         |  22 +-
 .../src/jms_hdrs_props_test/Sender.py           |  31 +-
 .../src/jms_large_content_test/Receiver.py      |  76 ++++
 .../src/jms_large_content_test/Sender.py        |  95 +++++
 .../src/jms_messages_test/Receiver.py           |  24 +-
 .../src/jms_messages_test/Sender.py             |  43 +-
 src/python/qpid_interop_test/amqp_dtx_test.py   | 136 +++++++
 .../qpid_interop_test/amqp_features_test.py     | 136 +++++++
 .../amqp_large_content_test.py                  | 156 +++++++
 src/python/qpid_interop_test/amqp_types_test.py |   2 +-
 src/python/qpid_interop_test/jms_dtx_test.py    | 144 +++++++
 .../qpid_interop_test/jms_hdrs_props_test.py    |   2 +-
 .../qpid_interop_test/jms_large_content_test.py | 144 +++++++
 src/python/qpid_interop_test/jms_types.py       |  39 ++
 56 files changed, 3596 insertions(+), 706 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/amqp_types_test/Receiver.java
----------------------------------------------------------------------
diff --git a/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/amqp_types_test/Receiver.java b/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/amqp_types_test/Receiver.java
deleted file mode 100644
index fea263a..0000000
--- a/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/amqp_types_test/Receiver.java
+++ /dev/null
@@ -1,274 +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.interop_test.amqp_types_test;
-
-import java.math.BigDecimal;
-import java.util.UUID;
-import java.util.Vector;
-import javax.jms.BytesMessage;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.StreamMessage;
-import javax.jms.TextMessage;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import org.apache.qpid.jms.JmsConnectionFactory;
-
-public class Receiver {
-    private static final String USER = "guest";
-    private static final String PASSWORD = "guest";
-    private static final int TIMEOUT = 1000;
-    private static final String[] SUPPORTED_AMQP_TYPES = {"null",
-                                                          "boolean",
-                                                          "ubyte",
-                                                          "ushort",
-                                                          "uint",
-                                                          "ulong",
-                                                          "byte",
-                                                          "short",
-                                                          "int",
-                                                          "long",
-                                                          "float",
-                                                          "double",
-                                                          "decimal32",
-                                                          "decimal64",
-                                                          "decimal128",
-                                                          "char",
-                                                          "timestamp",
-                                                          "uuid",
-                                                          "binary",
-                                                          "string",
-                                                          "symbol",
-                                                          "list",
-                                                          "map",
-                                                          "array"};
-
-    public static void main(String[] args) throws Exception {
-        if (args.length < 4) {
-            System.out.println("AmqpReceiver: Insufficient number of arguments");
-            System.out.println("AmqpReceiver: Expected arguments: broker_address, queue_name, amqp_type, num_test_values");
-            System.exit(1);
-        }
-        String brokerAddress = "amqp://" + args[0];
-        String queueName = args[1];
-        String amqpType = args[2];
-        int numTestValues = Integer.parseInt(args[3]);
-        Connection connection = null;
-
-        try {
-            ConnectionFactory factory = (ConnectionFactory)new JmsConnectionFactory(brokerAddress);
-
-            connection = factory.createConnection(USER, PASSWORD);
-            connection.setExceptionListener(new MyExceptionListener());
-            connection.start();
-
-            Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-            
-            Queue queue = session.createQueue(queueName);
-
-            MessageConsumer messageConsumer = session.createConsumer(queue);
-            
-            Vector<String> outList = new Vector<String>();
-            outList.add(amqpType);
-            if (isSupportedAmqpType(amqpType)) {
-                int actualCount = 0;
-                Message message = null;
-                for (int i = 1; i <= numTestValues; i++, actualCount++) {
-                    message = messageConsumer.receive(TIMEOUT);
-                    if (message == null)
-                        break;
-                    switch (amqpType) {
-                    case "null":
-                        long bodyLength = ((BytesMessage)message).getBodyLength();
-                        if (bodyLength == 0L) {
-                            outList.add("None");
-                        } else {
-                            throw new Exception("AmqpReceiver: JMS BytesMessage size error: Expected 0 bytes, read " + bodyLength);
-                        }
-                        break;
-                    case "boolean":
-                        String bs = String.valueOf(((BytesMessage)message).readBoolean());
-                        outList.add(Character.toUpperCase(bs.charAt(0)) + bs.substring(1));
-                        break;
-                    case "ubyte":
-                        byte byteValue = ((BytesMessage)message).readByte();
-                        short ubyteValue = (short)(byteValue & 0xff);
-                        outList.add(String.valueOf(ubyteValue));
-                        break;
-                    case "ushort":
-                    {
-                        byte[] byteArray = new byte[2];
-                        int numBytes = ((BytesMessage)message).readBytes(byteArray);
-                        if (numBytes != 2) {
-                            // TODO: numBytes == -1 means no more bytes in stream - add error message for this case?
-                            throw new Exception("AmqpReceiver: JMS BytesMessage size error: Exptected 2 bytes, read " + numBytes);
-                        }
-                        int ushortValue = 0;
-                        for (int j=0; j<byteArray.length; j++) {
-                            ushortValue = (ushortValue << 8) + (byteArray[j] & 0xff);
-                        }
-                        outList.add(String.valueOf(ushortValue));
-                        break;
-                    }
-                    case "uint":
-                    {
-                        byte[] byteArray = new byte[4];
-                        int numBytes = ((BytesMessage)message).readBytes(byteArray);
-                        if (numBytes != 4) {
-                            // TODO: numBytes == -1 means no more bytes in stream - add error message for this case?
-                            throw new Exception("AmqpReceiver: JMS BytesMessage size error: Exptected 4 bytes, read " + numBytes);
-                        }
-                        long uintValue = 0;
-                        for (int j=0; j<byteArray.length; j++) {
-                            uintValue = (uintValue << 8) + (byteArray[j] & 0xff);
-                        }
-                        outList.add(String.valueOf(uintValue));
-                        break;
-                    }
-                    case "ulong":
-                    case "timestamp":
-                    {
-                        // TODO: Tidy this ugliness up - perhaps use of vector<byte>?
-                        byte[] byteArray = new byte[8];
-                        int numBytes = ((BytesMessage)message).readBytes(byteArray);
-                        if (numBytes != 8) {
-                            // TODO: numBytes == -1 means no more bytes in stream - add error message for this case?
-                            throw new Exception("AmqpReceiver: JMS BytesMessage size error: Exptected 8 bytes, read " + numBytes);
-                        }
-                        // TODO: shortcut in use here - this byte array should go through a Java type that can represent this as a number - such as BigInteger.
-                        outList.add(String.format("0x%02x%02x%02x%02x%02x%02x%02x%02x", byteArray[0], byteArray[1],
-                                byteArray[2], byteArray[3], byteArray[4], byteArray[5], byteArray[6], byteArray[7]));
-                        break;
-                    }
-                    case "byte":
-                        outList.add(String.valueOf(((BytesMessage)message).readByte()));
-                        break;
-                    case "short":
-                        outList.add(String.valueOf(((BytesMessage)message).readShort()));
-                        break;
-                    case "int":
-                        outList.add(String.valueOf(((BytesMessage)message).readInt()));
-                        break;
-                    case "long":
-                        outList.add(String.valueOf(((BytesMessage)message).readLong()));
-                        break;
-                    case "float":
-                        float f = ((BytesMessage)message).readFloat();
-                        int i0 = Float.floatToRawIntBits(f);
-                        outList.add(String.format("0x%8s", Integer.toHexString(i0)).replace(' ', '0'));
-                        break;
-                    case "double":
-                        double d = ((BytesMessage)message).readDouble();
-                        long l = Double.doubleToRawLongBits(d);
-                        outList.add(String.format("0x%16s", Long.toHexString(l)).replace(' ', '0'));
-                        break;
-                    case "decimal32":
-                        BigDecimal bd32 = (BigDecimal)((ObjectMessage)message).getObject();
-                        outList.add(bd32.toString());
-                        break;
-                    case "decimal64":
-                        BigDecimal bd64 = (BigDecimal)((ObjectMessage)message).getObject();
-                        outList.add(bd64.toString());
-                        break;
-                    case "decimal128":
-                        BigDecimal bd128 = (BigDecimal)((ObjectMessage)message).getObject();
-                        outList.add(bd128.toString());
-                        break;
-                    case "char":
-                        outList.add(String.format("%c", ((BytesMessage)message).readChar()));
-                        break;
-                    case "uuid":
-                        UUID uuid = (UUID)((ObjectMessage)message).getObject();
-                        outList.add(uuid.toString());
-                        break;
-                    case "binary":
-                        BytesMessage bm = (BytesMessage)message;
-                        int msgLen = (int)bm.getBodyLength();
-                        byte[] ba = new byte[msgLen];
-                        if (bm.readBytes(ba) == msgLen) {
-                            outList.add(new String(ba));
-                        } else {
-                            // TODO: Raise exception or error here: size mismatch
-                        }
-                        break;
-                    case "string":
-                        outList.add(((TextMessage)message).getText());
-                        break;
-                    case "symbol":
-                        outList.add(((BytesMessage)message).readUTF());
-                        break;
-                    case "list":
-                        break;
-                    case "map":
-                        break;
-                    case "array":
-                        break;
-                    default:
-                        // Internal error, should never happen if SUPPORTED_AMQP_TYPES matches this case stmt
-                        connection.close();
-                        throw new Exception("AmqpReceiver: Internal error: unsupported AMQP type \"" + amqpType + "\"");
-                    }
-                }
-            } else {
-                System.out.println("ERROR: AmqpReceiver: AMQP type \"" + amqpType + "\" is not supported");
-                connection.close();
-                System.exit(1);
-            }
-
-            connection.close();
-
-            // No exception, print results
-            for (int i=0; i<outList.size(); i++) {
-                System.out.println(outList.get(i));
-            }
-        } catch (Exception exp) {
-            if (connection != null)
-                connection.close();
-            System.out.println("Caught exception, exiting.");
-            exp.printStackTrace(System.out);
-            System.exit(1);
-        }
-    }
-    
-    protected static boolean isSupportedAmqpType(String amqpType) {
-        for (String supportedAmqpType: SUPPORTED_AMQP_TYPES) {
-            if (amqpType.equals(supportedAmqpType))
-                return true;
-        }
-        return false;
-    }
-
-    private static class MyExceptionListener implements ExceptionListener {
-        @Override
-        public void onException(JMSException exception) {
-            System.out.println("Connection ExceptionListener fired, exiting.");
-            exception.printStackTrace(System.out);
-            System.exit(1);
-        }
-    }
-
-    public Receiver(String brokerAddress, String queueName) {
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/amqp_types_test/Sender.java
----------------------------------------------------------------------
diff --git a/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/amqp_types_test/Sender.java b/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/amqp_types_test/Sender.java
deleted file mode 100644
index 7b436de..0000000
--- a/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/amqp_types_test/Sender.java
+++ /dev/null
@@ -1,260 +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.interop_test.amqp_types_test;
-
-import java.math.BigDecimal; 
-import java.math.BigInteger; 
-import java.math.MathContext; 
-import java.util.Arrays;
-import java.util.UUID;
-import javax.jms.BytesMessage;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.DeliveryMode;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.StreamMessage;
-import javax.jms.TextMessage;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import org.apache.qpid.jms.JmsConnectionFactory;
-
-public class Sender {
-    private static final String USER = "guest";
-    private static final String PASSWORD = "guest";
-    private static final String[] SUPPORTED_AMQP_TYPES = {"null",
-                                                          "boolean",
-                                                          "ubyte",
-                                                          "ushort",
-                                                          "uint",
-                                                          "ulong",
-                                                          "byte",
-                                                          "short",
-                                                          "int",
-                                                          "long",
-                                                          "float",
-                                                          "double",
-                                                          "decimal32",
-                                                          "decimal64",
-                                                          "decimal128",
-                                                          "char",
-                                                          "timestamp",
-                                                          "uuid",
-                                                          "binary",
-                                                          "string",
-                                                          "symbol",
-                                                          "list",
-                                                          "map",
-                                                          "array"};
-
-    public static void main(String[] args) throws Exception {
-        if (args.length < 4) {
-            System.out.println("AmqpSender: Insufficient number of arguments");
-            System.out.println("AmqpSender: Expected arguments: broker_address, queue_name, amqp_type, test_val, test_val, ...");
-            System.exit(1);
-        }
-        String brokerAddress = "amqp://" + args[0];
-        String queueName = args[1];
-        String amqpType = args[2];
-        String[] testValueList = Arrays.copyOfRange(args, 3, args.length); // Use remaining args as test values
-
-        try {
-            ConnectionFactory factory = (ConnectionFactory)new JmsConnectionFactory(brokerAddress);
-
-            Connection connection = factory.createConnection();
-            connection.setExceptionListener(new MyExceptionListener());
-            connection.start();
-
-            Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-            
-            Queue queue = session.createQueue(queueName);
-
-            MessageProducer messageProducer = session.createProducer(queue);
-
-            if (isSupportedAmqpType(amqpType)) {
-                Message message = null;
-                for (String testValueStr : testValueList) {
-                    switch (amqpType) {
-                    case "null":
-                        message = session.createBytesMessage();
-                        break;
-                    case "boolean":
-                        message = session.createBytesMessage();
-                        ((BytesMessage)message).writeBoolean(Boolean.parseBoolean(testValueStr));
-                        break;
-                    case "ubyte":
-                    {
-                        byte testValue = (byte)Short.parseShort(testValueStr);
-                        message = session.createBytesMessage();
-                        ((BytesMessage)message).writeByte(testValue);
-                        break;
-                    }
-                    case "ushort":
-                    {
-                        int testValue = Integer.parseInt(testValueStr);
-                        byte[] byteArray = new byte[2];
-                        byteArray[0] = (byte)(testValue >> 8);
-                        byteArray[1] = (byte)(testValue);
-                        message = session.createBytesMessage();
-                        ((BytesMessage)message).writeBytes(byteArray);
-                        break;
-                    }
-                    case "uint":
-                    {
-                        long testValue = Long.parseLong(testValueStr);
-                        byte[] byteArray = new byte[4];
-                        byteArray[0] = (byte)(testValue >> 24);
-                        byteArray[1] = (byte)(testValue >> 16);
-                        byteArray[2] = (byte)(testValue >> 8);
-                        byteArray[3] = (byte)(testValue);
-                        message = session.createBytesMessage();
-                        ((BytesMessage)message).writeBytes(byteArray);
-                        break;
-                    }
-                    case "ulong":
-                    {
-                        // TODO: Tidy this ugliness up - perhaps use of vector<byte>?
-                        BigInteger testValue = new BigInteger(testValueStr);
-                        byte[] bigIntArray =  testValue.toByteArray(); // may be 1 to 9 bytes depending on number
-                        byte[] byteArray = {0, 0, 0, 0, 0, 0, 0, 0};
-                        int effectiveBigIntArrayLen = bigIntArray.length > 8 ? 8 : bigIntArray.length; // Cap length at 8
-                        int bigIntArrayOffs = bigIntArray.length > 8 ? bigIntArray.length - 8 : 0; // Offset when length > 8
-                        for (int i=0; i<bigIntArray.length && i < 8; i++)
-                            byteArray[8 - effectiveBigIntArrayLen + i] = bigIntArray[bigIntArrayOffs + i];
-                        message = session.createBytesMessage();
-                        ((BytesMessage)message).writeBytes(byteArray);
-                        break;
-                    }
-                    case "byte":
-                        message = session.createBytesMessage();
-                        ((BytesMessage)message).writeByte(Byte.parseByte(testValueStr));
-                        break;
-                    case "short":
-                        message = session.createBytesMessage();
-                        ((BytesMessage)message).writeShort(Short.parseShort(testValueStr));
-                        break;
-                    case "int":
-                        message = session.createBytesMessage();
-                        ((BytesMessage)message).writeInt(Integer.parseInt(testValueStr));
-                        break;
-                    case "long":
-                    case "timestamp":
-                        message = session.createBytesMessage();
-                        ((BytesMessage)message).writeLong(Long.parseLong(testValueStr));
-                        break;
-                    case "float":
-                        Long i = Long.parseLong(testValueStr.substring(2), 16);
-                        message = session.createBytesMessage();
-                        ((BytesMessage)message).writeFloat(Float.intBitsToFloat(i.intValue()));
-                        break;
-                    case "double":
-                        Long l1 = Long.parseLong(testValueStr.substring(2, 3), 16) << 60;
-                        Long l2 = Long.parseLong(testValueStr.substring(3), 16);
-                        message = session.createBytesMessage();
-                        ((BytesMessage)message).writeDouble(Double.longBitsToDouble(l1 | l2));
-                        break;
-                    case "decimal32":
-                        BigDecimal bd32 = new BigDecimal(testValueStr, MathContext.DECIMAL32);
-                        message = session.createObjectMessage();
-                        ((ObjectMessage)message).setObject(bd32);
-                        break;
-                    case "decimal64":
-                        BigDecimal bd64 = new BigDecimal(testValueStr, MathContext.DECIMAL64);
-                        message = session.createObjectMessage();
-                        ((ObjectMessage)message).setObject(bd64);
-                        break;
-                    case "decimal128":
-                        BigDecimal bd128 = new BigDecimal(testValueStr, MathContext.DECIMAL128);
-                        message = session.createObjectMessage();
-                        ((ObjectMessage)message).setObject(bd128);
-                        break;
-                    case "char":
-                        char c = 0;
-                        if (testValueStr.length() == 1) // Single char
-                            c = testValueStr.charAt(0);
-                        else if (testValueStr.length() == 6) // unicode format
-                            c = (char)Integer.parseInt(testValueStr, 16);
-                        message = session.createBytesMessage();
-                        ((BytesMessage)message).writeChar(c);
-                        break;
-                    case "uuid":
-                        UUID uuid = UUID.fromString(testValueStr);
-                        message = session.createObjectMessage();
-                        ((ObjectMessage)message).setObject(uuid);
-                        break;
-                    case "binary":
-                        message = session.createBytesMessage();
-                        byte[] byteArray = testValueStr.getBytes();
-                        ((BytesMessage)message).writeBytes(byteArray, 0, byteArray.length);
-                        break;
-                    case "string":
-                        message = session.createTextMessage(testValueStr);
-                        break;
-                    case "symbol":
-                        message = session.createBytesMessage();
-                        ((BytesMessage)message).writeUTF(testValueStr);
-                        break;
-                    case "list":
-                        break;
-                    case "map":
-                        break;
-                    case "array":
-                        break;
-                    default:
-                        // Internal error, should never happen if SUPPORTED_AMQP_TYPES matches this case stmt
-                        connection.close();
-                        throw new Exception("AmqpSender: Internal error: unsupported AMQP type \"" + amqpType + "\"");
-                    }
-                    messageProducer.send(message, DeliveryMode.NON_PERSISTENT, Message.DEFAULT_PRIORITY, Message.DEFAULT_TIME_TO_LIVE);
-                }
-            } else {
-                System.out.println("ERROR: AmqpSender: AMQP type \"" + amqpType + "\" is not supported");
-                connection.close();
-                System.exit(1);
-            }
-            
-            connection.close();
-        } catch (Exception exp) {
-            System.out.println("Caught exception, exiting.");
-            exp.printStackTrace(System.out);
-            System.exit(1);
-        }
-    }
-    
-    protected static boolean isSupportedAmqpType(String amqpType) {
-        for (String supportedAmqpType: SUPPORTED_AMQP_TYPES) {
-            if (amqpType.equals(supportedAmqpType))
-                return true;
-        }
-        return false;
-    }
-
-    private static class MyExceptionListener implements ExceptionListener {
-        @Override
-        public void onException(JMSException exception) {
-            System.out.println("Connection ExceptionListener fired, exiting.");
-            exception.printStackTrace(System.out);
-            System.exit(1);
-        }
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/jms_dtx_test/Receiver.java
----------------------------------------------------------------------
diff --git a/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/jms_dtx_test/Receiver.java b/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/jms_dtx_test/Receiver.java
new file mode 100644
index 0000000..a4763f8
--- /dev/null
+++ b/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/jms_dtx_test/Receiver.java
@@ -0,0 +1,407 @@
+/**
+ * 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.interop_test.jms_dtx_test;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+import javax.jms.BytesMessage;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import javax.jms.MapMessage;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.StreamMessage;
+import javax.jms.TextMessage;
+import javax.jms.Topic;
+import javax.json.Json;
+import javax.json.JsonArray;
+import javax.json.JsonArrayBuilder;
+import javax.json.JsonObject;
+import javax.json.JsonObjectBuilder;
+import javax.json.JsonReader;
+import javax.json.JsonWriter;
+import org.apache.qpid.jms.JmsConnectionFactory;
+
+public class Receiver {
+    private static final String USER = "guest";
+    private static final String PASSWORD = "guest";
+    private static final int TIMEOUT = 1000;
+    private static final String[] SUPPORTED_JMS_MESSAGE_TYPES = {"JMS_MESSAGE_TYPE",
+                                                                 "JMS_BYTESMESSAGE_TYPE",
+                                                                 "JMS_MAPMESSAGE_TYPE",
+                                                                 "JMS_OBJECTMESSAGE_TYPE",
+                                                                 "JMS_STREAMMESSAGE_TYPE",
+                                                                 "JMS_TEXTMESSAGE_TYPE"};
+    private static enum JMS_DESTINATION_TYPE {JMS_QUEUE, JMS_TEMPORARY_QUEUE, JMS_TOPIC, JMS_TEMPORARY_TOPIC};
+    
+    Connection _connection;
+    Session _session;
+    Queue _queue;
+    MessageConsumer _messageConsumer;
+    JsonObjectBuilder _jsonTestValueMapBuilder;
+    
+    // args[0]: Broker URL
+    // args[1]: Queue name
+    // args[2]: JMS message type
+    // args[3]: JSON Test parameters containing testValuesMap
+    public static void main(String[] args) throws Exception {
+        if (args.length != 4) {
+            System.out.println("JmsReceiverShim: Incorrect number of arguments");
+            System.out.println("JmsReceiverShim: Expected arguments: broker_address, queue_name, JMS_msg_type, JSON_receive_params");
+            System.exit(1);
+        }
+        String brokerAddress = "amqp://" + args[0];
+        String queueName = args[1];
+        String jmsMessageType = args[2];
+        if (!isSupportedJmsMessageType(jmsMessageType)) {
+            System.out.println("ERROR: JmsReceiverShim: Unknown or unsupported JMS message type \"" + jmsMessageType + "\"");
+            System.exit(1);
+        }
+
+        JsonReader jsonReader = Json.createReader(new StringReader(args[3]));
+        JsonObject numTestValuesMap = jsonReader.readObject();
+        jsonReader.close();
+        
+        Receiver shim = new Receiver(brokerAddress, queueName);
+        shim.run(jmsMessageType, numTestValuesMap);
+    }
+
+    public Receiver(String brokerAddress, String queueName) {
+        try {
+            _connection = null;
+            ConnectionFactory factory = (ConnectionFactory)new JmsConnectionFactory(brokerAddress);
+            _connection = factory.createConnection(USER, PASSWORD);
+            _connection.setExceptionListener(new MyExceptionListener());
+            _connection.start();
+
+            _session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            _queue = _session.createQueue(queueName);
+
+            _messageConsumer = _session.createConsumer(_queue);
+
+            _jsonTestValueMapBuilder = Json.createObjectBuilder();
+        } catch (Exception exc) {
+            if (_connection != null)
+                try { _connection.close(); } catch (JMSException e) {}
+            System.out.println("Caught exception, exiting.");
+            exc.printStackTrace(System.out);
+            System.exit(1);
+        }
+    }
+    
+    public void run(String jmsMessageType, JsonObject numTestValuesMap) {
+        try {
+            List<String> subTypeKeyList = new ArrayList<String>(numTestValuesMap.keySet());
+            Collections.sort(subTypeKeyList);
+            
+            Message message = null;
+            
+            for (String subType: subTypeKeyList) {
+                JsonArrayBuilder jasonTestValuesArrayBuilder = Json.createArrayBuilder();
+                for (int i=0; i<numTestValuesMap.getJsonNumber(subType).intValue(); ++i) {
+                    message = _messageConsumer.receive(TIMEOUT);
+                    if (message == null) break;
+                    switch (jmsMessageType) {
+                    case "JMS_MESSAGE_TYPE":
+                        processJMSMessage(jasonTestValuesArrayBuilder);
+                        break;
+                    case "JMS_BYTESMESSAGE_TYPE":
+                        processJMSBytesMessage(jmsMessageType, subType, message, jasonTestValuesArrayBuilder);
+                        break;
+                    case "JMS_STREAMMESSAGE_TYPE":
+                        processJMSStreamMessage(jmsMessageType, subType, message, jasonTestValuesArrayBuilder);
+                        break;
+                    case "JMS_MAPMESSAGE_TYPE":
+                        processJMSMapMessage(jmsMessageType, subType, i, message, jasonTestValuesArrayBuilder);
+                        break;
+                    case "JMS_OBJECTMESSAGE_TYPE":
+                        processJMSObjectMessage(subType, message, jasonTestValuesArrayBuilder);
+                        break;
+                    case "JMS_TEXTMESSAGE_TYPE":
+                        processJMSTextMessage(message, jasonTestValuesArrayBuilder);
+                        break;
+                    default:
+                        _connection.close();
+                        throw new Exception("JmsReceiverShim: Internal error: Unknown or unsupported JMS message type \"" + jmsMessageType + "\"");
+                    }
+                }
+                _jsonTestValueMapBuilder.add(subType, jasonTestValuesArrayBuilder);
+            }
+            _connection.close();
+    
+            System.out.println(jmsMessageType);
+            StringWriter out = new StringWriter();
+            writeJsonObject(_jsonTestValueMapBuilder, out);
+            System.out.println(out.toString());        
+        } catch (Exception exp) {
+            try { _connection.close(); } catch (JMSException e) {}
+            System.out.println("Caught exception, exiting.");
+            exp.printStackTrace(System.out);
+            System.exit(1);
+        }
+    }
+    
+    protected void processJMSMessage(JsonArrayBuilder jasonTestValuesArrayBuilder) {
+        jasonTestValuesArrayBuilder.addNull();        
+    }
+    
+    protected void processJMSBytesMessage(String jmsMessageType, String subType, Message message, JsonArrayBuilder jasonTestValuesArrayBuilder) throws Exception, JMSException, IOException, ClassNotFoundException {
+        switch (subType) {
+        case "boolean":
+            jasonTestValuesArrayBuilder.add(((BytesMessage)message).readBoolean()?"True":"False");
+            break;
+        case "byte":
+            jasonTestValuesArrayBuilder.add(formatByte(((BytesMessage)message).readByte()));
+            break;
+        case "bytes":
+            {
+                byte[] bytesBuff = new byte[65536];
+                int numBytesRead = ((BytesMessage)message).readBytes(bytesBuff);
+                if (numBytesRead >= 0) {
+                    jasonTestValuesArrayBuilder.add(new String(Arrays.copyOfRange(bytesBuff, 0, numBytesRead)));
+                } else {
+                    // NOTE: For this case, an empty byte array has nothing to return
+                    jasonTestValuesArrayBuilder.add(new String());
+                }
+            }
+            break;
+        case "char":
+            jasonTestValuesArrayBuilder.add(formatChar(((BytesMessage)message).readChar()));
+            break;
+        case "double":
+            long l = Double.doubleToRawLongBits(((BytesMessage)message).readDouble());
+            jasonTestValuesArrayBuilder.add(String.format("0x%16s", Long.toHexString(l)).replace(' ', '0'));
+            break;
+        case "float":
+            int i0 = Float.floatToRawIntBits(((BytesMessage)message).readFloat());
+            jasonTestValuesArrayBuilder.add(String.format("0x%8s", Integer.toHexString(i0)).replace(' ', '0'));
+            break;
+        case "int":
+            jasonTestValuesArrayBuilder.add(formatInt(((BytesMessage)message).readInt()));
+            break;
+        case "long":
+            jasonTestValuesArrayBuilder.add(formatLong(((BytesMessage)message).readLong()));
+            break;
+        case "object":
+            {
+                byte[] bytesBuff = new byte[65536];
+                int numBytesRead = ((BytesMessage)message).readBytes(bytesBuff);
+                if (numBytesRead >= 0) {
+                    ByteArrayInputStream bais = new ByteArrayInputStream(Arrays.copyOfRange(bytesBuff, 0, numBytesRead));
+                    ObjectInputStream ois = new ObjectInputStream(bais);
+                    Object obj = ois.readObject();
+                    jasonTestValuesArrayBuilder.add(obj.getClass().getName() + ":" + obj.toString());
+                } else {
+                    jasonTestValuesArrayBuilder.add("<object error>");
+                }
+            }
+            break;
+        case "short":
+            jasonTestValuesArrayBuilder.add(formatShort(((BytesMessage)message).readShort()));
+            break;
+        case "string":
+            jasonTestValuesArrayBuilder.add(((BytesMessage)message).readUTF());
+            break;
+        default:
+            throw new Exception("JmsReceiverShim: Unknown subtype for " + jmsMessageType + ": \"" + subType + "\"");
+        }        
+    }
+    
+    protected void processJMSMapMessage(String jmsMessageType, String subType, int count, Message message, JsonArrayBuilder jasonTestValuesArrayBuilder) throws Exception, JMSException {
+        String name = String.format("%s%03d", subType, count);
+        switch (subType) {
+        case "boolean":
+            jasonTestValuesArrayBuilder.add(((MapMessage)message).getBoolean(name)?"True":"False");
+            break;
+        case "byte":
+            jasonTestValuesArrayBuilder.add(formatByte(((MapMessage)message).getByte(name)));
+            break;
+        case "bytes":
+            jasonTestValuesArrayBuilder.add(new String(((MapMessage)message).getBytes(name)));
+            break;
+        case "char":
+            jasonTestValuesArrayBuilder.add(formatChar(((MapMessage)message).getChar(name)));
+            break;
+        case "double":
+            long l = Double.doubleToRawLongBits(((MapMessage)message).getDouble(name));
+            jasonTestValuesArrayBuilder.add(String.format("0x%16s", Long.toHexString(l)).replace(' ', '0'));
+            break;
+        case "float":
+            int i0 = Float.floatToRawIntBits(((MapMessage)message).getFloat(name));
+            jasonTestValuesArrayBuilder.add(String.format("0x%8s", Integer.toHexString(i0)).replace(' ', '0'));
+            break;
+        case "int":
+            jasonTestValuesArrayBuilder.add(formatInt(((MapMessage)message).getInt(name)));
+            break;
+        case "long":
+            jasonTestValuesArrayBuilder.add(formatLong(((MapMessage)message).getLong(name)));
+            break;
+        case "object":
+            Object obj = ((MapMessage)message).getObject(name);
+            jasonTestValuesArrayBuilder.add(obj.getClass().getName() + ":" + obj.toString());
+            break;
+        case "short":
+            jasonTestValuesArrayBuilder.add(formatShort(((MapMessage)message).getShort(name)));
+            break;
+        case "string":
+            jasonTestValuesArrayBuilder.add(((MapMessage)message).getString(name));
+            break;
+        default:
+            throw new Exception("JmsReceiverShim: Unknown subtype for " + jmsMessageType + ": \"" + subType + "\"");
+        }        
+    }
+    
+    protected void processJMSObjectMessage(String subType, Message message, JsonArrayBuilder jasonTestValuesArrayBuilder) throws JMSException {
+        jasonTestValuesArrayBuilder.add(((ObjectMessage)message).getObject().toString());
+    }
+    
+    protected void processJMSStreamMessage(String jmsMessageType, String subType, Message message, JsonArrayBuilder jasonTestValuesArrayBuilder) throws Exception, JMSException {
+        switch (subType) {
+        case "boolean":
+            jasonTestValuesArrayBuilder.add(((StreamMessage)message).readBoolean()?"True":"False");
+            break;
+        case "byte":
+            jasonTestValuesArrayBuilder.add(formatByte(((StreamMessage)message).readByte()));
+            break;
+        case "bytes":
+            byte[] bytesBuff = new byte[65536];
+            int numBytesRead = ((StreamMessage)message).readBytes(bytesBuff);
+            if (numBytesRead >= 0) {
+                jasonTestValuesArrayBuilder.add(new String(Arrays.copyOfRange(bytesBuff, 0, numBytesRead)));
+            } else {
+                System.out.println("StreamMessage.readBytes() returned " + numBytesRead);
+                jasonTestValuesArrayBuilder.add("<bytes error>");
+            }
+            break;
+        case "char":
+            jasonTestValuesArrayBuilder.add(formatChar(((StreamMessage)message).readChar()));
+            break;
+        case "double":
+            long l = Double.doubleToRawLongBits(((StreamMessage)message).readDouble());
+            jasonTestValuesArrayBuilder.add(String.format("0x%16s", Long.toHexString(l)).replace(' ', '0'));
+            break;
+        case "float":
+            int i0 = Float.floatToRawIntBits(((StreamMessage)message).readFloat());
+            jasonTestValuesArrayBuilder.add(String.format("0x%8s", Integer.toHexString(i0)).replace(' ', '0'));
+            break;
+        case "int":
+            jasonTestValuesArrayBuilder.add(formatInt(((StreamMessage)message).readInt()));
+            break;
+        case "long":
+            jasonTestValuesArrayBuilder.add(formatLong(((StreamMessage)message).readLong()));
+            break;
+        case "object":
+            Object obj = ((StreamMessage)message).readObject();
+            jasonTestValuesArrayBuilder.add(obj.getClass().getName() + ":" + obj.toString());
+            break;
+        case "short":
+            jasonTestValuesArrayBuilder.add(formatShort(((StreamMessage)message).readShort()));
+            break;
+        case "string":
+            jasonTestValuesArrayBuilder.add(((StreamMessage)message).readString());
+            break;
+        default:
+            throw new Exception("JmsReceiverShim: Unknown subtype for " + jmsMessageType + ": \"" + subType + "\"");
+        }        
+    }
+
+    protected void processJMSTextMessage(Message message, JsonArrayBuilder jasonTestValuesArrayBuilder) throws JMSException {
+        jasonTestValuesArrayBuilder.add(((TextMessage)message).getText());
+    }
+
+    protected static void writeJsonObject(JsonObjectBuilder builder, StringWriter out) {
+        JsonWriter jsonWriter = Json.createWriter(out);
+        jsonWriter.writeObject(builder.build());
+        jsonWriter.close();        
+    }
+
+    protected static String formatByte(byte b) {
+        boolean neg = false;
+        if (b < 0) {
+            neg = true;
+            b = (byte)-b;
+        }
+        return String.format("%s0x%x", neg?"-":"", b);
+    }
+    
+    protected static String formatChar(char c) {
+        if (Character.isLetterOrDigit(c)) {
+            return String.format("%c", c);
+        }
+        char[] ca = {c};
+        return new String(ca);
+    }
+    
+    protected static String formatInt(int i) {
+        boolean neg = false;
+        if (i < 0) {
+            neg = true;
+            i = -i;
+        }
+        return String.format("%s0x%x", neg?"-":"", i);
+    }
+    
+    protected static String formatLong(long l) {
+        boolean neg = false;
+        if (l < 0) {
+            neg = true;
+            l = -l;
+        }
+        return String.format("%s0x%x", neg?"-":"", l);
+    }
+    
+    protected static String formatShort(int s) {
+        boolean neg = false;
+        if (s < 0) {
+            neg = true;
+            s = -s;
+        }
+        return String.format("%s0x%x", neg?"-":"", s);
+    }
+        
+    protected static boolean isSupportedJmsMessageType(String jmsMessageType) {
+        for (String supportedJmsMessageType: SUPPORTED_JMS_MESSAGE_TYPES) {
+            if (jmsMessageType.equals(supportedJmsMessageType))
+                return true;
+        }
+    return false;
+    }
+
+    private static class MyExceptionListener implements ExceptionListener {
+        @Override
+        public void onException(JMSException exception) {
+            System.out.println("Connection ExceptionListener fired, exiting.");
+            exception.printStackTrace(System.out);
+            System.exit(1);
+        }
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/jms_dtx_test/Sender.java
----------------------------------------------------------------------
diff --git a/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/jms_dtx_test/Sender.java b/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/jms_dtx_test/Sender.java
new file mode 100644
index 0000000..78dfa4f
--- /dev/null
+++ b/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/jms_dtx_test/Sender.java
@@ -0,0 +1,113 @@
+/**
+ * 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.interop_test.jms_dtx_test;
+
+import java.io.Serializable;
+import java.io.StringReader;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.jms.BytesMessage;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.DeliveryMode;
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import javax.jms.MapMessage;
+import javax.jms.Message;
+import javax.jms.MessageProducer;
+import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.StreamMessage;
+import javax.jms.TextMessage;
+import javax.json.Json;
+import javax.json.JsonArray;
+import javax.json.JsonObject;
+import javax.json.JsonReader;
+import org.apache.qpid.jms.JmsConnectionFactory;
+
+public class Sender {
+    private static final String USER = "guest";
+    private static final String PASSWORD = "guest";
+    private static final String[] SUPPORTED_JMS_MESSAGE_TYPES = {"JMS_MESSAGE_TYPE",
+                                                                 "JMS_BYTESMESSAGE_TYPE",
+                                                                 "JMS_MAPMESSAGE_TYPE",
+                                                                 "JMS_OBJECTMESSAGE_TYPE",
+                                                                 "JMS_STREAMMESSAGE_TYPE",
+                                                                 "JMS_TEXTMESSAGE_TYPE"};
+    Connection _connection;
+    Session _session;
+    Queue _queue;
+    MessageProducer _messageProducer;
+    int _msgsSent;
+    
+
+    // args[0]: Broker URL
+    // args[1]: Queue name
+    // ...
+    public static void main(String[] args) throws Exception {
+        if (args.length != 2) {
+            System.out.println("JmsSenderShim: Incorrect number of arguments");
+            System.out.println("JmsSenderShim: Expected arguments: broker_address, queue_name, ...");
+            System.exit(1);
+        }
+        String brokerAddress = "amqp://" + args[0];
+        String queueName = args[1];
+
+        Sender shim = new Sender(brokerAddress, queueName);
+        shim.runTests();
+    }
+
+    public Sender(String brokerAddress, String queueName) {
+        try {
+            ConnectionFactory factory = (ConnectionFactory)new JmsConnectionFactory(brokerAddress);
+
+            _connection = factory.createConnection();
+            _connection.setExceptionListener(new MyExceptionListener());
+            _connection.start();
+
+            _session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            _queue = _session.createQueue(queueName);
+
+            _messageProducer = _session.createProducer(_queue);
+            
+            _msgsSent = 0;
+        } catch (Exception exp) {
+            System.out.println("Caught exception, exiting.");
+            exp.printStackTrace(System.out);
+            System.exit(1);
+        }
+    }
+
+    public void runTests() throws Exception {
+        _connection.close();
+    }
+    
+
+    private static class MyExceptionListener implements ExceptionListener {
+        @Override
+        public void onException(JMSException exception) {
+            System.out.println("Connection ExceptionListener fired, exiting.");
+            exception.printStackTrace(System.out);
+            System.exit(1);
+        }
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/jms_large_content_test/Receiver.java
----------------------------------------------------------------------
diff --git a/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/jms_large_content_test/Receiver.java b/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/jms_large_content_test/Receiver.java
new file mode 100644
index 0000000..0eed5ef
--- /dev/null
+++ b/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/jms_large_content_test/Receiver.java
@@ -0,0 +1,407 @@
+/**
+ * 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.interop_test.jms_large_content_test;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+import javax.jms.BytesMessage;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.Destination;
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import javax.jms.MapMessage;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.StreamMessage;
+import javax.jms.TextMessage;
+import javax.jms.Topic;
+import javax.json.Json;
+import javax.json.JsonArray;
+import javax.json.JsonArrayBuilder;
+import javax.json.JsonObject;
+import javax.json.JsonObjectBuilder;
+import javax.json.JsonReader;
+import javax.json.JsonWriter;
+import org.apache.qpid.jms.JmsConnectionFactory;
+
+public class Receiver {
+    private static final String USER = "guest";
+    private static final String PASSWORD = "guest";
+    private static final int TIMEOUT = 1000;
+    private static final String[] SUPPORTED_JMS_MESSAGE_TYPES = {"JMS_MESSAGE_TYPE",
+                                                                 "JMS_BYTESMESSAGE_TYPE",
+                                                                 "JMS_MAPMESSAGE_TYPE",
+                                                                 "JMS_OBJECTMESSAGE_TYPE",
+                                                                 "JMS_STREAMMESSAGE_TYPE",
+                                                                 "JMS_TEXTMESSAGE_TYPE"};
+    private static enum JMS_DESTINATION_TYPE {JMS_QUEUE, JMS_TEMPORARY_QUEUE, JMS_TOPIC, JMS_TEMPORARY_TOPIC};
+    
+    Connection _connection;
+    Session _session;
+    Queue _queue;
+    MessageConsumer _messageConsumer;
+    JsonObjectBuilder _jsonTestValueMapBuilder;
+    
+    // args[0]: Broker URL
+    // args[1]: Queue name
+    // args[2]: JMS message type
+    // args[3]: JSON Test parameters containing testValuesMap
+    public static void main(String[] args) throws Exception {
+        if (args.length != 4) {
+            System.out.println("JmsReceiverShim: Incorrect number of arguments");
+            System.out.println("JmsReceiverShim: Expected arguments: broker_address, queue_name, JMS_msg_type, JSON_receive_params");
+            System.exit(1);
+        }
+        String brokerAddress = "amqp://" + args[0];
+        String queueName = args[1];
+        String jmsMessageType = args[2];
+        if (!isSupportedJmsMessageType(jmsMessageType)) {
+            System.out.println("ERROR: JmsReceiverShim: Unknown or unsupported JMS message type \"" + jmsMessageType + "\"");
+            System.exit(1);
+        }
+
+        JsonReader jsonReader = Json.createReader(new StringReader(args[3]));
+        JsonObject numTestValuesMap = jsonReader.readObject();
+        jsonReader.close();
+        
+        Receiver shim = new Receiver(brokerAddress, queueName);
+        shim.run(jmsMessageType, numTestValuesMap);
+    }
+
+    public Receiver(String brokerAddress, String queueName) {
+        try {
+            _connection = null;
+            ConnectionFactory factory = (ConnectionFactory)new JmsConnectionFactory(brokerAddress);
+            _connection = factory.createConnection(USER, PASSWORD);
+            _connection.setExceptionListener(new MyExceptionListener());
+            _connection.start();
+
+            _session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            _queue = _session.createQueue(queueName);
+
+            _messageConsumer = _session.createConsumer(_queue);
+
+            _jsonTestValueMapBuilder = Json.createObjectBuilder();
+        } catch (Exception exc) {
+            if (_connection != null)
+                try { _connection.close(); } catch (JMSException e) {}
+            System.out.println("Caught exception, exiting.");
+            exc.printStackTrace(System.out);
+            System.exit(1);
+        }
+    }
+    
+    public void run(String jmsMessageType, JsonObject numTestValuesMap) {
+        try {
+            List<String> subTypeKeyList = new ArrayList<String>(numTestValuesMap.keySet());
+            Collections.sort(subTypeKeyList);
+            
+            Message message = null;
+            
+            for (String subType: subTypeKeyList) {
+                JsonArrayBuilder jasonTestValuesArrayBuilder = Json.createArrayBuilder();
+                for (int i=0; i<numTestValuesMap.getJsonNumber(subType).intValue(); ++i) {
+                    message = _messageConsumer.receive(TIMEOUT);
+                    if (message == null) break;
+                    switch (jmsMessageType) {
+                    case "JMS_MESSAGE_TYPE":
+                        processJMSMessage(jasonTestValuesArrayBuilder);
+                        break;
+                    case "JMS_BYTESMESSAGE_TYPE":
+                        processJMSBytesMessage(jmsMessageType, subType, message, jasonTestValuesArrayBuilder);
+                        break;
+                    case "JMS_STREAMMESSAGE_TYPE":
+                        processJMSStreamMessage(jmsMessageType, subType, message, jasonTestValuesArrayBuilder);
+                        break;
+                    case "JMS_MAPMESSAGE_TYPE":
+                        processJMSMapMessage(jmsMessageType, subType, i, message, jasonTestValuesArrayBuilder);
+                        break;
+                    case "JMS_OBJECTMESSAGE_TYPE":
+                        processJMSObjectMessage(subType, message, jasonTestValuesArrayBuilder);
+                        break;
+                    case "JMS_TEXTMESSAGE_TYPE":
+                        processJMSTextMessage(message, jasonTestValuesArrayBuilder);
+                        break;
+                    default:
+                        _connection.close();
+                        throw new Exception("JmsReceiverShim: Internal error: Unknown or unsupported JMS message type \"" + jmsMessageType + "\"");
+                    }
+                }
+                _jsonTestValueMapBuilder.add(subType, jasonTestValuesArrayBuilder);
+            }
+            _connection.close();
+    
+            System.out.println(jmsMessageType);
+            StringWriter out = new StringWriter();
+            writeJsonObject(_jsonTestValueMapBuilder, out);
+            System.out.println(out.toString());        
+        } catch (Exception exp) {
+            try { _connection.close(); } catch (JMSException e) {}
+            System.out.println("Caught exception, exiting.");
+            exp.printStackTrace(System.out);
+            System.exit(1);
+        }
+    }
+    
+    protected void processJMSMessage(JsonArrayBuilder jasonTestValuesArrayBuilder) {
+        jasonTestValuesArrayBuilder.addNull();        
+    }
+    
+    protected void processJMSBytesMessage(String jmsMessageType, String subType, Message message, JsonArrayBuilder jasonTestValuesArrayBuilder) throws Exception, JMSException, IOException, ClassNotFoundException {
+        switch (subType) {
+        case "boolean":
+            jasonTestValuesArrayBuilder.add(((BytesMessage)message).readBoolean()?"True":"False");
+            break;
+        case "byte":
+            jasonTestValuesArrayBuilder.add(formatByte(((BytesMessage)message).readByte()));
+            break;
+        case "bytes":
+            {
+                byte[] bytesBuff = new byte[65536];
+                int numBytesRead = ((BytesMessage)message).readBytes(bytesBuff);
+                if (numBytesRead >= 0) {
+                    jasonTestValuesArrayBuilder.add(new String(Arrays.copyOfRange(bytesBuff, 0, numBytesRead)));
+                } else {
+                    // NOTE: For this case, an empty byte array has nothing to return
+                    jasonTestValuesArrayBuilder.add(new String());
+                }
+            }
+            break;
+        case "char":
+            jasonTestValuesArrayBuilder.add(formatChar(((BytesMessage)message).readChar()));
+            break;
+        case "double":
+            long l = Double.doubleToRawLongBits(((BytesMessage)message).readDouble());
+            jasonTestValuesArrayBuilder.add(String.format("0x%16s", Long.toHexString(l)).replace(' ', '0'));
+            break;
+        case "float":
+            int i0 = Float.floatToRawIntBits(((BytesMessage)message).readFloat());
+            jasonTestValuesArrayBuilder.add(String.format("0x%8s", Integer.toHexString(i0)).replace(' ', '0'));
+            break;
+        case "int":
+            jasonTestValuesArrayBuilder.add(formatInt(((BytesMessage)message).readInt()));
+            break;
+        case "long":
+            jasonTestValuesArrayBuilder.add(formatLong(((BytesMessage)message).readLong()));
+            break;
+        case "object":
+            {
+                byte[] bytesBuff = new byte[65536];
+                int numBytesRead = ((BytesMessage)message).readBytes(bytesBuff);
+                if (numBytesRead >= 0) {
+                    ByteArrayInputStream bais = new ByteArrayInputStream(Arrays.copyOfRange(bytesBuff, 0, numBytesRead));
+                    ObjectInputStream ois = new ObjectInputStream(bais);
+                    Object obj = ois.readObject();
+                    jasonTestValuesArrayBuilder.add(obj.getClass().getName() + ":" + obj.toString());
+                } else {
+                    jasonTestValuesArrayBuilder.add("<object error>");
+                }
+            }
+            break;
+        case "short":
+            jasonTestValuesArrayBuilder.add(formatShort(((BytesMessage)message).readShort()));
+            break;
+        case "string":
+            jasonTestValuesArrayBuilder.add(((BytesMessage)message).readUTF());
+            break;
+        default:
+            throw new Exception("JmsReceiverShim: Unknown subtype for " + jmsMessageType + ": \"" + subType + "\"");
+        }        
+    }
+    
+    protected void processJMSMapMessage(String jmsMessageType, String subType, int count, Message message, JsonArrayBuilder jasonTestValuesArrayBuilder) throws Exception, JMSException {
+        String name = String.format("%s%03d", subType, count);
+        switch (subType) {
+        case "boolean":
+            jasonTestValuesArrayBuilder.add(((MapMessage)message).getBoolean(name)?"True":"False");
+            break;
+        case "byte":
+            jasonTestValuesArrayBuilder.add(formatByte(((MapMessage)message).getByte(name)));
+            break;
+        case "bytes":
+            jasonTestValuesArrayBuilder.add(new String(((MapMessage)message).getBytes(name)));
+            break;
+        case "char":
+            jasonTestValuesArrayBuilder.add(formatChar(((MapMessage)message).getChar(name)));
+            break;
+        case "double":
+            long l = Double.doubleToRawLongBits(((MapMessage)message).getDouble(name));
+            jasonTestValuesArrayBuilder.add(String.format("0x%16s", Long.toHexString(l)).replace(' ', '0'));
+            break;
+        case "float":
+            int i0 = Float.floatToRawIntBits(((MapMessage)message).getFloat(name));
+            jasonTestValuesArrayBuilder.add(String.format("0x%8s", Integer.toHexString(i0)).replace(' ', '0'));
+            break;
+        case "int":
+            jasonTestValuesArrayBuilder.add(formatInt(((MapMessage)message).getInt(name)));
+            break;
+        case "long":
+            jasonTestValuesArrayBuilder.add(formatLong(((MapMessage)message).getLong(name)));
+            break;
+        case "object":
+            Object obj = ((MapMessage)message).getObject(name);
+            jasonTestValuesArrayBuilder.add(obj.getClass().getName() + ":" + obj.toString());
+            break;
+        case "short":
+            jasonTestValuesArrayBuilder.add(formatShort(((MapMessage)message).getShort(name)));
+            break;
+        case "string":
+            jasonTestValuesArrayBuilder.add(((MapMessage)message).getString(name));
+            break;
+        default:
+            throw new Exception("JmsReceiverShim: Unknown subtype for " + jmsMessageType + ": \"" + subType + "\"");
+        }        
+    }
+    
+    protected void processJMSObjectMessage(String subType, Message message, JsonArrayBuilder jasonTestValuesArrayBuilder) throws JMSException {
+        jasonTestValuesArrayBuilder.add(((ObjectMessage)message).getObject().toString());
+    }
+    
+    protected void processJMSStreamMessage(String jmsMessageType, String subType, Message message, JsonArrayBuilder jasonTestValuesArrayBuilder) throws Exception, JMSException {
+        switch (subType) {
+        case "boolean":
+            jasonTestValuesArrayBuilder.add(((StreamMessage)message).readBoolean()?"True":"False");
+            break;
+        case "byte":
+            jasonTestValuesArrayBuilder.add(formatByte(((StreamMessage)message).readByte()));
+            break;
+        case "bytes":
+            byte[] bytesBuff = new byte[65536];
+            int numBytesRead = ((StreamMessage)message).readBytes(bytesBuff);
+            if (numBytesRead >= 0) {
+                jasonTestValuesArrayBuilder.add(new String(Arrays.copyOfRange(bytesBuff, 0, numBytesRead)));
+            } else {
+                System.out.println("StreamMessage.readBytes() returned " + numBytesRead);
+                jasonTestValuesArrayBuilder.add("<bytes error>");
+            }
+            break;
+        case "char":
+            jasonTestValuesArrayBuilder.add(formatChar(((StreamMessage)message).readChar()));
+            break;
+        case "double":
+            long l = Double.doubleToRawLongBits(((StreamMessage)message).readDouble());
+            jasonTestValuesArrayBuilder.add(String.format("0x%16s", Long.toHexString(l)).replace(' ', '0'));
+            break;
+        case "float":
+            int i0 = Float.floatToRawIntBits(((StreamMessage)message).readFloat());
+            jasonTestValuesArrayBuilder.add(String.format("0x%8s", Integer.toHexString(i0)).replace(' ', '0'));
+            break;
+        case "int":
+            jasonTestValuesArrayBuilder.add(formatInt(((StreamMessage)message).readInt()));
+            break;
+        case "long":
+            jasonTestValuesArrayBuilder.add(formatLong(((StreamMessage)message).readLong()));
+            break;
+        case "object":
+            Object obj = ((StreamMessage)message).readObject();
+            jasonTestValuesArrayBuilder.add(obj.getClass().getName() + ":" + obj.toString());
+            break;
+        case "short":
+            jasonTestValuesArrayBuilder.add(formatShort(((StreamMessage)message).readShort()));
+            break;
+        case "string":
+            jasonTestValuesArrayBuilder.add(((StreamMessage)message).readString());
+            break;
+        default:
+            throw new Exception("JmsReceiverShim: Unknown subtype for " + jmsMessageType + ": \"" + subType + "\"");
+        }        
+    }
+
+    protected void processJMSTextMessage(Message message, JsonArrayBuilder jasonTestValuesArrayBuilder) throws JMSException {
+        jasonTestValuesArrayBuilder.add(((TextMessage)message).getText());
+    }
+
+    protected static void writeJsonObject(JsonObjectBuilder builder, StringWriter out) {
+        JsonWriter jsonWriter = Json.createWriter(out);
+        jsonWriter.writeObject(builder.build());
+        jsonWriter.close();        
+    }
+
+    protected static String formatByte(byte b) {
+        boolean neg = false;
+        if (b < 0) {
+            neg = true;
+            b = (byte)-b;
+        }
+        return String.format("%s0x%x", neg?"-":"", b);
+    }
+    
+    protected static String formatChar(char c) {
+        if (Character.isLetterOrDigit(c)) {
+            return String.format("%c", c);
+        }
+        char[] ca = {c};
+        return new String(ca);
+    }
+    
+    protected static String formatInt(int i) {
+        boolean neg = false;
+        if (i < 0) {
+            neg = true;
+            i = -i;
+        }
+        return String.format("%s0x%x", neg?"-":"", i);
+    }
+    
+    protected static String formatLong(long l) {
+        boolean neg = false;
+        if (l < 0) {
+            neg = true;
+            l = -l;
+        }
+        return String.format("%s0x%x", neg?"-":"", l);
+    }
+    
+    protected static String formatShort(int s) {
+        boolean neg = false;
+        if (s < 0) {
+            neg = true;
+            s = -s;
+        }
+        return String.format("%s0x%x", neg?"-":"", s);
+    }
+        
+    protected static boolean isSupportedJmsMessageType(String jmsMessageType) {
+        for (String supportedJmsMessageType: SUPPORTED_JMS_MESSAGE_TYPES) {
+            if (jmsMessageType.equals(supportedJmsMessageType))
+                return true;
+        }
+    return false;
+    }
+
+    private static class MyExceptionListener implements ExceptionListener {
+        @Override
+        public void onException(JMSException exception) {
+            System.out.println("Connection ExceptionListener fired, exiting.");
+            exception.printStackTrace(System.out);
+            System.exit(1);
+        }
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/jms_large_content_test/Sender.java
----------------------------------------------------------------------
diff --git a/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/jms_large_content_test/Sender.java b/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/jms_large_content_test/Sender.java
new file mode 100644
index 0000000..41f5ee8
--- /dev/null
+++ b/shims/qpid-jms/src/main/java/org/apache/qpid/qpid_interop_test/jms_large_content_test/Sender.java
@@ -0,0 +1,113 @@
+/**
+ * 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.interop_test.jms_large_content_test;
+
+import java.io.Serializable;
+import java.io.StringReader;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.jms.BytesMessage;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.DeliveryMode;
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import javax.jms.MapMessage;
+import javax.jms.Message;
+import javax.jms.MessageProducer;
+import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.StreamMessage;
+import javax.jms.TextMessage;
+import javax.json.Json;
+import javax.json.JsonArray;
+import javax.json.JsonObject;
+import javax.json.JsonReader;
+import org.apache.qpid.jms.JmsConnectionFactory;
+
+public class Sender {
+    private static final String USER = "guest";
+    private static final String PASSWORD = "guest";
+    private static final String[] SUPPORTED_JMS_MESSAGE_TYPES = {"JMS_MESSAGE_TYPE",
+                                                                 "JMS_BYTESMESSAGE_TYPE",
+                                                                 "JMS_MAPMESSAGE_TYPE",
+                                                                 "JMS_OBJECTMESSAGE_TYPE",
+                                                                 "JMS_STREAMMESSAGE_TYPE",
+                                                                 "JMS_TEXTMESSAGE_TYPE"};
+    Connection _connection;
+    Session _session;
+    Queue _queue;
+    MessageProducer _messageProducer;
+    int _msgsSent;
+    
+
+    // args[0]: Broker URL
+    // args[1]: Queue name
+    // ...
+    public static void main(String[] args) throws Exception {
+        if (args.length != 2) {
+            System.out.println("JmsSenderShim: Incorrect number of arguments");
+            System.out.println("JmsSenderShim: Expected arguments: broker_address, queue_name, ...");
+            System.exit(1);
+        }
+        String brokerAddress = "amqp://" + args[0];
+        String queueName = args[1];
+
+        Sender shim = new Sender(brokerAddress, queueName);
+        shim.runTests();
+    }
+
+    public Sender(String brokerAddress, String queueName) {
+        try {
+            ConnectionFactory factory = (ConnectionFactory)new JmsConnectionFactory(brokerAddress);
+
+            _connection = factory.createConnection();
+            _connection.setExceptionListener(new MyExceptionListener());
+            _connection.start();
+
+            _session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+            _queue = _session.createQueue(queueName);
+
+            _messageProducer = _session.createProducer(_queue);
+            
+            _msgsSent = 0;
+        } catch (Exception exp) {
+            System.out.println("Caught exception, exiting.");
+            exp.printStackTrace(System.out);
+            System.exit(1);
+        }
+    }
+
+    public void runTests() throws Exception {
+        _connection.close();
+    }
+    
+
+    private static class MyExceptionListener implements ExceptionListener {
+        @Override
+        public void onException(JMSException exception) {
+            System.out.println("Connection ExceptionListener fired, exiting.");
+            exception.printStackTrace(System.out);
+            System.exit(1);
+        }
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/CMakeLists.txt b/shims/qpid-proton-cpp/src/CMakeLists.txt
index f6b11a0..efd5549 100644
--- a/shims/qpid-proton-cpp/src/CMakeLists.txt
+++ b/shims/qpid-proton-cpp/src/CMakeLists.txt
@@ -24,129 +24,102 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 link_directories(${PROTON_INSTALL_DIR}/lib64)
 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
-# --- Common files and libs ---
-
-set(Common_SOURCES
-    qpidit/QpidItErrors.hpp
-    qpidit/QpidItErrors.cpp
-)
 
-set(Common_Jms_SOURCES
-    qpidit/JmsTestBase.hpp
-    qpidit/JmsTestBase.cpp
-)
-
-set(Common_LIBS
-    qpid-proton-cpp
-    jsoncpp
-)
-
-
-# -----------------------
-# --- amqp_types_test ---
-# -----------------------
 
+function(addTest testName)
 # --- Sender ---
 
-set(amqp_types_test_Sender_SOURCES
+set(${testName}_Sender_SOURCES
     ${Common_SOURCES}
-    qpidit/amqp_types_test/Sender.hpp
-    qpidit/amqp_types_test/Sender.cpp
+    qpidit/${testName}/Sender.hpp
+    qpidit/${testName}/Sender.cpp
 )
 
-add_executable(amqp_types_test_Sender ${amqp_types_test_Sender_SOURCES})
-target_link_libraries(amqp_types_test_Sender ${Common_LIBS})
-set_target_properties(amqp_types_test_Sender PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/amqp_types_test"
+add_executable(${testName}_Sender ${${testName}_Sender_SOURCES})
+target_link_libraries(${testName}_Sender ${Common_LIBS})
+set_target_properties(${testName}_Sender PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${testName}"
     OUTPUT_NAME Sender
 )
 
 # --- Receiver ---
 
-set(amqp_types_test_Receiver_SOURCES
+set(${testName}_Receiver_SOURCES
     ${Common_SOURCES}
-    qpidit/amqp_types_test/Receiver.hpp
-    qpidit/amqp_types_test/Receiver.cpp
+    qpidit/${testName}/Receiver.hpp
+    qpidit/${testName}/Receiver.cpp
 )
 
-add_executable(amqp_types_test_Receiver ${amqp_types_test_Receiver_SOURCES})
-target_link_libraries(amqp_types_test_Receiver ${Common_LIBS})
-set_target_properties(amqp_types_test_Receiver PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/amqp_types_test"
+add_executable(${testName}_Receiver ${${testName}_Receiver_SOURCES})
+target_link_libraries(${testName}_Receiver ${Common_LIBS})
+set_target_properties(${testName}_Receiver PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${testName}"
     OUTPUT_NAME Receiver
 )
 
+endfunction(addTest)
 
-# ---------------------------
-# --- jms_hdrs_props_test ---
-# ---------------------------
 
+
+function(addJMSTest testName)
 # --- Sender ---
 
-set(jms_hdrs_props_test_Sender_SOURCES
+set(${testName}_Sender_SOURCES
     ${Common_SOURCES}
     ${Common_Jms_SOURCES}
-    qpidit/jms_hdrs_props_test/Sender.hpp
-    qpidit/jms_hdrs_props_test/Sender.cpp
+    qpidit/${testName}/Sender.hpp
+    qpidit/${testName}/Sender.cpp
 )
 
-add_executable(jms_hdrs_props_test_Sender ${jms_hdrs_props_test_Sender_SOURCES})
-target_link_libraries(jms_hdrs_props_test_Sender ${Common_LIBS})
-set_target_properties(jms_hdrs_props_test_Sender PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/jms_hdrs_props_test"
+add_executable(${testName}_Sender ${${testName}_Sender_SOURCES})
+target_link_libraries(${testName}_Sender ${Common_LIBS})
+set_target_properties(${testName}_Sender PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${testName}"
     OUTPUT_NAME Sender
 )
 
 # --- Receiver ---
 
-set(jms_hdrs_props_test_Receiver_SOURCES
+set(${testName}_Receiver_SOURCES
     ${Common_SOURCES}
     ${Common_Jms_SOURCES}
-    qpidit/jms_hdrs_props_test/Receiver.hpp
-    qpidit/jms_hdrs_props_test/Receiver.cpp
+    qpidit/${testName}/Receiver.hpp
+    qpidit/${testName}/Receiver.cpp
 )
 
-add_executable(jms_hdrs_props_test_Receiver ${jms_hdrs_props_test_Receiver_SOURCES})
-target_link_libraries(jms_hdrs_props_test_Receiver ${Common_LIBS})
-set_target_properties(jms_hdrs_props_test_Receiver PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/jms_hdrs_props_test"
+add_executable(${testName}_Receiver ${${testName}_Receiver_SOURCES})
+target_link_libraries(${testName}_Receiver ${Common_LIBS})
+set_target_properties(${testName}_Receiver PROPERTIES
+    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${testName}"
     OUTPUT_NAME Receiver
 )
 
+endfunction(addJMSTest)
 
-# -------------------------
-# --- jms_messages_test ---
-# -------------------------
 
-# --- Sender ---
+# --- Common files and libs ---
 
-set(jms_messages_test_Sender_SOURCES
-    ${Common_SOURCES}
-    ${Common_Jms_SOURCES}
-    qpidit/jms_messages_test/Sender.hpp
-    qpidit/jms_messages_test/Sender.cpp
+set(Common_SOURCES
+    qpidit/QpidItErrors.hpp
+    qpidit/QpidItErrors.cpp
 )
 
-add_executable(jms_messages_test_Sender ${jms_messages_test_Sender_SOURCES})
-target_link_libraries(jms_messages_test_Sender ${Common_LIBS})
-set_target_properties(jms_messages_test_Sender PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/jms_messages_test"
-    OUTPUT_NAME Sender
+set(Common_Jms_SOURCES
+    qpidit/JmsTestBase.hpp
+    qpidit/JmsTestBase.cpp
 )
 
-# --- Receiver ---
-
-set(jms_messages_test_Receiver_SOURCES
-    ${Common_SOURCES}
-    ${Common_Jms_SOURCES}
-    qpidit/jms_messages_test/Receiver.hpp
-    qpidit/jms_messages_test/Receiver.cpp
+set(Common_LIBS
+    qpid-proton-cpp
+    jsoncpp
 )
 
-add_executable(jms_messages_test_Receiver ${jms_messages_test_Receiver_SOURCES})
-target_link_libraries(jms_messages_test_Receiver ${Common_LIBS})
-set_target_properties(jms_messages_test_Receiver PROPERTIES
-    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/jms_messages_test"
-    OUTPUT_NAME Receiver
-)
 
+addTest(amqp_types_test)
+addTest(amqp_features_test)
+addTest(amqp_large_content_test)
+addTest(amqp_dtx_test)
+addJMSTest(jms_messages_test)
+addJMSTest(jms_hdrs_props_test)
+addJMSTest(jms_large_content_test)
+addJMSTest(jms_dtx_test)

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/amqp_dtx_test/Receiver.cpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/amqp_dtx_test/Receiver.cpp b/shims/qpid-proton-cpp/src/qpidit/amqp_dtx_test/Receiver.cpp
new file mode 100644
index 0000000..eb5dbed
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/amqp_dtx_test/Receiver.cpp
@@ -0,0 +1,43 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpidit/amqp_dtx_test/Receiver.hpp"
+
+#include <stdlib.h> // exit()
+
+namespace qpidit
+{
+    namespace amqp_dtx_test
+    {
+    } /* namespace amqp_dtx_test */
+} /* namespace qpidit */
+
+
+/*
+ * --- main ---
+ * Args: 1: Broker address (ip-addr:port)
+ *       2: Queue name
+ *       ...
+ */
+
+int main(int argc, char** argv) {
+    exit(0);
+}

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/amqp_dtx_test/Receiver.hpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/amqp_dtx_test/Receiver.hpp b/shims/qpid-proton-cpp/src/qpidit/amqp_dtx_test/Receiver.hpp
new file mode 100644
index 0000000..d1bf8de
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/amqp_dtx_test/Receiver.hpp
@@ -0,0 +1,39 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#ifndef SRC_QPIDIT_AMQP_DTX_TEST_RECEIVER_HPP_
+#define SRC_QPIDIT_AMQP_DTX_TEST_RECEIVER_HPP_
+
+#include "proton/messaging_handler.hpp"
+
+namespace qpidit
+{
+    namespace amqp_dtx_test
+    {
+
+        class Receiver : public proton::messaging_handler
+        {
+        };
+
+    } /* namespace amqp_dtx_test */
+} /* namespace qpidit */
+
+#endif /* SRC_QPIDIT_AMQP_DTX_TEST_RECEIVER_HPP_ */


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


[2/3] qpid-interop-test git commit: QPIDIT-43 QPIDIT-44 QPIDIT-45: Added framework for new tests: AMQP features test, AMQP and JMS DTX and large content tests

Posted by kp...@apache.org.
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/amqp_dtx_test/Sender.cpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/amqp_dtx_test/Sender.cpp b/shims/qpid-proton-cpp/src/qpidit/amqp_dtx_test/Sender.cpp
new file mode 100644
index 0000000..4463954
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/amqp_dtx_test/Sender.cpp
@@ -0,0 +1,43 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpidit/amqp_dtx_test/Sender.hpp"
+
+#include <stdlib.h> // exit()
+
+namespace qpidit
+{
+    namespace amqp_dtx_test
+    {
+    } /* namespace amqp_dtx_test */
+} /* namespace qpidit */
+
+
+/*
+ * --- main ---
+ * Args: 1: Broker address (ip-addr:port)
+ *       2: Queue name
+ *       ...
+ */
+
+int main(int argc, char** argv) {
+    exit(0);
+}

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/amqp_dtx_test/Sender.hpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/amqp_dtx_test/Sender.hpp b/shims/qpid-proton-cpp/src/qpidit/amqp_dtx_test/Sender.hpp
new file mode 100644
index 0000000..1c2e0a3
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/amqp_dtx_test/Sender.hpp
@@ -0,0 +1,39 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#ifndef SRC_QPIDIT_AMQP_DTX_TEST_SENDER_HPP_
+#define SRC_QPIDIT_AMQP_DTX_TEST_SENDER_HPP_
+
+#include "proton/messaging_handler.hpp"
+
+namespace qpidit
+{
+    namespace amqp_dtx_test
+    {
+
+        class Sender : public proton::messaging_handler
+        {
+        };
+
+    } /* namespace amqp_dtx_test */
+} /* namespace qpidit */
+
+#endif /* SRC_QPIDIT_AMQP_DTX_TEST_SENDER_HPP_ */

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/amqp_features_test/Receiver.cpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/amqp_features_test/Receiver.cpp b/shims/qpid-proton-cpp/src/qpidit/amqp_features_test/Receiver.cpp
new file mode 100644
index 0000000..923b198
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/amqp_features_test/Receiver.cpp
@@ -0,0 +1,43 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpidit/amqp_features_test/Receiver.hpp"
+
+#include <stdlib.h> // exit()
+
+namespace qpidit
+{
+    namespace amqp_features_test
+    {
+    } /* namespace amqp_features_test */
+} /* namespace qpidit */
+
+
+/*
+ * --- main ---
+ * Args: 1: Broker address (ip-addr:port)
+ *       2: Queue name
+ *       ...
+ */
+
+int main(int argc, char** argv) {
+    exit(0);
+}

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/amqp_features_test/Receiver.hpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/amqp_features_test/Receiver.hpp b/shims/qpid-proton-cpp/src/qpidit/amqp_features_test/Receiver.hpp
new file mode 100644
index 0000000..71d7757
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/amqp_features_test/Receiver.hpp
@@ -0,0 +1,39 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#ifndef SRC_QPIDIT_AMQP_FEATURES_TEST_RECEIVER_HPP_
+#define SRC_QPIDIT_AMQP_FEATURES_TEST_RECEIVER_HPP_
+
+#include "proton/messaging_handler.hpp"
+
+namespace qpidit
+{
+    namespace amqp_features_test
+    {
+
+        class Receiver : public proton::messaging_handler
+        {
+        };
+
+    } /* namespace amqp_features_test */
+} /* namespace qpidit */
+
+#endif /* SRC_QPIDIT_AMQP_FEATURES_TEST_RECEIVER_HPP_ */

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/amqp_features_test/Sender.cpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/amqp_features_test/Sender.cpp b/shims/qpid-proton-cpp/src/qpidit/amqp_features_test/Sender.cpp
new file mode 100644
index 0000000..9a81ef8
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/amqp_features_test/Sender.cpp
@@ -0,0 +1,44 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpidit/amqp_features_test/Sender.hpp"
+
+#include <stdlib.h> // exit()
+
+
+namespace qpidit
+{
+    namespace amqp_features_test
+    {
+    } /* namespace amqp_features_test */
+} /* namespace qpidit */
+
+
+/*
+ * --- main ---
+ * Args: 1: Broker address (ip-addr:port)
+ *       2: Queue name
+ *       ...
+ */
+
+int main(int argc, char** argv) {
+    exit(0);
+}

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/amqp_features_test/Sender.hpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/amqp_features_test/Sender.hpp b/shims/qpid-proton-cpp/src/qpidit/amqp_features_test/Sender.hpp
new file mode 100644
index 0000000..05c9bf1
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/amqp_features_test/Sender.hpp
@@ -0,0 +1,39 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#ifndef SRC_QPIDIT_AMQP_DTX_TEST_SENDER_HPP_
+#define SRC_QPIDIT_AMQP_DTX_TEST_SENDER_HPP_
+
+#include "proton/messaging_handler.hpp"
+
+namespace qpidit
+{
+    namespace amqp_features_test
+    {
+
+        class Sender : public proton::messaging_handler
+        {
+        };
+
+    } /* namespace amqp_features_test */
+} /* namespace qpidit */
+
+#endif /* SRC_QPIDIT_AMQP_DTX_TEST_SENDER_HPP_ */

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Receiver.cpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Receiver.cpp b/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Receiver.cpp
new file mode 100644
index 0000000..f7d7a4b
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Receiver.cpp
@@ -0,0 +1,43 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpidit/amqp_large_content_test/Receiver.hpp"
+
+#include <stdlib.h> // exit()
+
+namespace qpidit
+{
+    namespace amqp_large_content_test
+    {
+    } /* namespace amqp_large_content_test */
+} /* namespace qpidit */
+
+
+/*
+ * --- main ---
+ * Args: 1: Broker address (ip-addr:port)
+ *       2: Queue name
+ *       ...
+ */
+
+int main(int argc, char** argv) {
+    exit(0);
+}

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Receiver.hpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Receiver.hpp b/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Receiver.hpp
new file mode 100644
index 0000000..1e56457
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Receiver.hpp
@@ -0,0 +1,39 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#ifndef SRC_QPIDIT_AMQP_LARGE_CONTENT_TEST_RECEIVER_HPP_
+#define SRC_QPIDIT_AMQP_LARGE_CONTENT_TEST_RECEIVER_HPP_
+
+#include "proton/messaging_handler.hpp"
+
+namespace qpidit
+{
+    namespace amqp_large_content_test
+    {
+
+        class Receiver : public proton::messaging_handler
+        {
+        };
+
+    } /* namespace amqp_large_content_test */
+} /* namespace qpidit */
+
+#endif /* SRC_QPIDIT_AMQP_LARGE_CONTENT_TEST_RECEIVER_HPP_ */

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Sender.cpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Sender.cpp b/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Sender.cpp
new file mode 100644
index 0000000..dd86497
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Sender.cpp
@@ -0,0 +1,43 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpidit/amqp_large_content_test/Sender.hpp"
+
+#include <stdlib.h> // exit()
+
+namespace qpidit
+{
+    namespace amqp_large_content_test
+    {
+    } /* namespace amqp_large_content_test */
+} /* namespace qpidit */
+
+
+/*
+ * --- main ---
+ * Args: 1: Broker address (ip-addr:port)
+ *       2: Queue name
+ *       ...
+ */
+
+int main(int argc, char** argv) {
+    exit(0);
+}

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Sender.hpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Sender.hpp b/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Sender.hpp
new file mode 100644
index 0000000..887aec8
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/amqp_large_content_test/Sender.hpp
@@ -0,0 +1,40 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#ifndef SRC_QPIDIT_AMQP_LARGE_CONTENT_TEST_SENDER_HPP_
+#define SRC_QPIDIT_AMQP_LARGE_CONTENT_TEST_SENDER_HPP_
+
+#include "proton/messaging_handler.hpp"
+
+
+namespace qpidit
+{
+    namespace amqp_large_content_test
+    {
+
+        class Sender : public proton::messaging_handler
+        {
+        };
+
+    } /* namespace amqp_large_content_test */
+} /* namespace qpidit */
+
+#endif /* SRC_QPIDIT_AMQP_LARGE_CONTENT_TEST_SENDER_HPP_ */

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/jms_dtx_test/Receiver.cpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/jms_dtx_test/Receiver.cpp b/shims/qpid-proton-cpp/src/qpidit/jms_dtx_test/Receiver.cpp
new file mode 100644
index 0000000..027518c
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/jms_dtx_test/Receiver.cpp
@@ -0,0 +1,43 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpidit/jms_dtx_test/Receiver.hpp"
+
+#include <stdlib.h> // exit()
+
+namespace qpidit
+{
+    namespace jms_dtx_test
+    {
+    } /* namespace jms_dtx_test */
+} /* namespace qpidit */
+
+
+/*
+ * --- main ---
+ * Args: 1: Broker address (ip-addr:port)
+ *       2: Queue name
+ *       ...
+ */
+
+int main(int argc, char** argv) {
+    exit(0);
+}

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/jms_dtx_test/Receiver.hpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/jms_dtx_test/Receiver.hpp b/shims/qpid-proton-cpp/src/qpidit/jms_dtx_test/Receiver.hpp
new file mode 100644
index 0000000..de98c4b
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/jms_dtx_test/Receiver.hpp
@@ -0,0 +1,39 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#ifndef SRC_QPIDIT_JMS_DTX_TEST_RECEIVER_HPP_
+#define SRC_QPIDIT_JMS_DTX_TEST_RECEIVER_HPP_
+
+#include "qpidit/JmsTestBase.hpp"
+
+namespace qpidit
+{
+    namespace jms_dtx_test
+    {
+
+        class Receiver : public qpidit::JmsTestBase
+        {
+        };
+
+    } /* namespace jms_dtx_test */
+} /* namespace qpidit */
+
+#endif /* SRC_QPIDIT_JMS_DTX_TEST_RECEIVER_HPP_ */

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/jms_dtx_test/Sender.cpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/jms_dtx_test/Sender.cpp b/shims/qpid-proton-cpp/src/qpidit/jms_dtx_test/Sender.cpp
new file mode 100644
index 0000000..501d0f9
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/jms_dtx_test/Sender.cpp
@@ -0,0 +1,43 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpidit/jms_dtx_test/Sender.hpp"
+
+#include <stdlib.h> // exit()
+
+namespace qpidit
+{
+    namespace jms_dtx_test
+    {
+    } /* namespace jms_dtx_test */
+} /* namespace qpidit */
+
+
+/*
+ * --- main ---
+ * Args: 1: Broker address (ip-addr:port)
+ *       2: Queue name
+ *       ...
+ */
+
+int main(int argc, char** argv) {
+    exit(0);
+}

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/jms_dtx_test/Sender.hpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/jms_dtx_test/Sender.hpp b/shims/qpid-proton-cpp/src/qpidit/jms_dtx_test/Sender.hpp
new file mode 100644
index 0000000..ab4fa8a
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/jms_dtx_test/Sender.hpp
@@ -0,0 +1,39 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#ifndef SRC_QPIDIT_JMS_DTX_TEST_SENDER_HPP_
+#define SRC_QPIDIT_JMS_DTX_TEST_SENDER_HPP_
+
+#include "qpidit/JmsTestBase.hpp"
+
+namespace qpidit
+{
+    namespace jms_dtx_test
+    {
+
+        class Sender : public qpidit::JmsTestBase
+        {
+        };
+
+    } /* namespace jms_dtx_test */
+} /* namespace qpidit */
+
+#endif /* SRC_QPIDIT_JMS_DTX_TEST_SENDER_HPP_ */

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Receiver.cpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Receiver.cpp b/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Receiver.cpp
index c5e512a..f1f1c9b 100644
--- a/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Receiver.cpp
+++ b/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Receiver.cpp
@@ -319,7 +319,8 @@ namespace qpidit
                 // Get and check message headers which are set by a JMS-compient sender
                 // See: https://docs.oracle.com/cd/E19798-01/821-1841/bnces/index.html
                 // 1. Destination
-                const std::string destination = msg.to();
+                std::string destination = msg.to();
+                stripQueueTopicPrefix(destination); // Some brokers prepend "queue://" or "topic://"
                 if (destination.compare(_queueName) != 0) {
                     std::ostringstream oss;
                     oss << "Invalid header: found \"" << destination << "\"; expected \"" << _queueName << "\"";
@@ -398,6 +399,16 @@ namespace qpidit
 //            msg.properties().value() >> props;
         }
 
+        //static
+        void Receiver::stripQueueTopicPrefix(std::string& name) {
+            if (name.size() > 8) {
+                if (name.find("queue://") == 0 || name.find("topic://") == 0) {
+                    name.erase(0, 8);
+                }
+            }
+        }
+
+
     } /* namespace jms_hdrs_props_test */
 } /* namespace qpidit */
 

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Receiver.hpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Receiver.hpp b/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Receiver.hpp
index b5240c8..9162690 100644
--- a/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Receiver.hpp
+++ b/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Receiver.hpp
@@ -24,7 +24,6 @@
 
 #include <iomanip>
 #include <json/value.h>
-#include "proton/messaging_handler.hpp"
 #include "proton/types.hpp"
 #include "qpidit/JmsTestBase.hpp"
 #include <sstream>
@@ -79,6 +78,8 @@ namespace qpidit
             void addMessageHeaderDestination(const std::string& headerName, qpidit::jmsDestinationType_t dt, const std::string& d);
             void processMessageProperties(const proton::message& msg);
 
+            static void stripQueueTopicPrefix(std::string& name);
+
             // Format signed numbers in negative hex format if signedFlag is true, ie -0xNNNN, positive numbers in 0xNNNN format
             template<typename T> static std::string toHexStr(T val, bool fillFlag = false, bool signedFlag = true) {
                 std::ostringstream oss;

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Sender.hpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Sender.hpp b/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Sender.hpp
index 8e3efe7..6619410 100644
--- a/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Sender.hpp
+++ b/shims/qpid-proton-cpp/src/qpidit/jms_hdrs_props_test/Sender.hpp
@@ -24,7 +24,6 @@
 
 #include "json/value.h"
 #include "proton/message.hpp"
-#include "proton/messaging_handler.hpp"
 #include "qpidit/JmsTestBase.hpp"
 #include "qpidit/QpidItErrors.hpp"
 #include <typeinfo>

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/jms_large_content_test/Receiver.cpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/jms_large_content_test/Receiver.cpp b/shims/qpid-proton-cpp/src/qpidit/jms_large_content_test/Receiver.cpp
new file mode 100644
index 0000000..2234564
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/jms_large_content_test/Receiver.cpp
@@ -0,0 +1,43 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpidit/jms_large_content_test/Receiver.hpp"
+
+#include <stdlib.h> // exit()
+
+namespace qpidit
+{
+    namespace jms_large_content_test
+    {
+    } /* namespace jms_large_content_test */
+} /* namespace qpidit */
+
+
+/*
+ * --- main ---
+ * Args: 1: Broker address (ip-addr:port)
+ *       2: Queue name
+ *       ...
+ */
+
+int main(int argc, char** argv) {
+    exit(0);
+}

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/jms_large_content_test/Receiver.hpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/jms_large_content_test/Receiver.hpp b/shims/qpid-proton-cpp/src/qpidit/jms_large_content_test/Receiver.hpp
new file mode 100644
index 0000000..ef9fb78
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/jms_large_content_test/Receiver.hpp
@@ -0,0 +1,39 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#ifndef SRC_QPIDIT_JMS_LARGE_CONTENT_TEST_RECEIVER_HPP_
+#define SRC_QPIDIT_JMS_LARGE_CONTENT_TEST_RECEIVER_HPP_
+
+#include "qpidit/JmsTestBase.hpp"
+
+namespace qpidit
+{
+    namespace jms_large_content_test
+    {
+
+        class Receiver : public qpidit::JmsTestBase
+        {
+        };
+
+    } /* namespace jms_large_content_test */
+} /* namespace qpidit */
+
+#endif /* SRC_QPIDIT_JMS_LARGE_CONTENT_TEST_RECEIVER_HPP_ */

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/jms_large_content_test/Sender.cpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/jms_large_content_test/Sender.cpp b/shims/qpid-proton-cpp/src/qpidit/jms_large_content_test/Sender.cpp
new file mode 100644
index 0000000..c151006
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/jms_large_content_test/Sender.cpp
@@ -0,0 +1,43 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpidit/jms_large_content_test/Sender.hpp"
+
+#include <stdlib.h> // exit()
+
+namespace qpidit
+{
+    namespace jms_large_content_test
+    {
+    } /* namespace jms_large_content_test */
+} /* namespace qpidit */
+
+
+/*
+ * --- main ---
+ * Args: 1: Broker address (ip-addr:port)
+ *       2: Queue name
+ *       ...
+ */
+
+int main(int argc, char** argv) {
+    exit(0);
+}

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/jms_large_content_test/Sender.hpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/jms_large_content_test/Sender.hpp b/shims/qpid-proton-cpp/src/qpidit/jms_large_content_test/Sender.hpp
new file mode 100644
index 0000000..a4e2d16
--- /dev/null
+++ b/shims/qpid-proton-cpp/src/qpidit/jms_large_content_test/Sender.hpp
@@ -0,0 +1,39 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#ifndef SRC_QPIDIT_JMS_LARGE_CONTENT_TEST_SENDER_HPP_
+#define SRC_QPIDIT_JMS_LARGE_CONTENT_TEST_SENDER_HPP_
+
+#include "qpidit/JmsTestBase.hpp"
+
+namespace qpidit
+{
+    namespace jms_large_content_test
+    {
+
+        class Sender : public qpidit::JmsTestBase
+        {
+        };
+
+    } /* namespace jms_large_content_test */
+} /* namespace qpidit */
+
+#endif /* SRC_QPIDIT_JMS_LARGE_CONTENT_TEST_SENDER_HPP_ */

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Receiver.hpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Receiver.hpp b/shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Receiver.hpp
index d7c183b..c26d789 100644
--- a/shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Receiver.hpp
+++ b/shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Receiver.hpp
@@ -24,7 +24,6 @@
 
 #include <iomanip>
 #include <json/value.h>
-#include "proton/messaging_handler.hpp"
 #include "proton/types.hpp"
 #include "qpidit/JmsTestBase.hpp"
 #include <sstream>

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Sender.hpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Sender.hpp b/shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Sender.hpp
index 551edbf..28aae1f 100644
--- a/shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Sender.hpp
+++ b/shims/qpid-proton-cpp/src/qpidit/jms_messages_test/Sender.hpp
@@ -24,7 +24,6 @@
 
 #include "json/value.h"
 #include "proton/message.hpp"
-#include "proton/messaging_handler.hpp"
 #include "qpidit/JmsTestBase.hpp"
 #include "qpidit/QpidItErrors.hpp"
 #include <typeinfo>

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-python/src/amqp_dtx_test/Receiver.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/amqp_dtx_test/Receiver.py b/shims/qpid-proton-python/src/amqp_dtx_test/Receiver.py
new file mode 100755
index 0000000..0982511
--- /dev/null
+++ b/shims/qpid-proton-python/src/amqp_dtx_test/Receiver.py
@@ -0,0 +1,75 @@
+#!/usr/bin/env python
+
+"""
+AMQP distributed transactions (DTX) test receiver shim for qpid-interop-test
+"""
+
+#
+# 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.
+#
+
+import os.path
+import sys
+from traceback import format_exc
+
+from proton.handlers import MessagingHandler
+from proton.reactor import Container
+
+class AmqpDtxTestReceiver(MessagingHandler):
+    """
+    Receiver shim for AMQP dtx test
+    ...
+    """
+    def __init__(self, broker_url, queue_name):
+        super(AmqpDtxTestReceiver, self).__init__()
+        self.broker_url = broker_url
+        self.queue_name = queue_name
+        self.received_value_list = []
+        self.expected = int('0')
+        self.received = 0
+
+    def get_received_value_list(self):
+        """Return the received list of AMQP values"""
+        return self.received_value_list
+
+    def on_start(self, event):
+        """Event callback for when the client starts"""
+        event.container.create_receiver('%s/%s' % (self.broker_url, self.queue_name))
+
+    def on_message(self, event):
+        """Event callback when a message is received by the client"""
+        if event.message.id and event.message.id < self.received:
+            return # ignore duplicate message
+        if self.expected == 0 or self.received < self.expected:
+            # do something here
+            if self.received >= self.expected:
+                event.receiver.close()
+                event.connection.close()
+
+# --- main ---
+# Args: 1: Broker address (ip-addr:port)
+#       2: Queue name
+#       ...
+try:
+    RECEIVER = AmqpDtxTestReceiver(sys.argv[1], sys.argv[2])
+    Container(RECEIVER).run()
+except KeyboardInterrupt:
+    pass
+except Exception as exc:
+    print os.path.basename(sys.argv[0]), 'EXCEPTION', exc
+    print format_exc()

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-python/src/amqp_dtx_test/Sender.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/amqp_dtx_test/Sender.py b/shims/qpid-proton-python/src/amqp_dtx_test/Sender.py
new file mode 100755
index 0000000..e31935f
--- /dev/null
+++ b/shims/qpid-proton-python/src/amqp_dtx_test/Sender.py
@@ -0,0 +1,94 @@
+#!/usr/bin/env python
+
+"""
+AMQP distributed transactions (DTX) test sender shim for qpid-interop-test
+"""
+
+#
+# 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.
+#
+
+import os.path
+import sys
+from traceback import format_exc
+
+from proton.handlers import MessagingHandler
+from proton.reactor import Container
+
+class AmqpDtxTestSender(MessagingHandler):
+    """
+    Sender shim for AMQP dtx test
+    ...
+    """
+    def __init__(self, broker_url, queue_name):
+        super(AmqpDtxTestSender, self).__init__()
+        self.broker_url = broker_url
+        self.queue_name = queue_name
+        self.test_value_list = []
+        self.sent = 0
+        self.confirmed = 0
+        self.total = len(self.test_value_list)
+
+    def on_start(self, event):
+        """Event callback for when the client starts"""
+        event.container.create_sender('%s/%s' % (self.broker_url, self.queue_name))
+
+    def on_sendable(self, event):
+        """Event callback for when send credit is received, allowing the sending of messages"""
+        if self.sent == 0:
+            for test_value in self.test_value_list:
+                if event.sender.credit:
+                    message = self.create_message(test_value)
+                    if message is not None:
+                        event.sender.send(message)
+                        self.sent += 1
+                    else:
+                        event.connection.close()
+                        return
+
+    def create_message(self, test_value):
+        """
+        Creates a single message with the test value translated from its string representation to the appropriate
+        AMQP value (set in self.amqp_type).
+        """
+        return None
+
+    def on_accepted(self, event):
+        """Event callback for when a sent message is accepted by the broker"""
+        self.confirmed += 1
+        if self.confirmed == self.total:
+            event.connection.close()
+
+    def on_disconnected(self, event):
+        """Event callback for when the broker disconnects with the client"""
+        self.sent = self.confirmed
+
+
+# --- main ---
+# Args: 1: Broker address (ip-addr:port)
+#       2: Queue name
+#       ...
+try:
+    SENDER = AmqpDtxTestSender(sys.argv[1], sys.argv[2])
+    Container(SENDER).run()
+except KeyboardInterrupt:
+    pass
+except Exception as exc:
+    print os.path.basename(sys.argv[0]), 'EXCEPTION:', exc
+    print format_exc()
+        
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-python/src/amqp_features_test/Receiver.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/amqp_features_test/Receiver.py b/shims/qpid-proton-python/src/amqp_features_test/Receiver.py
new file mode 100755
index 0000000..c37739c
--- /dev/null
+++ b/shims/qpid-proton-python/src/amqp_features_test/Receiver.py
@@ -0,0 +1,75 @@
+#!/usr/bin/env python
+
+"""
+AMQP features test receiver shim for qpid-interop-test
+"""
+
+#
+# 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.
+#
+
+import os.path
+import sys
+from traceback import format_exc
+
+from proton.handlers import MessagingHandler
+from proton.reactor import Container
+
+class AmqpFeaturesTestReceiver(MessagingHandler):
+    """
+    Reciver shim for AMQP dtx test
+    ...
+    """
+    def __init__(self, broker_url, queue_name):
+        super(AmqpFeaturesTestReceiver, self).__init__()
+        self.broker_url = broker_url
+        self.queue_name = queue_name
+        self.received_value_list = []
+        self.expected = int('0')
+        self.received = 0
+
+    def get_received_value_list(self):
+        """Return the received list of AMQP values"""
+        return self.received_value_list
+
+    def on_start(self, event):
+        """Event callback for when the client starts"""
+        event.container.create_receiver('%s/%s' % (self.broker_url, self.queue_name))
+
+    def on_message(self, event):
+        """Event callback when a message is received by the client"""
+        if event.message.id and event.message.id < self.received:
+            return # ignore duplicate message
+        if self.expected == 0 or self.received < self.expected:
+            # do something here
+            if self.received == self.expected:
+                event.receiver.close()
+                event.connection.close()
+
+# --- main ---
+# Args: 1: Broker address (ip-addr:port)
+#       2: Queue name
+#       ...
+try:
+    RECEIVER = AmqpFeaturesTestReceiver(sys.argv[1], sys.argv[2])
+    Container(RECEIVER).run()
+except KeyboardInterrupt:
+    pass
+except Exception as exc:
+    print os.path.basename(sys.argv[0]), 'EXCEPTION', exc
+    print format_exc()

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-python/src/amqp_features_test/Sender.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/amqp_features_test/Sender.py b/shims/qpid-proton-python/src/amqp_features_test/Sender.py
new file mode 100755
index 0000000..3bf19e0
--- /dev/null
+++ b/shims/qpid-proton-python/src/amqp_features_test/Sender.py
@@ -0,0 +1,94 @@
+#!/usr/bin/env python
+
+"""
+AMQP features test sender shim for qpid-interop-test
+"""
+
+#
+# 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.
+#
+
+import os.path
+import sys
+from traceback import format_exc
+
+from proton.handlers import MessagingHandler
+from proton.reactor import Container
+
+class AmqpFeaturesTestSender(MessagingHandler):
+    """
+    Sender shim for AMQP dtx test
+    ...
+    """
+    def __init__(self, broker_url, queue_name):
+        super(AmqpFeaturesTestSender, self).__init__()
+        self.broker_url = broker_url
+        self.queue_name = queue_name
+        self.test_value_list = []
+        self.sent = 0
+        self.confirmed = 0
+        self.total = len(self.test_value_list)
+
+    def on_start(self, event):
+        """Event callback for when the client starts"""
+        event.container.create_sender('%s/%s' % (self.broker_url, self.queue_name))
+
+    def on_sendable(self, event):
+        """Event callback for when send credit is received, allowing the sending of messages"""
+        if self.sent == 0:
+            for test_value in self.test_value_list:
+                if event.sender.credit:
+                    message = self.create_message(test_value)
+                    if message is not None:
+                        event.sender.send(message)
+                        self.sent += 1
+                    else:
+                        event.connection.close()
+                        return
+
+    def create_message(self, test_value):
+        """
+        Creates a single message with the test value translated from its string representation to the appropriate
+        AMQP value (set in self.amqp_type).
+        """
+        return None
+
+    def on_accepted(self, event):
+        """Event callback for when a sent message is accepted by the broker"""
+        self.confirmed += 1
+        if self.confirmed == self.total:
+            event.connection.close()
+
+    def on_disconnected(self, event):
+        """Event callback for when the broker disconnects with the client"""
+        self.sent = self.confirmed
+
+
+# --- main ---
+# Args: 1: Broker address (ip-addr:port)
+#       2: Queue name
+#       ...
+try:
+    SENDER = AmqpFeaturesTestSender(sys.argv[1], sys.argv[2])
+    Container(SENDER).run()
+except KeyboardInterrupt:
+    pass
+except Exception as exc:
+    print os.path.basename(sys.argv[0]), 'EXCEPTION:', exc
+    print format_exc()
+        
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-python/src/amqp_large_content_test/Receiver.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/amqp_large_content_test/Receiver.py b/shims/qpid-proton-python/src/amqp_large_content_test/Receiver.py
new file mode 100755
index 0000000..d7407d3
--- /dev/null
+++ b/shims/qpid-proton-python/src/amqp_large_content_test/Receiver.py
@@ -0,0 +1,75 @@
+#!/usr/bin/env python
+
+"""
+AMQP large content test receiver shim for qpid-interop-test
+"""
+
+#
+# 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.
+#
+
+import os.path
+import sys
+from traceback import format_exc
+
+from proton.handlers import MessagingHandler
+from proton.reactor import Container
+
+class AmqpLargeContentTestReceiver(MessagingHandler):
+    """
+    Reciver shim for AMQP dtx test
+    ...
+    """
+    def __init__(self, broker_url, queue_name):
+        super(AmqpLargeContentTestReceiver, self).__init__()
+        self.broker_url = broker_url
+        self.queue_name = queue_name
+        self.received_value_list = []
+        self.expected = int('0')
+        self.received = 0
+
+    def get_received_value_list(self):
+        """Return the received list of AMQP values"""
+        return self.received_value_list
+
+    def on_start(self, event):
+        """Event callback for when the client starts"""
+        event.container.create_receiver('%s/%s' % (self.broker_url, self.queue_name))
+
+    def on_message(self, event):
+        """Event callback when a message is received by the client"""
+        if event.message.id and event.message.id < self.received:
+            return # ignore duplicate message
+        if self.expected == 0 or self.received < self.expected:
+            # do something here
+            if self.received == self.expected:
+                event.receiver.close()
+                event.connection.close()
+
+# --- main ---
+# Args: 1: Broker address (ip-addr:port)
+#       2: Queue name
+#       ...
+try:
+    RECEIVER = AmqpLargeContentTestReceiver(sys.argv[1], sys.argv[2])
+    Container(RECEIVER).run()
+except KeyboardInterrupt:
+    pass
+except Exception as exc:
+    print os.path.basename(sys.argv[0]), 'EXCEPTION', exc
+    print format_exc()

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-python/src/amqp_large_content_test/Sender.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/amqp_large_content_test/Sender.py b/shims/qpid-proton-python/src/amqp_large_content_test/Sender.py
new file mode 100755
index 0000000..0d09336
--- /dev/null
+++ b/shims/qpid-proton-python/src/amqp_large_content_test/Sender.py
@@ -0,0 +1,94 @@
+#!/usr/bin/env python
+
+"""
+AMQP large content test sender shim for qpid-interop-test
+"""
+
+#
+# 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.
+#
+
+import os.path
+import sys
+from traceback import format_exc
+
+from proton.handlers import MessagingHandler
+from proton.reactor import Container
+
+class AmqpLargeContentTestSender(MessagingHandler):
+    """
+    Sender shim for AMQP dtx test
+    ...
+    """
+    def __init__(self, broker_url, queue_name):
+        super(AmqpLargeContentTestSender, self).__init__()
+        self.broker_url = broker_url
+        self.queue_name = queue_name
+        self.test_value_list = []
+        self.sent = 0
+        self.confirmed = 0
+        self.total = len(self.test_value_list)
+
+    def on_start(self, event):
+        """Event callback for when the client starts"""
+        event.container.create_sender('%s/%s' % (self.broker_url, self.queue_name))
+
+    def on_sendable(self, event):
+        """Event callback for when send credit is received, allowing the sending of messages"""
+        if self.sent == 0:
+            for test_value in self.test_value_list:
+                if event.sender.credit:
+                    message = self.create_message(test_value)
+                    if message is not None:
+                        event.sender.send(message)
+                        self.sent += 1
+                    else:
+                        event.connection.close()
+                        return
+
+    def create_message(self, test_value):
+        """
+        Creates a single message with the test value translated from its string representation to the appropriate
+        AMQP value (set in self.amqp_type).
+        """
+        return None
+
+    def on_accepted(self, event):
+        """Event callback for when a sent message is accepted by the broker"""
+        self.confirmed += 1
+        if self.confirmed == self.total:
+            event.connection.close()
+
+    def on_disconnected(self, event):
+        """Event callback for when the broker disconnects with the client"""
+        self.sent = self.confirmed
+
+
+# --- main ---
+# Args: 1: Broker address (ip-addr:port)
+#       2: Queue name
+#       ...
+try:
+    SENDER = AmqpLargeContentTestSender(sys.argv[1], sys.argv[2])
+    Container(SENDER).run()
+except KeyboardInterrupt:
+    pass
+except Exception as exc:
+    print os.path.basename(sys.argv[0]), 'EXCEPTION:', exc
+    print format_exc()
+        
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-python/src/amqp_types_test/Receiver.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/amqp_types_test/Receiver.py b/shims/qpid-proton-python/src/amqp_types_test/Receiver.py
index 7bb6355..d26d404 100755
--- a/shims/qpid-proton-python/src/amqp_types_test/Receiver.py
+++ b/shims/qpid-proton-python/src/amqp_types_test/Receiver.py
@@ -27,6 +27,7 @@ AMQP type test receiver shim for qpid-interop-test
 # * Capturing errors from client or broker
 
 from json import dumps
+import os.path
 from string import digits, letters, punctuation
 from struct import pack, unpack
 import sys
@@ -35,15 +36,16 @@ from traceback import format_exc
 from proton.handlers import MessagingHandler
 from proton.reactor import Container
 
-class AmqpTypesReceiverShim(MessagingHandler):
+class AmqpTypesTestReceiver(MessagingHandler):
     """
     Reciver shim for AMQP types test
     This shim receives the number of messages supplied on the command-line and checks that they contain message
     bodies of the exptected AMQP type. The values are then aggregated and returned.
     """
-    def __init__(self, url, amqp_type, num_expected_messages_str):
-        super(AmqpTypesReceiverShim, self).__init__()
-        self.url = url
+    def __init__(self, broker_url, queue_name, amqp_type, num_expected_messages_str):
+        super(AmqpTypesTestReceiver, self).__init__()
+        self.broker_url = broker_url
+        self.queue_name = queue_name
         self.received_value_list = []
         self.amqp_type = amqp_type
         self.expected = int(num_expected_messages_str)
@@ -55,7 +57,7 @@ class AmqpTypesReceiverShim(MessagingHandler):
 
     def on_start(self, event):
         """Event callback for when the client starts"""
-        event.container.create_receiver(self.url)
+        event.container.create_receiver('%s/%s' % (self.broker_url, self.queue_name))
 
     def on_message(self, event):
         """Event callback when a message is received by the client"""
@@ -117,12 +119,12 @@ class AmqpTypesReceiverShim(MessagingHandler):
 #       3: AMQP type
 #       4: Expected number of test values to receive
 try:
-    RECEIVER = AmqpTypesReceiverShim('%s/%s' % (sys.argv[1], sys.argv[2]), sys.argv[3], sys.argv[4])
+    RECEIVER = AmqpTypesTestReceiver(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4])
     Container(RECEIVER).run()
     print sys.argv[3]
     print dumps(RECEIVER.get_received_value_list())
 except KeyboardInterrupt:
     pass
 except Exception as exc:
-    print 'proton-python-receive EXCEPTION:', exc
+    print os.path.basename(sys.argv[0]), 'EXCEPTION', exc
     print format_exc()

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-python/src/amqp_types_test/Sender.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/amqp_types_test/Sender.py b/shims/qpid-proton-python/src/amqp_types_test/Sender.py
index b760467..984c555 100755
--- a/shims/qpid-proton-python/src/amqp_types_test/Sender.py
+++ b/shims/qpid-proton-python/src/amqp_types_test/Sender.py
@@ -38,15 +38,16 @@ from proton import byte, char, decimal32, decimal64, decimal128, float32, int32,
 from proton.handlers import MessagingHandler
 from proton.reactor import Container
 
-class AmqpTypesSenderShim(MessagingHandler):
+class AmqpTypesTestSender(MessagingHandler):
     """
     Sender shim for AMQP types test
     This shim receives the AMQP type and a list of test values. Each value is sent in a message body of the appropriate
     AMQP type. There is no returned value.
     """
-    def __init__(self, url, amqp_type, test_value_list):
-        super(AmqpTypesSenderShim, self).__init__()
-        self.url = url
+    def __init__(self, broker_url, queue_name, amqp_type, test_value_list):
+        super(AmqpTypesTestSender, self).__init__()
+        self.broker_url = broker_url
+        self.queue_name = queue_name
         self.amqp_type = amqp_type
         self.test_value_list = test_value_list
         self.sent = 0
@@ -55,7 +56,7 @@ class AmqpTypesSenderShim(MessagingHandler):
 
     def on_start(self, event):
         """Event callback for when the client starts"""
-        event.container.create_sender(self.url)
+        event.container.create_sender('%s/%s' % (self.broker_url, self.queue_name))
 
     def on_sendable(self, event):
         """Event callback for when send credit is received, allowing the sending of messages"""
@@ -147,7 +148,8 @@ class AmqpTypesSenderShim(MessagingHandler):
 #       3: AMQP type
 #       4...n: Test value(s) as strings
 try:
-    Container(AmqpTypesSenderShim('%s/%s' % (sys.argv[1], sys.argv[2]), sys.argv[3], loads(sys.argv[4]))).run()
+    SENDER = AmqpTypesTestSender(sys.argv[1], sys.argv[2], sys.argv[3], loads(sys.argv[4]))
+    Container(SENDER).run()
 except KeyboardInterrupt:
     pass
 except Exception as exc:

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-python/src/jms_dtx_test/Receiver.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/jms_dtx_test/Receiver.py b/shims/qpid-proton-python/src/jms_dtx_test/Receiver.py
new file mode 100755
index 0000000..88a1046
--- /dev/null
+++ b/shims/qpid-proton-python/src/jms_dtx_test/Receiver.py
@@ -0,0 +1,76 @@
+#!/usr/bin/env python
+
+"""
+JMS distributed transactions (DTX) test receiver shim for qpid-interop-test
+"""
+
+#
+# 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.
+#
+
+import os.path
+import sys
+from traceback import format_exc
+
+from proton.handlers import MessagingHandler
+from proton.reactor import Container
+
+class JmsDtxTestReceiver(MessagingHandler):
+    """
+    Receiver shim for JMS dtx test
+    ...
+    """
+    def __init__(self, broker_url, queue_name):
+        super(JmsDtxTestReceiver, self).__init__()
+        self.broker_url = broker_url
+        self.queue_name = queue_name
+        self.expected = int('0')
+        self.received = 0
+        self.received_value_list = []
+
+    def get_received_value_list(self):
+        """"Return the received list of values"""
+        return self.received_value_list
+
+    def on_start(self, event):
+        """Event callback for when the client starts"""
+        event.container.create_receiver('%s/%s' % (self.broker_url, self.queue_name))
+
+    def on_message(self, event):
+        """Event callback when a message is received by the client"""
+        if event.message.id and event.message.id < self.received:
+            return # ignore duplicate message
+        if self.expected == 0 or self.received < self.expected:
+            # do something here
+            if self.received >= self.expected:
+                event.receiver.close()
+                event.connection.close()
+
+
+# --- main ---
+# Args: 1: Broker address (ip-addr:port)
+#       2: Queue name
+#       ...
+try:
+    RECEIVER = JmsDtxTestReceiver(sys.argv[1], sys.argv[2])
+    Container(RECEIVER).run()
+except KeyboardInterrupt:
+    pass
+except Exception as exc:
+    print os.path.basename(sys.argv[0]), 'EXCEPTION', exc
+    print format_exc()

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-python/src/jms_dtx_test/Sender.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/jms_dtx_test/Sender.py b/shims/qpid-proton-python/src/jms_dtx_test/Sender.py
new file mode 100755
index 0000000..2e3146f
--- /dev/null
+++ b/shims/qpid-proton-python/src/jms_dtx_test/Sender.py
@@ -0,0 +1,95 @@
+#!/usr/bin/env python
+
+"""
+JMS distributed transactions (DTX) test sender shim for qpid-interop-test
+"""
+
+#
+# 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.
+#
+
+import os.path
+import sys
+from traceback import format_exc
+
+from proton.handlers import MessagingHandler
+from proton.reactor import Container
+
+class JmsDtxTestSender(MessagingHandler):
+    """
+    Sender shim for JMS dtx test
+    ...
+    """
+    def __init__(self, broker_url, queue_name):
+        super(JmsDtxTestSender, self).__init__()
+        self.broker_url = broker_url
+        self.queue_name = queue_name
+        self.test_value_list = []
+        self.sent = 0
+        self.confirmed = 0
+        self.total = 0
+
+    def on_start(self, event):
+        """Event callback for when the client starts"""
+        event.container.create_sender('%s/%s' % (self.broker_url, self.queue_name))
+
+    def on_sendable(self, event):
+        """Event callback for when send credit is received, allowing the sending of messages"""
+        if self.sent == 0:
+            for test_value in self.test_value_list:
+                if event.sender.credit:
+                    message = self.create_message(test_value)
+                    if message is not None:
+                        event.sender.send(message)
+                        self.sent += 1
+                    else:
+                        event.connection.close()
+                        return
+
+    def create_message(self, test_value):
+        """
+        Creates a single JMS message with the test value translated from its string representation to the appropriate
+        value (set in self.amqp_type).
+        """
+        return None
+
+    def on_accepted(self, event):
+        """Event callback for when a sent message is accepted by the broker"""
+        self.confirmed += 1
+        if self.confirmed == self.total:
+            event.connection.close()
+
+    def on_disconnected(self, event):
+        """Event callback for when the broker disconnects with the client"""
+        self.sent = self.confirmed
+
+
+
+
+# --- main ---
+# Args: 1: Broker address (ip-addr:port)
+#       2: Queue name
+#       ...
+try:
+    SENDER = JmsDtxTestSender(sys.argv[1], sys.argv[2])
+    Container(SENDER).run()
+except KeyboardInterrupt:
+    pass
+except Exception as exc:
+    print os.path.basename(sys.argv[0]), 'EXCEPTION:', exc
+    print format_exc()

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-python/src/jms_hdrs_props_test/Receiver.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/jms_hdrs_props_test/Receiver.py b/shims/qpid-proton-python/src/jms_hdrs_props_test/Receiver.py
index 5c43474..582d339 100755
--- a/shims/qpid-proton-python/src/jms_hdrs_props_test/Receiver.py
+++ b/shims/qpid-proton-python/src/jms_hdrs_props_test/Receiver.py
@@ -30,26 +30,24 @@ import sys
 from time import strftime, time
 from traceback import format_exc
 
+from qpid_interop_test.jms_types import QPID_JMS_TYPE_ANNOTATION_NAME
 from qpid_interop_test.interop_test_errors import InteropTestError
 from proton import byte, symbol
 from proton.handlers import MessagingHandler
 from proton.reactor import Container
 
-# These values must tie in with the Qpid-JMS client values found in
-# org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport
-QPID_JMS_TYPE_ANNOTATION_NAME = symbol(u'x-opt-jms-msg-type')
 
-class JmsReceiverShim(MessagingHandler):
+class JmsHdrsPropsTestReceiver(MessagingHandler):
     """
     Receiver shim: This shim receives JMS messages sent by the Sender shim and prints the contents of the received
     messages onto the terminal in JSON format for retrieval by the test harness. The JMS messages type and, where
     applicable, body values, as well as the combinations of JMS headers and properties which may be attached to
     the message are received on the command-line in JSON format when this program is launched.
     """
-    def __init__(self, url, queue, jms_msg_type, test_parameters_list):
-        super(JmsReceiverShim, self).__init__()
-        self.url = url
-        self.queue = queue
+    def __init__(self, broker_url, queue_name, jms_msg_type, test_parameters_list):
+        super(JmsHdrsPropsTestReceiver, self).__init__()
+        self.broker_url = broker_url
+        self.queue_name = queue_name
         self.jms_msg_type = jms_msg_type
         self.expteced_msg_map = test_parameters_list[0]
         self.flag_map = test_parameters_list[1]
@@ -76,7 +74,7 @@ class JmsReceiverShim(MessagingHandler):
 
     def on_start(self, event):
         """Event callback for when the client starts"""
-        event.container.create_receiver('%s/%s' % (self.url, self.queue))
+        event.container.create_receiver('%s/%s' % (self.broker_url, self.queue_name))
 
     def on_message(self, event):
         """Event callback when a message is received by the client"""
@@ -317,9 +315,9 @@ class JmsReceiverShim(MessagingHandler):
             # See: https://docs.oracle.com/cd/E19798-01/821-1841/bnces/index.html
             # 1. Destination
             destination = message.address
-            if destination != self.queue:
+            if destination != self.queue_name:
                 raise InteropTestError('JMS_DESTINATION header invalid: found "' + destination +
-                                       '"; expected "' + self.queue + '"')
+                                       '"; expected "' + self.queue_name + '"')
             # 2. Delivery Mode (persistence)
             if message.durable:
                 raise InteropTestError('JMS_DELIVERY_MODE header invalid: expected NON_PERSISTENT; found PERSISTENT')
@@ -382,7 +380,7 @@ class JmsReceiverShim(MessagingHandler):
 #       4: JSON Test parameters containing 2 maps: [testValuesMap, flagMap]
 #print '#### sys.argv=%s' % sys.argv
 try:
-    RECEIVER = JmsReceiverShim(sys.argv[1], sys.argv[2], sys.argv[3], loads(sys.argv[4]))
+    RECEIVER = JmsHdrsPropsTestReceiver(sys.argv[1], sys.argv[2], sys.argv[3], loads(sys.argv[4]))
     Container(RECEIVER).run()
     print sys.argv[3]
     print dumps([RECEIVER.get_received_value_map(), RECEIVER.get_jms_header_map(), RECEIVER.get_jms_property_map()])

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-python/src/jms_hdrs_props_test/Sender.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/jms_hdrs_props_test/Sender.py b/shims/qpid-proton-python/src/jms_hdrs_props_test/Sender.py
index 89abf25..9641435 100755
--- a/shims/qpid-proton-python/src/jms_hdrs_props_test/Sender.py
+++ b/shims/qpid-proton-python/src/jms_hdrs_props_test/Sender.py
@@ -24,33 +24,21 @@ JMS message headers and properties test sender shim for qpid-interop-test
 #
 
 from json import loads
+import os.path
 from struct import pack, unpack
 from subprocess import check_output
 import sys
 from traceback import format_exc
 
+from qpid_interop_test.jms_types import create_annotation
 from proton import byte, char, float32, int32, Message, short, symbol
 from proton.handlers import MessagingHandler
 from proton.reactor import Container
 from qpid_interop_test.interop_test_errors import InteropTestError
 from qpid_interop_test.test_type_map import TestTypeMap
 
-# These values must tie in with the Qpid-JMS client values found in
-# org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport
-QPID_JMS_TYPE_ANNOTATION_NAME = symbol(u'x-opt-jms-msg-type')
-QPID_JMS_TYPE_ANNOTATIONS = {
-    'JMS_MESSAGE_TYPE': byte(0),
-    'JMS_BYTESMESSAGE_TYPE': byte(3),
-    'JMS_MAPMESSAGE_TYPE': byte(2),
-    'JMS_OBJECTMESSAGE_TYPE': byte(1),
-    'JMS_STREAMMESSAGE_TYPE': byte(4),
-    'JMS_TEXTMESSAGE_TYPE': byte(5)
-    }
-def create_annotation(jms_msg_type):
-    """Function which creates a message annotation for JMS message type as used by the Qpid JMS client"""
-    return {QPID_JMS_TYPE_ANNOTATION_NAME: QPID_JMS_TYPE_ANNOTATIONS[jms_msg_type]}
 
-class JmsSenderShim(MessagingHandler):
+class JmsHdrsPropsTestSender(MessagingHandler):
     """
     This shim sends JMS messages of a particular JMS message type according to the test parameters list. This list
     contains three maps:
@@ -61,9 +49,9 @@ class JmsSenderShim(MessagingHandler):
     This shim takes the combinations of the above map and creates test cases, each of which sends a single message
     with (or without) JMS headers and properties.
     """
-    def __init__(self, broker_ip_addr, queue_name, jms_msg_type, test_parameters_list):
-        super(JmsSenderShim, self).__init__()
-        self.broker_ip_addr = broker_ip_addr
+    def __init__(self, broker_url, queue_name, jms_msg_type, test_parameters_list):
+        super(JmsHdrsPropsTestSender, self).__init__()
+        self.broker_url = broker_url
         self.queue_name = queue_name
         self.jms_msg_type = jms_msg_type
         self.test_value_map = test_parameters_list[0]
@@ -75,7 +63,7 @@ class JmsSenderShim(MessagingHandler):
 
     def on_start(self, event):
         """Event callback for when the client starts"""
-        event.container.create_sender('%s/%s' % (self.broker_ip_addr, self.queue_name))
+        event.container.create_sender('%s/%s' % (self.broker_url, self.queue_name))
 
     def on_sendable(self, event):
         """Event callback for when send credit is received, allowing the sending of messages"""
@@ -380,9 +368,10 @@ class JmsSenderShim(MessagingHandler):
 #print '#### sys.argv=%s' % sys.argv
 #print '>>> test_values=%s' % loads(sys.argv[4])
 try:
-    Container(JmsSenderShim(sys.argv[1], sys.argv[2], sys.argv[3], loads(sys.argv[4]))).run()
+    SENDER = JmsHdrsPropsTestSender(sys.argv[1], sys.argv[2], sys.argv[3], loads(sys.argv[4]))
+    Container(SENDER).run()
 except KeyboardInterrupt:
     pass
 except Exception as exc:
-    print 'jms-sender-shim EXCEPTION:', exc
+    print os.path.basename(sys.argv[0]), 'EXCEPTION:', exc
     print format_exc()

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-python/src/jms_large_content_test/Receiver.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/jms_large_content_test/Receiver.py b/shims/qpid-proton-python/src/jms_large_content_test/Receiver.py
new file mode 100755
index 0000000..f673500
--- /dev/null
+++ b/shims/qpid-proton-python/src/jms_large_content_test/Receiver.py
@@ -0,0 +1,76 @@
+#!/usr/bin/env python
+
+"""
+JMS large content test receiver shim for qpid-interop-test
+"""
+
+#
+# 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.
+#
+
+import os.path
+import sys
+from traceback import format_exc
+
+from proton.handlers import MessagingHandler
+from proton.reactor import Container
+
+class JmsLargeContentTestReceiver(MessagingHandler):
+    """
+    Receiver shim for JMS large content test
+    ...
+    """
+    def __init__(self, broker_url, queue_name):
+        super(JmsLargeContentTestReceiver, self).__init__()
+        self.broker_url = broker_url
+        self.queue_name = queue_name
+        self.expected = int('0')
+        self.received = 0
+        self.received_value_list = []
+
+    def get_received_value_list(self):
+        """"Return the received list of values"""
+        return self.received_value_list
+
+    def on_start(self, event):
+        """Event callback for when the client starts"""
+        event.container.create_receiver('%s/%s' % (self.broker_url, self.queue_name))
+
+    def on_message(self, event):
+        """Event callback when a message is received by the client"""
+        if event.message.id and event.message.id < self.received:
+            return # ignore duplicate message
+        if self.expected == 0 or self.received < self.expected:
+            # do something here
+            if self.received >= self.expected:
+                event.receiver.close()
+                event.connection.close()
+
+
+# --- main ---
+# Args: 1: Broker address (ip-addr:port)
+#       2: Queue name
+#       ...
+try:
+    RECEIVER = JmsLargeContentTestReceiver(sys.argv[1], sys.argv[2])
+    Container(RECEIVER).run()
+except KeyboardInterrupt:
+    pass
+except Exception as exc:
+    print os.path.basename(sys.argv[0]), 'EXCEPTION', exc
+    print format_exc()

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-python/src/jms_large_content_test/Sender.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/jms_large_content_test/Sender.py b/shims/qpid-proton-python/src/jms_large_content_test/Sender.py
new file mode 100755
index 0000000..0887628
--- /dev/null
+++ b/shims/qpid-proton-python/src/jms_large_content_test/Sender.py
@@ -0,0 +1,95 @@
+#!/usr/bin/env python
+
+"""
+JMS large content test sender shim for qpid-interop-test
+"""
+
+#
+# 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.
+#
+
+import os.path
+import sys
+from traceback import format_exc
+
+from proton.handlers import MessagingHandler
+from proton.reactor import Container
+
+class JmsLargeContentTestSender(MessagingHandler):
+    """
+    Sender shim for JMS dtx test
+    ...
+    """
+    def __init__(self, broker_url, queue_name):
+        super(JmsLargeContentTestSender, self).__init__()
+        self.broker_url = broker_url
+        self.queue_name = queue_name
+        self.test_value_list = []
+        self.sent = 0
+        self.confirmed = 0
+        self.total = 0
+
+    def on_start(self, event):
+        """Event callback for when the client starts"""
+        event.container.create_sender('%s/%s' % (self.broker_url, self.queue_name))
+
+    def on_sendable(self, event):
+        """Event callback for when send credit is received, allowing the sending of messages"""
+        if self.sent == 0:
+            for test_value in self.test_value_list:
+                if event.sender.credit:
+                    message = self.create_message(test_value)
+                    if message is not None:
+                        event.sender.send(message)
+                        self.sent += 1
+                    else:
+                        event.connection.close()
+                        return
+
+    def create_message(self, test_value):
+        """
+        Creates a single JMS message with the test value translated from its string representation to the appropriate
+        value (set in self.amqp_type).
+        """
+        return None
+
+    def on_accepted(self, event):
+        """Event callback for when a sent message is accepted by the broker"""
+        self.confirmed += 1
+        if self.confirmed == self.total:
+            event.connection.close()
+
+    def on_disconnected(self, event):
+        """Event callback for when the broker disconnects with the client"""
+        self.sent = self.confirmed
+
+
+
+
+# --- main ---
+# Args: 1: Broker address (ip-addr:port)
+#       2: Queue name
+#       ...
+try:
+    SENDER = JmsLargeContentTestSender(sys.argv[1], sys.argv[2])
+    Container(SENDER).run()
+except KeyboardInterrupt:
+    pass
+except Exception as exc:
+    print os.path.basename(sys.argv[0]), 'EXCEPTION:', exc
+    print format_exc()

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/138dc7d1/shims/qpid-proton-python/src/jms_messages_test/Receiver.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/jms_messages_test/Receiver.py b/shims/qpid-proton-python/src/jms_messages_test/Receiver.py
index eff67c1..220ddb9 100755
--- a/shims/qpid-proton-python/src/jms_messages_test/Receiver.py
+++ b/shims/qpid-proton-python/src/jms_messages_test/Receiver.py
@@ -29,25 +29,23 @@ from subprocess import check_output
 import sys
 from traceback import format_exc
 
+from qpid_interop_test.jms_types import QPID_JMS_TYPE_ANNOTATION_NAME
 from proton import byte, symbol
 from proton.handlers import MessagingHandler
 from proton.reactor import Container
 from qpid_interop_test.interop_test_errors import InteropTestError
 
-# These values must tie in with the Qpid-JMS client values found in
-# org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport
-QPID_JMS_TYPE_ANNOTATION_NAME = symbol(u'x-opt-jms-msg-type')
-
-class JmsReceiverShim(MessagingHandler):
+class JmsMessagesTestReceiver(MessagingHandler):
     """
     Receiver shim: This shim receives JMS messages sent by the Sender shim and prints the contents of the received
     messages onto the terminal in JSON format for retrieval by the test harness. The JMS messages type and, where
     applicable, body values, as well as the combinations of JMS headers and properties which may be attached to
     the message are received on the command-line in JSON format when this program is launched.
     """
-    def __init__(self, url, jms_msg_type, test_parameters_list):
-        super(JmsReceiverShim, self).__init__()
-        self.url = url
+    def __init__(self, broker_url, queue_name, jms_msg_type, test_parameters_list):
+        super(JmsMessagesTestReceiver, self).__init__()
+        self.broker_url = broker_url
+        self.queue_name = queue_name
         self.jms_msg_type = jms_msg_type
         self.expteced_msg_map = test_parameters_list
         self.subtype_itr = iter(sorted(self.expteced_msg_map.keys()))
@@ -63,7 +61,7 @@ class JmsReceiverShim(MessagingHandler):
 
     def on_start(self, event):
         """Event callback for when the client starts"""
-        event.container.create_receiver(self.url)
+        event.container.create_receiver('%s/%s' % (self.broker_url, self.queue_name))
 
     def on_message(self, event):
         """Event callback when a message is received by the client"""
@@ -84,13 +82,13 @@ class JmsReceiverShim(MessagingHandler):
                 event.connection.close()
 
     def on_connection_error(self, event):
-        print 'JmsReceiverShim.on_connection_error'
+        print 'JmsMessagesTestReceiver.on_connection_error'
 
     def on_session_error(self, event):
-        print 'JmsReceiverShim.on_session_error'
+        print 'JmsMessagesTestReceiver.on_session_error'
 
     def on_link_error(self, event):
-        print 'JmsReceiverShim.on_link_error'
+        print 'JmsMessagesTestReceiver.on_link_error'
 
     def _handle_message(self, message):
         """Handles the analysis of a received message"""
@@ -277,7 +275,7 @@ class JmsReceiverShim(MessagingHandler):
 #       4: JSON Test parameters containing 2 maps: [testValuesMap, flagMap]
 #print '#### sys.argv=%s' % sys.argv
 try:
-    RECEIVER = JmsReceiverShim('%s/%s' % (sys.argv[1], sys.argv[2]), sys.argv[3], loads(sys.argv[4]))
+    RECEIVER = JmsMessagesTestReceiver(sys.argv[1], sys.argv[2], sys.argv[3], loads(sys.argv[4]))
     Container(RECEIVER).run()
     print sys.argv[3]
     print dumps(RECEIVER.get_received_value_map())


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org