Fix up tests to match GTest report changes

Expect extra ProcessChecks suite in every report.
morganstanley · Mar 11, 2020 · dbb2617 · dbb2617
1 parent 327faae
commit dbb2617
Show file tree

Hide file tree

Showing 9 changed files with 131 additions and 33 deletions.
diff --git a/tests/functional/testplan/testing/cpp/test_gtest.py b/tests/functional/testplan/testing/cpp/test_gtest.py
@@ -43,7 +43,7 @@
         (
             os.path.join(fixture_root, "empty"),
             gtest.empty.report.expected_report,
-            Status.UNKNOWN,
+            Status.PASSED,
         ),
     ),
 )

diff --git a/tests/functional/testplan/testing/fixtures/base/failing/report.py b/tests/functional/testplan/testing/fixtures/base/failing/report.py
@@ -1,20 +1,24 @@
 import re
 
-from testplan.report import TestReport, TestGroupReport, TestCaseReport, Status
+from testplan.report import (
+    TestReport,
+    TestGroupReport,
+    TestCaseReport,
+    RuntimeStatus,
+)
 
 testcase_report = TestCaseReport(
-    name="failure",
+    name="ExitCodeCheck",
     entries=[
         {
             "type": "RawAssertion",
-            "description": "Process failure details",
-            # 'content': ''
+            "description": "Process exit code check",
+            "passed": False,
         }
     ],
 )
 
-testcase_report.status_override = Status.ERROR
-
+testcase_report.runtime_status = RuntimeStatus.FINISHED
 
 expected_report = TestReport(
     name="plan",
@@ -24,7 +28,7 @@
             category="dummytest",
             entries=[
                 TestGroupReport(
-                    name="ProcessFailure",
+                    name="ProcessChecks",
                     category="testsuite",
                     entries=[testcase_report],
                 )

diff --git a/tests/functional/testplan/testing/fixtures/base/passing/report.py b/tests/functional/testplan/testing/fixtures/base/passing/report.py
@@ -1,6 +1,39 @@
-from testplan.report import TestReport, TestGroupReport
+from testplan.report import (
+    TestReport,
+    TestGroupReport,
+    TestCaseReport,
+    RuntimeStatus,
+)
+from testplan.testing.multitest.entries.assertions import RawAssertion
+
+testcase_report = TestCaseReport(
+    name="ExitCodeCheck",
+    uid="ExitCodeCheck",
+    suite_related=True,
+    entries=[
+        {
+            "type": "RawAssertion",
+            "description": "Process exit code check",
+            "passed": True,
+        }
+    ],
+)
+
+testcase_report.runtime_status = RuntimeStatus.FINISHED
 
 expected_report = TestReport(
     name="plan",
-    entries=[TestGroupReport(name="MyTest", category="dummytest", entries=[])],
+    entries=[
+        TestGroupReport(
+            name="MyTest",
+            category="dummytest",
+            entries=[
+                TestGroupReport(
+                    name="ProcessChecks",
+                    category="testsuite",
+                    entries=[testcase_report],
+                ),
+            ],
+        ),
+    ],
 )
diff --git a/tests/functional/testplan/testing/fixtures/base/sleeping/report.py b/tests/functional/testplan/testing/fixtures/base/sleeping/report.py
@@ -1,27 +1,32 @@
 import re
 
-from testplan.report import TestReport, TestGroupReport, TestCaseReport, Status
+from testplan.report import (
+    TestReport,
+    TestGroupReport,
+    TestCaseReport,
+    Status,
+    RuntimeStatus,
+)
 
 testcase_report = TestCaseReport(
-    name="failure",
+    name="ExitCodeCheck",
     entries=[
         {
             "type": "RawAssertion",
-            "description": "Process failure details",
-            # 'content': ''
+            "description": "Process exit code check",
+            "passed": False,
         }
     ],
 )
 
-testcase_report.status_override = Status.ERROR
-
+testcase_report.runtime_status = RuntimeStatus.FINISHED
 
 my_test_report = TestGroupReport(
     name="MyTest",
     category="dummytest",
     entries=[
         TestGroupReport(
-            name="ProcessFailure",
+            name="ProcessChecks",
             category="testsuite",
             entries=[testcase_report],
         )
@@ -37,8 +42,6 @@
     }
 ]
 
-
 my_test_report.status_override = Status.ERROR
 
-
 expected_report = TestReport(name="plan", entries=[my_test_report])
diff --git a/tests/functional/testplan/testing/fixtures/cpp/gtest/empty/report.py b/tests/functional/testplan/testing/fixtures/cpp/gtest/empty/report.py
@@ -4,7 +4,21 @@
     name="plan",
     entries=[
         TestGroupReport(
-            name="MyGTest", category="gtest", entries=[], tags=None
-        )
+            name="MyGTest",
+            category="gtest",
+            tags=None,
+            entries=[
+                TestGroupReport(
+                    name="ProcessChecks",
+                    category="testsuite",
+                    entries=[
+                        TestCaseReport(
+                            name="ExitCodeCheck",
+                            entries=[{"type": "RawAssertion", "passed": True}],
+                        ),
+                    ],
+                ),
+            ],
+        ),
     ],
 )
diff --git a/tests/functional/testplan/testing/fixtures/cpp/gtest/failing/report.py b/tests/functional/testplan/testing/fixtures/cpp/gtest/failing/report.py
@@ -19,8 +19,7 @@
                         ),
                         TestCaseReport(
                             name="NegativeNos",
-                            status_override="passed",
-                            entries=[],
+                            entries=[{"type": "RawAssertion", "passed": True}],
                         ),
                     ],
                 ),
@@ -37,8 +36,19 @@
                         ),
                         TestCaseReport(
                             name="NegativeNos",
-                            status_override="passed",
-                            entries=[],
+                            entries=[{"type": "RawAssertion", "passed": True}],
+                        ),
+                    ],
+                ),
+                TestGroupReport(
+                    name="ProcessChecks",
+                    category="testsuite",
+                    entries=[
+                        TestCaseReport(
+                            name="ExitCodeCheck",
+                            entries=[
+                                {"type": "RawAssertion", "passed": False}
+                            ],
                         ),
                     ],
                 ),

diff --git a/tests/functional/testplan/testing/fixtures/cpp/gtest/passing/report.py b/tests/functional/testplan/testing/fixtures/cpp/gtest/passing/report.py
@@ -13,13 +13,15 @@
                     entries=[
                         TestCaseReport(
                             name="PositiveNos",
-                            status_override="passed",
-                            entries=[],
+                            entries=[
+                                {"type": "RawAssertion", "passed": True},
+                            ],
                         ),
                         TestCaseReport(
                             name="NegativeNos",
-                            status_override="passed",
-                            entries=[],
+                            entries=[
+                                {"type": "RawAssertion", "passed": True},
+                            ],
                         ),
                     ],
                 ),
@@ -29,13 +31,25 @@
                     entries=[
                         TestCaseReport(
                             name="PositiveNos",
-                            status_override="passed",
-                            entries=[],
+                            entries=[
+                                {"type": "RawAssertion", "passed": True},
+                            ],
                         ),
                         TestCaseReport(
                             name="NegativeNos",
-                            status_override="passed",
-                            entries=[],
+                            entries=[
+                                {"type": "RawAssertion", "passed": True},
+                            ],
+                        ),
+                    ],
+                ),
+                TestGroupReport(
+                    name="ProcessChecks",
+                    category="testsuite",
+                    entries=[
+                        TestCaseReport(
+                            name="ExitCodeCheck",
+                            entries=[{"type": "RawAssertion", "passed": True}],
                         ),
                     ],
                 ),

diff --git a/tests/functional/testplan/testing/fixtures/cpp/hobbestest/failing/report.py b/tests/functional/testplan/testing/fixtures/cpp/hobbestest/failing/report.py
@@ -129,6 +129,16 @@
                     ],
                     tags=None,
                 ),
+                TestGroupReport(
+                    name="ProcessChecks",
+                    category="testsuite",
+                    entries=[
+                        TestCaseReport(
+                            name="ExitCodeCheck",
+                            entries=[{"type": "RawAssertion", "passed": True}],
+                        ),
+                    ],
+                ),
             ],
             tags=None,
         )

diff --git a/tests/functional/testplan/testing/fixtures/cpp/hobbestest/passing/report.py b/tests/functional/testplan/testing/fixtures/cpp/hobbestest/passing/report.py
@@ -126,6 +126,16 @@
                     ],
                     tags=None,
                 ),
+                TestGroupReport(
+                    name="ProcessChecks",
+                    category="testsuite",
+                    entries=[
+                        TestCaseReport(
+                            name="ExitCodeCheck",
+                            entries=[{"type": "RawAssertion", "passed": True}],
+                        ),
+                    ],
+                ),
             ],
             tags=None,
         )