chore: update messaging examples

- dont strip matchers from pact content
- show examples of matchers in consumer message test
- show examples matchers.get_generated_values() to reify message of pact matchers
  for passing to handler under test

Author: YOU54F

examples/message/README.md

@@ -48,9 +48,9 @@ def test_generate_new_pact_file(pact):
     cleanup_json(PACT_FILE)
 
     expected_event = {
-        'documentName': 'document.doc',
-        'creator': 'TP',
-        'documentType': 'microsoft-word'
+        "documentName": Term("^.*\\.(doc|docx)$",'document.doc'),
+        "creator": Like("TP"),
+        "documentType": "microsoft-word",
     }
 
     (pact
@@ -63,7 +63,9 @@ def test_generate_new_pact_file(pact):
 
     with pact:
         # handler needs 'documentType' == 'microsoft-word'
-        MessageHandler(expected_event)
+        # call matchers.get_generated_values(expected_event) to
+        # reify/strip the expected_event of the matchers used
+        MessageHandler(matchers.get_generated_values(expected_event))
 
     progressive_delay(f"{PACT_FILE}")
     assert isfile(f"{PACT_FILE}") == 1
@@ -90,8 +92,8 @@ def test_throw_exception_handler(pact):
 
     with pytest.raises(CustomError):
         with pact:
-            # handler needs 'documentType' == 'microsoft-word'
-            MessageHandler(wrong_event)
+            # handler needs 'documentType' == 'microsoft-word
+            MessageHandler(matchers.get_generated_values(wrong_event))
 
     progressive_delay(f"{PACT_FILE}")
     assert isfile(f"{PACT_FILE}") == 0

examples/message/tests/consumer/test_message_consumer.py

@@ -8,6 +8,8 @@
 from os.path import isfile
 
 from pact import MessageConsumer, Provider
+from pact import matchers
+from pact.matchers import Like, Term
 from src.message_handler import MessageHandler, CustomError
 
 log = logging.getLogger(__name__)
@@ -93,7 +95,7 @@ def test_throw_exception_handler(pact_no_publish):
     with pytest.raises(CustomError):
         with pact_no_publish:
             # handler needs "documentType" == "microsoft-word"
-            MessageHandler(wrong_event)
+            MessageHandler(matchers.get_generated_values(wrong_event))
 
     progressive_delay(f"{PACT_FILE}")
     assert isfile(f"{PACT_FILE}") == 0
@@ -104,9 +106,9 @@ def test_put_file(pact_no_publish):
 
     expected_event = {
         "event": "ObjectCreated:Put",
-        "documentName": "document.doc",
-        "creator": "TP",
-        "documentType": "microsoft-word"
+        "documentName": Term("^.*\\.(doc|docx)$",'document.doc'),
+        "creator": Like("TP"),
+        "documentType": "microsoft-word",
     }
 
     (pact_no_publish
@@ -118,7 +120,7 @@ def test_put_file(pact_no_publish):
      }))
 
     with pact_no_publish:
-        MessageHandler(expected_event)
+        MessageHandler(matchers.get_generated_values(expected_event))
 
     progressive_delay(f"{PACT_FILE}")
     assert isfile(f"{PACT_FILE}") == 1
@@ -136,9 +138,9 @@ def test_publish_to_broker(pact):
 
     expected_event = {
         "event": "ObjectCreated:Delete",
-        "documentName": "document.doc",
-        "creator": "TP",
-        "documentType": "microsoft-word"
+        "documentName": Term("^.*\\.(doc|docx)$",'document.doc'),
+        "creator": Like("TP"),
+        "documentType": "microsoft-word",
     }
 
     (pact
@@ -150,7 +152,10 @@ def test_publish_to_broker(pact):
      }))
 
     with pact:
-        MessageHandler(expected_event)
+        # call matchers.get_generated_values(expected_event) to
+        # reify/strip the expected_event of the matchers used
+        # for Pact
+        MessageHandler(matchers.get_generated_values(expected_event))
 
     progressive_delay(f"{PACT_FILE}")
     assert isfile(f"{PACT_FILE}") == 1

examples/message/tests/provider/test_message_provider.py

@@ -22,7 +22,7 @@ def document_created_handler():
     return {
         "event": "ObjectCreated:Put",
         "documentName": "document.doc",
-        "creator": "TP",
+        "creator": "PF",
         "documentType": "microsoft-word"
     }
 

pact/message_pact.py

@@ -146,10 +146,7 @@ def with_content(self, contents):
         :rtype: Pact
         """
         self._insert_message_if_complete()
-        if any(isinstance(value, Term) for value in contents.values()):
-            self._messages[0]['contents'] = get_generated_values(contents)
-        else:
-            self._messages[0]['contents'] = from_term(contents)
+        self._messages[0]['contents'] = from_term(contents)
         return self
 
     def expects_to_receive(self, description):

tests/test_message_pact.py

@@ -158,7 +158,11 @@ def test_definition_with_matchers_in_content(self):
 
         self.assertEqual(
             target._messages[0]['contents'],
-            {'name': 'John', 'document_name': 'sample_document.doc', 'document_style': 'prose'})
+            {'name': 'John', 'document_name': 'sample_document.doc', 'document_style': {'data': {'generate': 'prose',
+                                     'matcher': {'json_class': 'Regexp',
+                                                 'o': 0,
+                                                 's': 'prose|docs'}},
+                            'json_class': 'Pact::Term'}})
 
         self.assertTrue({'contentType': 'application/json', 'source': 'legacy_api'}.items()
                         <= target._messages[0]['metaData'].items())