Add more tests

Author: HardNorth

tests/integration/__init__.py

@@ -26,7 +26,8 @@
     ] + \
     [['examples/params/test_in_class_parameterized.py']] * 5 + \
     [['examples/hierarchy/inner/test_inner_simple.py']] * 7 + \
-    [['examples/hierarchy/test_in_class_in_class.py']]
+    [['examples/hierarchy/test_in_class_in_class.py']] + \
+    [['examples/test_simple.py']] * 2
 
 # noinspection PyTypeChecker
 HIERARCHY_TEST_VARIABLES = \
@@ -54,7 +55,9 @@
         dict({'rp_hierarchy_dirs_level': -1, 'rp_hierarchy_code': True,
               }, **utils.DEFAULT_VARIABLES),
         dict(**utils.DEFAULT_VARIABLES),
-        dict(**utils.DEFAULT_VARIABLES)
+        dict(**utils.DEFAULT_VARIABLES),
+        dict({'rp_hierarchy_test_file': False}, **utils.DEFAULT_VARIABLES),
+        dict({'rp_hierarchy_test_file': False, 'rp_hierarchy_dirs_level': 1}, **utils.DEFAULT_VARIABLES)
     ]
 
 HIERARCHY_TEST_EXPECTED_ITEMS = [
@@ -235,6 +238,14 @@
         {'name': 'examples/hierarchy/test_in_class_in_class.py::Tests::Test'
                  '::test_in_class_in_class',
          'item_type': 'STEP', 'parent_item_id': lambda x: x is None}
+    ],
+    [
+        {'name': 'examples/test_simple',
+         'item_type': 'STEP', 'parent_item_id': lambda x: x is None}
+    ],
+    [
+        {'name': 'test_simple',
+         'item_type': 'STEP', 'parent_item_id': lambda x: x is None}
     ]
 ]
 

tests/integration/test_suite_hierarchy.py

@@ -14,7 +14,6 @@
 """This module includes integration tests for different suite hierarchy."""
 
 import pytest
-from delayed_assert import expect, assert_expectations
 from unittest import mock
 
 from tests import REPORT_PORTAL_SERVICE
@@ -29,11 +28,10 @@ def verify_start_item_parameters(mock_client, expected_items):
     call_args = mock_client.start_test_item.call_args_list
     for i, call in enumerate(call_args):
         start_kwargs = call[1]
-        expect(start_kwargs['name'] == expected_items[i]['name'])
-        expect(start_kwargs['item_type'] == expected_items[i]['item_type'])
+        assert start_kwargs['name'] == expected_items[i]['name']
+        assert start_kwargs['item_type'] == expected_items[i]['item_type']
         verification = expected_items[i]['parent_item_id']
-        expect(verification(start_kwargs['parent_item_id']))
-    assert_expectations()
+        assert verification(start_kwargs['parent_item_id'])
 
 
 @pytest.mark.parametrize(('test', 'variables', 'expected_items'),