Repository: qpid-interop-test Updated Branches: refs/heads/master c1e7146ff -> 35536d60e
QPIDIT-22: Updates to QUICKSTART, reduced size of some test messages to avoid Qpid bug (will add large message tests later), fixed names of shims to be consistent across tests, removed old comments 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/35536d60 Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/35536d60 Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/35536d60 Branch: refs/heads/master Commit: 35536d60e615b6d7793a1eb7951eb54588038927 Parents: c1e7146 Author: Kim van der Riet <[email protected]> Authored: Fri Mar 25 11:13:23 2016 -0400 Committer: Kim van der Riet <[email protected]> Committed: Fri Mar 25 11:13:23 2016 -0400 ---------------------------------------------------------------------- QUICKSTART | 7 ++++-- .../src/qpidit/shim/AmqpSender.cpp | 4 ++-- .../qpid-interop-test/jms/jms_message_tests.py | 4 ++-- .../types/simple_type_tests.py | 23 ++++++++++++-------- 4 files changed, 23 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/35536d60/QUICKSTART ---------------------------------------------------------------------- diff --git a/QUICKSTART b/QUICKSTART index 6e38e7c..7ea266e 100644 --- a/QUICKSTART +++ b/QUICKSTART @@ -71,8 +71,11 @@ export PYTHONPATH=<abs path to top level qpid-proton directory>/proton-c/binding export LD_LIBRARY_PATH=<abs path to top level qpid-proton directory>/build/proton-c export QPID_INTEROP_TEST_HOME=<abs path to top level qpid-interop-test directory> -Start a broker (Active-MQ or Qpid). -NOTE: For qpidd, YOU MUST USE THE --queue-pattern qpid-interop parameter so it will create non-existent queues as needed. +Start a broker (Artemis, Active-MQ or Qpid). +NOTE: For qpidd, YOU MUST USE THE FOLLOWING PARAMETERS: + --load-module amqp : will enable the AMQP 1.0 protocol + --queue-pattern jms.queue.qpid-interop: will automatically create queues using this prefix as needed + --auth no : will disable authentication (which these tests do not use). From top level directory: AMQP type tests: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/35536d60/shims/qpid-proton-cpp/src/qpidit/shim/AmqpSender.cpp ---------------------------------------------------------------------- diff --git a/shims/qpid-proton-cpp/src/qpidit/shim/AmqpSender.cpp b/shims/qpid-proton-cpp/src/qpidit/shim/AmqpSender.cpp index e1c8bf7..6014464 100644 --- a/shims/qpid-proton-cpp/src/qpidit/shim/AmqpSender.cpp +++ b/shims/qpid-proton-cpp/src/qpidit/shim/AmqpSender.cpp @@ -83,8 +83,8 @@ namespace qpidit if (_amqpType.compare("null") == 0) { std::string testValueStr(testValue.asString()); if (testValueStr.compare("None") != 0) { throw qpidit::InvalidTestValueError(_amqpType, testValueStr); } - proton::value v; //proton::null n; - msg.body(v); //msg.body(n); + proton::value v; + msg.body(v); } else if (_amqpType.compare("boolean") == 0) { std::string testValueStr(testValue.asString()); if (testValueStr.compare("True") == 0) { http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/35536d60/src/py/qpid-interop-test/jms/jms_message_tests.py ---------------------------------------------------------------------- diff --git a/src/py/qpid-interop-test/jms/jms_message_tests.py b/src/py/qpid-interop-test/jms/jms_message_tests.py index b92d98c..9b5784c 100755 --- a/src/py/qpid-interop-test/jms/jms_message_tests.py +++ b/src/py/qpid-interop-test/jms/jms_message_tests.py @@ -190,8 +190,8 @@ class JmsMessageTypeTestCase(unittest.TestCase): to receive the values. Finally, compare the sent values with the received values. """ if len(test_values) > 0: - queue_name = 'qpid-interop.jms_message_type_tests.%s.%s.%s' % (jms_message_type, send_shim.NAME, - receive_shim.NAME) + queue_name = 'jms.queue.qpid-interop.jms_message_type_tests.%s.%s.%s' % (jms_message_type, send_shim.NAME, + receive_shim.NAME) send_error_text = send_shim.send(broker_addr, queue_name, jms_message_type, dumps(test_values)) if len(send_error_text) > 0: self.fail('Send shim \'%s\':\n%s' % (send_shim.NAME, send_error_text)) http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/35536d60/src/py/qpid-interop-test/types/simple_type_tests.py ---------------------------------------------------------------------- diff --git a/src/py/qpid-interop-test/types/simple_type_tests.py b/src/py/qpid-interop-test/types/simple_type_tests.py index 6261ca4..78551eb 100755 --- a/src/py/qpid-interop-test/types/simple_type_tests.py +++ b/src/py/qpid-interop-test/types/simple_type_tests.py @@ -156,14 +156,14 @@ class AmqpPrimitiveTypes(TestTypeMap): bytes(12345), b'Hello, world!', b'\\x01\\x02\\x03\\x04\\x05abcde\\x80\\x81\\xfe\\xff', - b'The quick brown fox jumped over the lazy dog 0123456789.' * 1000 + b'The quick brown fox jumped over the lazy dog 0123456789.' * 100 ], # strings must be unicode to comply with AMQP spec 'string': [u'', u'Hello, world!', u'"Hello, world!"', u"Charlie's peach", - u'The quick brown fox jumped over the lazy dog 0123456789.' * 1000 + u'The quick brown fox jumped over the lazy dog 0123456789.' * 100 ], 'symbol': ['', 'myDomain.123', @@ -174,7 +174,7 @@ class AmqpPrimitiveTypes(TestTypeMap): ['ulong:12345', 'timestamp:%d' % (time()*1000), 'short:-2500', 'uuid:%s' % uuid4(), 'symbol:a.b.c', 'none:', 'decimal64:0x400921fb54442eea'], [[], 'none', ['ubyte:1', 'ubyte:2', 'ubyte:3'], 'boolean:True', 'boolean:False', {'string:hello': 'long:1234', 'string:goodbye': 'boolean:True'}], [[], [[], [[], [], []], []], []], - ['short:0', 'short:1', 'short:2', 'short:3', 'short:4', 'short:5', 'short:6', 'short:7', 'short:8', 'short:9'] * 1000 + ['short:0', 'short:1', 'short:2', 'short:3', 'short:4', 'short:5', 'short:6', 'short:7', 'short:8', 'short:9'] * 100 ], 'map': [{}, {'string:one': 'ubyte:1', @@ -190,7 +190,7 @@ class AmqpPrimitiveTypes(TestTypeMap): # 'boolean:True': 'string:Hello, world!'}: 'symbol:map.value', #'string:list': [], 'string:map': {'char:A': 'int:1', - 'char:B': 'int:2'}} + 'char:B': 'int:2'}}, ], # TODO: Support all AMQP types in array (including keys) # 'array': [[], @@ -205,8 +205,10 @@ class AmqpPrimitiveTypes(TestTypeMap): BROKER_SKIP = {'null': {'ActiveMQ': 'Null type not sent in Proton Python binding: PROTON-1091', 'qpid-cpp': 'Null type not sent in Proton Python binding: PROTON-1091',}, - 'decimal32': {'qpid-cpp': 'decimal32 not supported on qpid-cpp broker: QPIDIT-5, QPID-6328',}, - 'decimal64': {'qpid-cpp': 'decimal64 not supported on qpid-cpp broker: QPIDIT-6, QPID-6328',}, + 'decimal32': {'ActiveMQ': 'decimal32 and decimal64 are sent byte reversed: PROTON-1160', + 'qpid-cpp': 'decimal32 not supported on qpid-cpp broker: QPIDIT-5, QPID-6328',}, + 'decimal64': {'ActiveMQ': 'decimal32 and decimal64 are sent byte reversed: PROTON-1160', + 'qpid-cpp': 'decimal64 not supported on qpid-cpp broker: QPIDIT-6, QPID-6328',}, 'decimal128': {'qpid-cpp': 'decimal128 not supported on qpid-cpp broker: QPIDIT-3, QPID-6328',}, 'char': {'qpid-cpp': 'char not supported on qpid-cpp broker: QPIDIT-4, QPID-6328',}, } @@ -224,7 +226,10 @@ class AmqpTypeTestCase(unittest.TestCase): to receive the values. Finally, compare the sent values with the received values. """ if len(test_value_list) > 0: - queue_name = 'qpid-interop.simple_type_tests.%s.%s.%s' % (amqp_type, send_shim.NAME, receive_shim.NAME) + # TODO: When Artemis can support it (in the next release), revert the queue name back to 'qpid-interop...' + # Currently, Artemis only supports auto-create queues for JMS, and the queue name must be prefixed by 'jms.queue.' + #queue_name = 'qpid-interop.simple_type_tests.%s.%s.%s' % (amqp_type, send_shim.NAME, receive_shim.NAME) + queue_name = 'jms.queue.qpid-interop.simple_type_tests.%s.%s.%s' % (amqp_type, send_shim.NAME, receive_shim.NAME) send_error_text = send_shim.send(broker_addr, queue_name, amqp_type, dumps(test_value_list)) if len(send_error_text) > 0: self.fail('Send shim \'%s\':\n%s' % (send_shim.NAME, send_error_text)) @@ -329,7 +334,7 @@ class ProtonPythonShim(Shim): """ Shim for qpid-proton Python client """ - NAME = 'Python' + NAME = 'ProtonPython' SHIM_LOC = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python', 'src') SEND = [path.join(SHIM_LOC, 'TypesSenderShim.py')] RECEIVE = [path.join(SHIM_LOC, 'TypesReceiverShim.py')] @@ -339,7 +344,7 @@ class ProtonCppShim(Shim): """ Shim for qpid-proton C++ client """ - NAME = 'C++' + NAME = 'ProtonCpp' SHIM_LOC = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'build', 'src') SEND = [path.join(SHIM_LOC, 'AmqpSender')] RECEIVE = [path.join(SHIM_LOC, 'AmqpReceiver')] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
