test: tighten globals tests a little

Author: delatrie

allure-python-commons-test/src/result.py

@@ -251,6 +251,8 @@ def with_message_contains(string):
 def with_trace_contains(string):
     return has_entry("trace", contains_string(string))
 
+def with_no_trace():
+    return not_(has_entry("trace", anything()))
 
 def with_excluded():
     return has_entry("excluded", True)

tests/allure_behave/acceptance/behave_support/hooks/hook_test.py

@@ -1,6 +1,6 @@
 import allure
 from tests.allure_behave.behave_runner import AllureBehaveRunner as Runner
-from hamcrest import assert_that, all_of, not_, equal_to, has_item
+from hamcrest import assert_that, all_of, not_, equal_to, has_item, has_length
 from allure_commons_test.container import has_container, has_before, has_after
 from allure_commons_test.report import has_test_case
 from allure_commons_test.result import with_status
@@ -137,6 +137,11 @@ def after_all(context):
 """
     )
 
+    assert_that(
+        behave_runner.allure_results.globals,
+        has_length(2),
+    )
+
     assert_that(
         behave_runner.allure_results.globals,
         has_item(

tests/allure_pytest/acceptance/attachment/attachment_hook_test.py

@@ -1,4 +1,6 @@
-from hamcrest import assert_that, has_item, all_of, has_entry, equal_to, ends_with, not_, anything
+from hamcrest import assert_that, has_item, all_of
+from hamcrest import has_entry, equal_to, ends_with
+from hamcrest import not_, anything, has_length
 from tests.allure_pytest.pytest_runner import AllurePytestRunner
 
 from allure_commons_test.report import has_test_case
@@ -7,6 +9,7 @@
 from allure_commons_test.result import has_global_error
 from allure_commons_test.result import with_message_contains
 from allure_commons_test.result import with_trace_contains
+from allure_commons_test.result import with_no_trace
 
 
 def test_attach_from_runtest_teardown(allure_pytest_runner: AllurePytestRunner):
@@ -88,6 +91,11 @@ def pytest_sessionfinish(session, exitstatus):
         )
     )
 
+    assert_that(
+        allure_results.globals,
+        has_length(5),
+    )
+
     assert_that(
         allure_results.globals,
         all_of(
@@ -106,14 +114,9 @@ def pytest_sessionfinish(session, exitstatus):
                 )
             ),
             has_item(
-                has_entry(
-                    "errors",
-                    has_item(
-                        all_of(
-                            with_message_contains("message only error"),
-                                not_(has_entry("trace", anything()))
-                        )
-                    )
+                has_global_error(
+                    with_message_contains("message only error"),
+                    with_no_trace(),
                 )
             ),
             has_item(

tests/allure_pytest_bdd/acceptance/attachments_test.py

@@ -5,6 +5,7 @@
 from hamcrest import ends_with
 from hamcrest import has_item
 from hamcrest import not_
+from hamcrest import has_length
 
 from allure_commons_test.content import csv_equivalent
 from allure_commons_test.report import has_test_case
@@ -282,6 +283,8 @@ def pytest_sessionfinish(session, exitstatus):
         conftest_literal=conftest_content,
     )
 
+    assert_that(allure_results.globals, has_length(2))
+
     assert_that(
         allure_results.globals,
         has_item(

tests/allure_robotframework/acceptance/allure_api/attachment/attachment_test.py

@@ -1,7 +1,7 @@
 """ ./allure-robotframework/examples/attachment.rst """
 
 from pytest import MonkeyPatch
-from hamcrest import assert_that, equal_to, has_item
+from hamcrest import assert_that, equal_to, has_item, has_length
 from tests.allure_robotframework.robot_runner import AllureRobotRunner
 from allure_commons_test.report import has_test_case
 from allure_commons_test.result import has_attachment_with_content
@@ -156,17 +156,31 @@ def test_global_attachment_and_error(robot_runner: AllureRobotRunner):
                 """
                 *** Settings ***
                 Library     AllureLibrary
+                Library     ./lib.py
                 Suite Setup     Global Attach    robot global attachment    name=robot global
                 Suite Teardown  Global Error     robot global error
 
                 *** Test Cases ***
                 Global Attachment
-                    No Operation
+                    Add Globals From Code
                 """
-            )
-        }
+            ),
+        },
+        library_literals={
+            "lib.py": (
+                """
+                import allure
+
+                def add_globals_from_code():
+                    allure.global_attach(body="global body", name="global attachment")
+                    allure.global_error("message only error")
+                """
+            ),
+        },
     )
 
+    assert_that(robot_runner.allure_results.globals, has_length(4))
+
     assert_that(
         robot_runner.allure_results.globals,
         has_item(
@@ -177,6 +191,16 @@ def test_global_attachment_and_error(robot_runner: AllureRobotRunner):
             )
         )
     )
+    assert_that(
+        robot_runner.allure_results.globals,
+        has_item(
+            has_global_attachment_with_content(
+                robot_runner.allure_results.attachments,
+                equal_to("global body"),
+                name="global attachment"
+            )
+        )
+    )
     assert_that(
         robot_runner.allure_results.globals,
         has_item(
@@ -185,3 +209,11 @@ def test_global_attachment_and_error(robot_runner: AllureRobotRunner):
             )
         )
     )
+    assert_that(
+        robot_runner.allure_results.globals,
+        has_item(
+            has_global_error(
+                with_message_contains("message only error")
+            )
+        )
+    )