QPIDIT-61: Fixed error in jms_hdrs_props_test Python Sender shim, which contained an invalid import which was not changed to match the newly refactored modules.
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 9a05490..4100891 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
@@ -36,7 +36,7 @@
import proton.reactor
from qpid_interop_test.interop_test_errors import InteropTestError
from qpid_interop_test.jms_types import create_annotation
-from qpid_interop_test.test_type_map import TestTypeMap
+from qpid_interop_test.qit_common import QitTestTypeMap
import _compat
@@ -154,8 +154,8 @@
(test_value, test_value_type))
return proton.Message(id=(self.sent+1),
content_type='application/octet-stream',
- annotations=TestTypeMap.merge_dicts(create_annotation('JMS_MESSAGE_TYPE'),
- hdr_annotations),
+ annotations=QitTestTypeMap.merge_dicts(create_annotation('JMS_MESSAGE_TYPE'),
+ hdr_annotations),
**hdr_kwargs)
def _create_jms_bytesmessage(self, test_value_type, test_value, hdr_kwargs, hdr_annotations):
@@ -190,8 +190,8 @@
body=body_bytes,
inferred=True,
content_type='application/octet-stream',
- annotations=TestTypeMap.merge_dicts(create_annotation('JMS_BYTESMESSAGE_TYPE'),
- hdr_annotations),
+ annotations=QitTestTypeMap.merge_dicts(create_annotation('JMS_BYTESMESSAGE_TYPE'),
+ hdr_annotations),
**hdr_kwargs)
def _create_jms_mapmessage(self, test_value_type, test_value, name, hdr_kwargs, hdr_annotations):
@@ -222,8 +222,8 @@
return proton.Message(id=(self.sent+1),
body={name: value},
inferred=False,
- annotations=TestTypeMap.merge_dicts(create_annotation('JMS_MAPMESSAGE_TYPE'),
- hdr_annotations),
+ annotations=QitTestTypeMap.merge_dicts(create_annotation('JMS_MAPMESSAGE_TYPE'),
+ hdr_annotations),
**hdr_kwargs)
def _create_jms_objectmessage(self, test_value, hdr_kwargs, hdr_annotations):
@@ -233,8 +233,8 @@
body=java_binary,
inferred=True,
content_type='application/x-java-serialized-object',
- annotations=TestTypeMap.merge_dicts(create_annotation('JMS_MAPMESSAGE_TYPE'),
- hdr_annotations),
+ annotations=QitTestTypeMap.merge_dicts(create_annotation('JMS_MAPMESSAGE_TYPE'),
+ hdr_annotations),
**hdr_kwargs)
@staticmethod
@@ -279,16 +279,16 @@
return proton.Message(id=(self.sent+1),
body=body_list,
inferred=True,
- annotations=TestTypeMap.merge_dicts(create_annotation('JMS_STREAMMESSAGE_TYPE'),
- hdr_annotations),
+ annotations=QitTestTypeMap.merge_dicts(create_annotation('JMS_STREAMMESSAGE_TYPE'),
+ hdr_annotations),
**hdr_kwargs)
def _create_jms_textmessage(self, test_value_text, hdr_kwargs, hdr_annotations):
"""Create a JMS text message"""
return proton.Message(id=(self.sent+1),
body=_compat.unicode(test_value_text),
- annotations=TestTypeMap.merge_dicts(create_annotation('JMS_TEXTMESSAGE_TYPE'),
- hdr_annotations),
+ annotations=QitTestTypeMap.merge_dicts(create_annotation('JMS_TEXTMESSAGE_TYPE'),
+ hdr_annotations),
**hdr_kwargs)
def _get_jms_message_header_kwargs(self):
