Merge pull request #159 from xverges/XV_dialog_test_line_breaks

make use of regexp patterns explicit + friendlier multiline

Author: andrewrfreed

dialog_test/README.md

@@ -30,6 +30,6 @@ The columns are
 
 All fields are optional
 
-* Match Output indicates a substring that must be present in the Watson Assistant response. It is not necessary to provide the full input string.
+* Match Output indicates a substring that must be present in the Watson Assistant response. It is not necessary to provide the full output string. Regular Expressions can be enclosed with forward slashes (e.g. `/The reservation is for *. PM/`). `<br>` can be used to join lines when specifyig multiline ouputs (e.g. `The reservation is for 6 guests<br>What day would you like to come in?`).
 
 If the User Input column is exactly 'NEWCONVERSATION' (no quotes) then a new conversation is started.  This allows multiple tests in the same file.

dialog_test/flowtest_v1.py

@@ -194,7 +194,10 @@ def runFlowTest(self, workspace_id=None, flow=None,json_dump=False,alternate_int
                 if 'text' in r['output']:
                   innerText = r['output']['text']
                 if row['Match Output'] != '':
-                    matchedOutput = bool(re.search(row['Match Output'], '\n'.join(innerText)))
+                    row['Match Output'] = '<br>'.join(row['Match Output'].splitlines())
+                    ouput_pattern = row['Match Output']
+                    ouput_pattern = re.escape(ouput_pattern) if not ouput_pattern.startswith('/') else ouput_pattern[1:-1]
+                    matchedOutput = bool(re.search(ouput_pattern, '<br>'.join(innerText), re.MULTILINE))
                     if matchedOutput == False:
                       self.reportFailure()
                 else:
@@ -226,7 +229,7 @@ def runFlowTest(self, workspace_id=None, flow=None,json_dump=False,alternate_int
 
                 record = { 
                     'User Input': row['User Input'],
-                    'Output Text': '\n'.join(r['output']['text']),
+                    'Output Text': '<br>'.join(r['output']['text']),
                     'Alternate Intents': ai,
                     'Conversation ID': r['context']['conversation_id'],
                     'Context': r['context'],
@@ -300,4 +303,4 @@ def convertReportToIntentPerRow(self, report=None,input_all_lines=True):
 
         return df
 
-    
+