Support messages directly under test in output.xml.

pekkaklarck · pekkaklarck · commit 0fabf9f4c58f · 2021-03-02T12:28:01.000+02:00
Fixes robotframework#3762.
diff --git a/atest/robot/rebot/compatibility.robot b/atest/robot/rebot/compatibility.robot
@@ -1,16 +1,23 @@
 *** Settings ***
-Documentation     Test that current Rebot can process output.xml files generated by old Robot's.
-...               Used output.xml files have been generated by running
+Documentation     Test output.xml compatibility with old Robot versions and otherwise.
+...
+...               RF version specific output.xml files have been generated by running
 ...               ``./rundevel.py atest/testdata/misc/`` in appropriate version control tag.
-Test Template     Run Rebot And Validate Statistics
 Resource          rebot_resource.robot
 
 *** Test Cases ***
 RF 3.2 compatibility
-    rebot/output-3.2.2.xml    172    10
+    Run Rebot And Validate Statistics    rebot/output-3.2.2.xml    172    10
 
 RF 4.0 compatibility
-    rebot/output-4.0.xml      172    10
+    Run Rebot And Validate Statistics    rebot/output-4.0.xml      172    10
+
+Message directly under test
+    Run Rebot And Validate Statistics    rebot/issue-3762.xml      1      0
+    ${tc} =    Check Test Case    test A
+    Check Log Message    ${tc.body[0]}            Hi from test          WARN
+    Check Log Message    ${tc.body[1].body[0]}    Hi from keyword       WARN
+    Check Log Message    ${tc.body[2]}            Hi from test again    INFO
 
 *** Keywords ***
 Run Rebot And Validate Statistics
diff --git a/atest/testdata/rebot/issue-3762.xml b/atest/testdata/rebot/issue-3762.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<robot>
+    <suite source="suiteSource" name="suiteName">
+        <test id="A" name="test A">
+            <msg timestamp="20201116 08:29:45.100" level="WARN">Hi from test</msg>
+            <kw name="log">
+                <msg timestamp="20201116 08:29:45.100" level="WARN">Hi from keyword</msg>
+            </kw>
+            <status status="PASS" starttime="20201116 08:29:45.130" endtime="20201116 08:29:45.140"/>
+            <msg timestamp="20201116 08:29:45.100" level="INFO">Hi from test again</msg>
+        </test>
+    </suite>
+</robot>
diff --git a/src/robot/result/xmlelementhandlers.py b/src/robot/result/xmlelementhandlers.py
@@ -103,7 +103,8 @@ def get_child_handler(self, tag):
 class TestHandler(ElementHandler):
     tag = 'test'
     # 'tags' is for RF < 4 compatibility.
-    children = frozenset(('doc', 'tags', 'tag', 'timeout', 'status', 'kw', 'if', 'for'))
+    children = frozenset(('doc', 'tags', 'tag', 'timeout', 'status', 'kw', 'if', 'for',
+                          'msg'))
 
     def start(self, elem, result):
         return result.tests.create(name=elem.get('name', ''))
diff --git a/utest/reporting/test_jsmodelbuilders.py b/utest/reporting/test_jsmodelbuilders.py
@@ -186,6 +186,17 @@ def test_if(self):
         )
         self._verify_test(test, body=(exp_if, exp_else_if, exp_else))
 
+    def test_message_directly_under_test(self):
+        test = TestSuite().tests.create()
+        test.body.create_message('Hi from test')
+        test.body.create_keyword().body.create_message('Hi from keyword')
+        test.body.create_message('Hi from test again', 'WARN')
+        exp_m1 = (8, None, 2, 'Hi from test')
+        exp_kw = (0, '', '', '', '', '', '', '', (0, None, 0),
+                  ((8, None, 2, 'Hi from keyword'),))
+        exp_m3 = (8, None, 3, 'Hi from test again')
+        self._verify_test(test, body=(exp_m1, exp_kw, exp_m3))
+
     def _verify_status(self, model, status=0, start=None, elapsed=0):
         assert_equal(model, (status, start, elapsed))
 
