refactor: Make test structure march source code structure

Author: Hellgartner

pyproject.toml

@@ -39,7 +39,7 @@ package = true
 warn_return_any = true
 warn_unused_configs = true
 disallow_untyped_defs = true
-mypy_path='src'
+mypy_path='src:tests'
 
 [[tool.mypy.overrides]]
 module = [

tests/test_cli.py

@@ -11,7 +11,7 @@
 from spdx_tools.spdx.writer.write_anything import write_file
 
 from opossum_lib.cli import spdx2opossum
-from tests.helper_methods import _create_minimal_document
+from tests.test_spdx.helper_methods import _create_minimal_document
 
 
 @pytest.mark.parametrize("options", [("--infile", "--outfile"), ("-i", "-o")])

tests/test_opossum/__init__.py

@@ -20,7 +20,7 @@
 from opossum_lib.spdx.convert_to_opossum import convert_tree_to_opossum_information
 from opossum_lib.spdx.graph_generation import generate_graph_from_spdx
 from opossum_lib.spdx.tree_generation import generate_tree_from_graph
-from tests.helper_methods import (
+from tests.test_spdx.helper_methods import (
     _create_minimal_document,
     _generate_document_with_from_root_node_unreachable_file,
 )
@@ -236,7 +236,9 @@ def test_tree_generation_for_bigger_examples_spdx() -> None:
 
 
 def _get_opossum_information_from_file(file_name: str) -> OpossumInformation:
-    document = parse_file(str(Path(__file__).resolve().parent / "data" / file_name))
+    document = parse_file(
+        str(Path(__file__).resolve().parent.parent / "data" / file_name)
+    )
     return _get_opossum_information_from_document(document)
 
 

tests/test_file_generation.py tests/test_opossum/test_file_generation.py

@@ -10,7 +10,7 @@
 from spdx_tools.spdx.validation.document_validator import validate_full_spdx_document
 
 from opossum_lib.spdx.graph_generation import generate_graph_from_spdx
-from tests.helper_methods import _create_minimal_document
+from tests.test_spdx.helper_methods import _create_minimal_document
 
 
 @pytest.mark.parametrize(
@@ -31,7 +31,9 @@ def test_generate_graph_from_spdx(
     edges_count: int,
     relationship_node_keys: list[str],
 ) -> None:
-    document = parse_file(str(Path(__file__).resolve().parent / "data" / file_name))
+    document = parse_file(
+        str(Path(__file__).resolve().parent.parent / "data" / file_name)
+    )
     validation_messages = validate_full_spdx_document(document)
     graph = generate_graph_from_spdx(document)
 

tests/test_merge.py tests/test_opossum/test_merge.py

@@ -17,7 +17,7 @@
 
 from opossum_lib.spdx.graph_generation import generate_graph_from_spdx
 from opossum_lib.spdx.tree_generation import generate_tree_from_graph
-from tests.helper_methods import (
+from tests.test_spdx.helper_methods import (
     _create_minimal_document,
     _generate_document_with_from_root_node_unreachable_file,
 )
@@ -256,7 +256,9 @@ def test_tree_generation_unconnected_cycle() -> None:
 def test_tree_generation_for_bigger_examples(
     file_name: str, nodes_count: int, edges_count: int
 ) -> None:
-    document = parse_file(str(Path(__file__).resolve().parent / "data" / file_name))
+    document = parse_file(
+        str(Path(__file__).resolve().parent.parent / "data" / file_name)
+    )
     graph = generate_graph_from_spdx(document)
     tree = generate_tree_from_graph(graph)