spdx · meretp · Jan 17, 2023 · Jan 10, 2023
diff --git a/.github/workflows/install_and_test.yml b/.github/workflows/install_and_test.yml
@@ -27,4 +27,4 @@ jobs:
       - name: Run tests
         run: pytest
       - name: Run CLI
-        run: pyspdxtools -i ./tests/data/formats/SPDXJSONExample-v2.3.spdx.json
+        run: pyspdxtools -i ./tests/spdx/data/formats/SPDXJSONExample-v2.3.spdx.json
diff --git a/tests/jsonschema/__init__.py → tests/spdx/__init__.py b/tests/jsonschema/__init__.py → tests/spdx/__init__.py
diff --git a/tests/data/doc_parse/SBOMexpected.json → tests/spdx/data/doc_parse/SBOMexpected.json b/tests/data/doc_parse/SBOMexpected.json → tests/spdx/data/doc_parse/SBOMexpected.json
diff --git a/tests/data/doc_parse/expected.json → tests/spdx/data/doc_parse/expected.json b/tests/data/doc_parse/expected.json → tests/spdx/data/doc_parse/expected.json
diff --git a/tests/data/doc_parse/spdx-expected.json → tests/spdx/data/doc_parse/spdx-expected.json b/tests/data/doc_parse/spdx-expected.json → tests/spdx/data/doc_parse/spdx-expected.json
diff --git a/.../doc_write/json-simple-multi-package.json → .../doc_write/json-simple-multi-package.json b/.../doc_write/json-simple-multi-package.json → .../doc_write/json-simple-multi-package.json
diff --git a/tests/data/doc_write/json-simple-plus.json → ...spdx/data/doc_write/json-simple-plus.json b/tests/data/doc_write/json-simple-plus.json → ...spdx/data/doc_write/json-simple-plus.json
diff --git a/tests/data/doc_write/json-simple.json → tests/spdx/data/doc_write/json-simple.json b/tests/data/doc_write/json-simple.json → tests/spdx/data/doc_write/json-simple.json
diff --git a/tests/data/doc_write/rdf-mini.json → tests/spdx/data/doc_write/rdf-mini.json b/tests/data/doc_write/rdf-mini.json → tests/spdx/data/doc_write/rdf-mini.json
diff --git a/tests/data/doc_write/rdf-simple-plus.json → .../spdx/data/doc_write/rdf-simple-plus.json b/tests/data/doc_write/rdf-simple-plus.json → .../spdx/data/doc_write/rdf-simple-plus.json
diff --git a/tests/data/doc_write/rdf-simple.json → tests/spdx/data/doc_write/rdf-simple.json b/tests/data/doc_write/rdf-simple.json → tests/spdx/data/doc_write/rdf-simple.json
diff --git a/tests/data/doc_write/tv-mini.tv → tests/spdx/data/doc_write/tv-mini.tv b/tests/data/doc_write/tv-mini.tv → tests/spdx/data/doc_write/tv-mini.tv
diff --git a/tests/data/doc_write/tv-simple-plus.tv → tests/spdx/data/doc_write/tv-simple-plus.tv b/tests/data/doc_write/tv-simple-plus.tv → tests/spdx/data/doc_write/tv-simple-plus.tv
diff --git a/tests/data/doc_write/tv-simple.tv → tests/spdx/data/doc_write/tv-simple.tv b/tests/data/doc_write/tv-simple.tv → tests/spdx/data/doc_write/tv-simple.tv
diff --git a/...ta/doc_write/xml-simple-multi-package.xml → ...ta/doc_write/xml-simple-multi-package.xml b/...ta/doc_write/xml-simple-multi-package.xml → ...ta/doc_write/xml-simple-multi-package.xml
diff --git a/tests/data/doc_write/xml-simple-plus.xml → ...s/spdx/data/doc_write/xml-simple-plus.xml b/tests/data/doc_write/xml-simple-plus.xml → ...s/spdx/data/doc_write/xml-simple-plus.xml
diff --git a/tests/data/doc_write/xml-simple.xml → tests/spdx/data/doc_write/xml-simple.xml b/tests/data/doc_write/xml-simple.xml → tests/spdx/data/doc_write/xml-simple.xml
diff --git a/.../doc_write/yaml-simple-multi-package.yaml → .../doc_write/yaml-simple-multi-package.yaml b/.../doc_write/yaml-simple-multi-package.yaml → .../doc_write/yaml-simple-multi-package.yaml
diff --git a/tests/data/doc_write/yaml-simple-plus.yaml → ...spdx/data/doc_write/yaml-simple-plus.yaml b/tests/data/doc_write/yaml-simple-plus.yaml → ...spdx/data/doc_write/yaml-simple-plus.yaml
diff --git a/tests/data/doc_write/yaml-simple.yaml → tests/spdx/data/doc_write/yaml-simple.yaml b/tests/data/doc_write/yaml-simple.yaml → tests/spdx/data/doc_write/yaml-simple.yaml
diff --git a/...ta/formats/SPDXJSONExample-v2.2.spdx.json → ...ta/formats/SPDXJSONExample-v2.2.spdx.json b/...ta/formats/SPDXJSONExample-v2.2.spdx.json → ...ta/formats/SPDXJSONExample-v2.2.spdx.json
diff --git a/...ta/formats/SPDXJSONExample-v2.3.spdx.json → ...ta/formats/SPDXJSONExample-v2.3.spdx.json b/...ta/formats/SPDXJSONExample-v2.3.spdx.json → ...ta/formats/SPDXJSONExample-v2.3.spdx.json
diff --git a/tests/data/formats/SPDXJsonExample.json → tests/spdx/data/formats/SPDXJsonExample.json b/tests/data/formats/SPDXJsonExample.json → tests/spdx/data/formats/SPDXJsonExample.json
diff --git a/tests/data/formats/SPDXRdfExample.rdf → tests/spdx/data/formats/SPDXRdfExample.rdf b/tests/data/formats/SPDXRdfExample.rdf → tests/spdx/data/formats/SPDXRdfExample.rdf
diff --git a/tests/data/formats/SPDXSBOMExample.spdx.yml → ...pdx/data/formats/SPDXSBOMExample.spdx.yml b/tests/data/formats/SPDXSBOMExample.spdx.yml → ...pdx/data/formats/SPDXSBOMExample.spdx.yml
diff --git a/tests/data/formats/SPDXSBOMExample.tag → tests/spdx/data/formats/SPDXSBOMExample.tag b/tests/data/formats/SPDXSBOMExample.tag → tests/spdx/data/formats/SPDXSBOMExample.tag
diff --git a/tests/data/formats/SPDXSimpleTag.tag → tests/spdx/data/formats/SPDXSimpleTag.tag b/tests/data/formats/SPDXSimpleTag.tag → tests/spdx/data/formats/SPDXSimpleTag.tag
diff --git a/tests/data/formats/SPDXTagExample-v2.2.spdx → ...pdx/data/formats/SPDXTagExample-v2.2.spdx b/tests/data/formats/SPDXTagExample-v2.2.spdx → ...pdx/data/formats/SPDXTagExample-v2.2.spdx
diff --git a/tests/data/formats/SPDXTagExample-v2.3.spdx → ...pdx/data/formats/SPDXTagExample-v2.3.spdx b/tests/data/formats/SPDXTagExample-v2.3.spdx → ...pdx/data/formats/SPDXTagExample-v2.3.spdx
diff --git a/tests/data/formats/SPDXTagExample.tag → tests/spdx/data/formats/SPDXTagExample.tag b/tests/data/formats/SPDXTagExample.tag → tests/spdx/data/formats/SPDXTagExample.tag
diff --git a/...data/formats/SPDXXMLExample-v2.2.spdx.xml → ...data/formats/SPDXXMLExample-v2.2.spdx.xml b/...data/formats/SPDXXMLExample-v2.2.spdx.xml → ...data/formats/SPDXXMLExample-v2.2.spdx.xml
diff --git a/...data/formats/SPDXXMLExample-v2.3.spdx.xml → ...data/formats/SPDXXMLExample-v2.3.spdx.xml b/...data/formats/SPDXXMLExample-v2.3.spdx.xml → ...data/formats/SPDXXMLExample-v2.3.spdx.xml
diff --git a/tests/data/formats/SPDXXmlExample.xml → tests/spdx/data/formats/SPDXXmlExample.xml b/tests/data/formats/SPDXXmlExample.xml → tests/spdx/data/formats/SPDXXmlExample.xml
diff --git a/...ata/formats/SPDXYAMLExample-2.2.spdx.yaml → ...ata/formats/SPDXYAMLExample-2.2.spdx.yaml b/...ata/formats/SPDXYAMLExample-2.2.spdx.yaml → ...ata/formats/SPDXYAMLExample-2.2.spdx.yaml
diff --git a/...ata/formats/SPDXYAMLExample-2.3.spdx.yaml → ...ata/formats/SPDXYAMLExample-2.3.spdx.yaml b/...ata/formats/SPDXYAMLExample-2.3.spdx.yaml → ...ata/formats/SPDXYAMLExample-2.3.spdx.yaml
diff --git a/tests/data/formats/SPDXYamlExample.yaml → tests/spdx/data/formats/SPDXYamlExample.yaml b/tests/data/formats/SPDXYamlExample.yaml → tests/spdx/data/formats/SPDXYamlExample.yaml
diff --git a/tests/fixtures.py → tests/spdx/fixtures.py b/tests/fixtures.py → tests/spdx/fixtures.py
diff --git a/tests/model/__init__.py → tests/spdx/jsonschema/__init__.py b/tests/model/__init__.py → tests/spdx/jsonschema/__init__.py
diff --git a/...s/jsonschema/test_annotation_converter.py → ...x/jsonschema/test_annotation_converter.py b/...s/jsonschema/test_annotation_converter.py → ...x/jsonschema/test_annotation_converter.py
diff --git a/tests/jsonschema/test_checksum_converter.py → ...pdx/jsonschema/test_checksum_converter.py b/tests/jsonschema/test_checksum_converter.py → ...pdx/jsonschema/test_checksum_converter.py
diff --git a/tests/jsonschema/test_converter.py → tests/spdx/jsonschema/test_converter.py b/tests/jsonschema/test_converter.py → tests/spdx/jsonschema/test_converter.py
diff --git a/...sonschema/test_creation_info_converter.py → ...sonschema/test_creation_info_converter.py b/...sonschema/test_creation_info_converter.py → ...sonschema/test_creation_info_converter.py
@@ -18,7 +18,7 @@
 from spdx.model.actor import Actor, ActorType
 from spdx.model.document import CreationInfo
 from spdx.model.version import Version
-from tests.fixtures import creation_info_fixture
+from tests.spdx.fixtures import creation_info_fixture
 
 
 @pytest.fixture

diff --git a/tests/jsonschema/test_document_converter.py → ...pdx/jsonschema/test_document_converter.py b/tests/jsonschema/test_document_converter.py → ...pdx/jsonschema/test_document_converter.py
@@ -24,9 +24,9 @@
 from spdx.model.document import Document
 from spdx.model.extracted_licensing_info import ExtractedLicensingInfo
 from spdx.model.relationship import Relationship, RelationshipType
-from tests.fixtures import creation_info_fixture, file_fixture, package_fixture, external_document_ref_fixture, \
+from tests.spdx.fixtures import creation_info_fixture, file_fixture, package_fixture, external_document_ref_fixture, \
     snippet_fixture, annotation_fixture, document_fixture, relationship_fixture
-from tests.mock_utils import assert_mock_method_called_with_arguments, assert_no_mock_methods_called
+from tests.spdx.mock_utils import assert_mock_method_called_with_arguments, assert_no_mock_methods_called
 
 
 @pytest.fixture

diff --git a/...a/test_external_document_ref_converter.py → ...a/test_external_document_ref_converter.py b/...a/test_external_document_ref_converter.py → ...a/test_external_document_ref_converter.py
diff --git a/...ma/test_external_package_ref_converter.py → ...ma/test_external_package_ref_converter.py b/...ma/test_external_package_ref_converter.py → ...ma/test_external_package_ref_converter.py
diff --git a/...est_extracted_licensing_info_converter.py → ...est_extracted_licensing_info_converter.py b/...est_extracted_licensing_info_converter.py → ...est_extracted_licensing_info_converter.py
@@ -14,7 +14,7 @@
 from spdx.jsonschema.extracted_licensing_info_properties import ExtractedLicensingInfoProperty
 from spdx.model.extracted_licensing_info import ExtractedLicensingInfo
 from spdx.model.spdx_no_assertion import SpdxNoAssertion, SPDX_NO_ASSERTION_STRING
-from tests.fixtures import extracted_licensing_info_fixture
+from tests.spdx.fixtures import extracted_licensing_info_fixture
 
 
 @pytest.fixture

diff --git a/tests/jsonschema/test_file_converter.py → tests/spdx/jsonschema/test_file_converter.py b/tests/jsonschema/test_file_converter.py → tests/spdx/jsonschema/test_file_converter.py
@@ -26,8 +26,8 @@
 from spdx.model.license_expression import LicenseExpression
 from spdx.model.spdx_no_assertion import SpdxNoAssertion, SPDX_NO_ASSERTION_STRING
 from spdx.model.spdx_none import SpdxNone, SPDX_NONE_STRING
-from tests.fixtures import creation_info_fixture, file_fixture, annotation_fixture, document_fixture
-from tests.mock_utils import assert_mock_method_called_with_arguments
+from tests.spdx.fixtures import creation_info_fixture, file_fixture, annotation_fixture, document_fixture
+from tests.spdx.mock_utils import assert_mock_method_called_with_arguments
 
 
 @pytest.fixture

diff --git a/tests/jsonschema/test_package_converter.py → ...spdx/jsonschema/test_package_converter.py b/tests/jsonschema/test_package_converter.py → ...spdx/jsonschema/test_package_converter.py
@@ -27,9 +27,9 @@
 from spdx.model.relationship import RelationshipType
 from spdx.model.spdx_no_assertion import SpdxNoAssertion, SPDX_NO_ASSERTION_STRING
 from spdx.model.spdx_none import SpdxNone, SPDX_NONE_STRING
-from tests.fixtures import creation_info_fixture, package_fixture, external_package_ref_fixture, document_fixture, \
+from tests.spdx.fixtures import creation_info_fixture, package_fixture, external_package_ref_fixture, document_fixture, \
     annotation_fixture, file_fixture, relationship_fixture, snippet_fixture
-from tests.mock_utils import assert_mock_method_called_with_arguments
+from tests.spdx.mock_utils import assert_mock_method_called_with_arguments
 
 
 @pytest.fixture

diff --git a/...st_package_verification_code_converter.py → ...st_package_verification_code_converter.py b/...st_package_verification_code_converter.py → ...st_package_verification_code_converter.py
diff --git a/...jsonschema/test_relationship_converter.py → ...jsonschema/test_relationship_converter.py b/...jsonschema/test_relationship_converter.py → ...jsonschema/test_relationship_converter.py
@@ -15,7 +15,7 @@
 from spdx.model.relationship import Relationship, RelationshipType
 from spdx.model.spdx_no_assertion import SpdxNoAssertion, SPDX_NO_ASSERTION_STRING
 from spdx.model.spdx_none import SpdxNone, SPDX_NONE_STRING
-from tests.fixtures import relationship_fixture
+from tests.spdx.fixtures import relationship_fixture
 
 
 @pytest.fixture

diff --git a/tests/jsonschema/test_snippet_converter.py → ...spdx/jsonschema/test_snippet_converter.py b/tests/jsonschema/test_snippet_converter.py → ...spdx/jsonschema/test_snippet_converter.py
@@ -25,8 +25,8 @@
 from spdx.model.snippet import Snippet
 from spdx.model.spdx_no_assertion import SpdxNoAssertion, SPDX_NO_ASSERTION_STRING
 from spdx.model.spdx_none import SpdxNone, SPDX_NONE_STRING
-from tests.fixtures import creation_info_fixture, snippet_fixture, document_fixture, annotation_fixture
-from tests.mock_utils import assert_mock_method_called_with_arguments
+from tests.spdx.fixtures import creation_info_fixture, snippet_fixture, document_fixture, annotation_fixture
+from tests.spdx.mock_utils import assert_mock_method_called_with_arguments
 
 
 @pytest.fixture

diff --git a/tests/mock_utils.py → tests/spdx/mock_utils.py b/tests/mock_utils.py → tests/spdx/mock_utils.py
diff --git a/tests/parser/__init__.py → tests/spdx/model/__init__.py b/tests/parser/__init__.py → tests/spdx/model/__init__.py
diff --git a/tests/model/test_actor.py → tests/spdx/model/test_actor.py b/tests/model/test_actor.py → tests/spdx/model/test_actor.py
diff --git a/tests/model/test_annotation.py → tests/spdx/model/test_annotation.py b/tests/model/test_annotation.py → tests/spdx/model/test_annotation.py
diff --git a/tests/model/test_checksum.py → tests/spdx/model/test_checksum.py b/tests/model/test_checksum.py → tests/spdx/model/test_checksum.py
diff --git a/tests/model/test_creation_info.py → tests/spdx/model/test_creation_info.py b/tests/model/test_creation_info.py → tests/spdx/model/test_creation_info.py
diff --git a/tests/model/test_document.py → tests/spdx/model/test_document.py b/tests/model/test_document.py → tests/spdx/model/test_document.py
diff --git a/tests/model/test_external_document_ref.py → .../spdx/model/test_external_document_ref.py b/tests/model/test_external_document_ref.py → .../spdx/model/test_external_document_ref.py
diff --git a/.../model/test_external_package_reference.py → .../model/test_external_package_reference.py b/.../model/test_external_package_reference.py → .../model/test_external_package_reference.py
diff --git a/tests/model/test_extracted_licensing_info.py → ...dx/model/test_extracted_licensing_info.py b/tests/model/test_extracted_licensing_info.py → ...dx/model/test_extracted_licensing_info.py
diff --git a/tests/model/test_file.py → tests/spdx/model/test_file.py b/tests/model/test_file.py → tests/spdx/model/test_file.py
diff --git a/tests/model/test_license.py → tests/spdx/model/test_license.py b/tests/model/test_license.py → tests/spdx/model/test_license.py
diff --git a/tests/model/test_package.py → tests/spdx/model/test_package.py b/tests/model/test_package.py → tests/spdx/model/test_package.py
diff --git a/...s/model/test_package_verification_code.py → ...x/model/test_package_verification_code.py b/...s/model/test_package_verification_code.py → ...x/model/test_package_verification_code.py
diff --git a/tests/model/test_relationship.py → tests/spdx/model/test_relationship.py b/tests/model/test_relationship.py → tests/spdx/model/test_relationship.py
diff --git a/tests/model/test_snippet.py → tests/spdx/model/test_snippet.py b/tests/model/test_snippet.py → tests/spdx/model/test_snippet.py
diff --git a/tests/model/test_version.py → tests/spdx/model/test_version.py b/tests/model/test_version.py → tests/spdx/model/test_version.py
diff --git a/tests/parser/json/__init__.py → tests/spdx/parser/__init__.py b/tests/parser/json/__init__.py → tests/spdx/parser/__init__.py
diff --git a/tests/parser/jsonlikedict/__init__.py → tests/spdx/parser/json/__init__.py b/tests/parser/jsonlikedict/__init__.py → tests/spdx/parser/json/__init__.py
diff --git a/tests/parser/json/test_json_parser.py → tests/spdx/parser/json/test_json_parser.py b/tests/parser/json/test_json_parser.py → tests/spdx/parser/json/test_json_parser.py
diff --git a/tests/validation/__init__.py → tests/spdx/parser/jsonlikedict/__init__.py b/tests/validation/__init__.py → tests/spdx/parser/jsonlikedict/__init__.py
diff --git a/.../parser/jsonlikedict/test_actor_parser.py → .../parser/jsonlikedict/test_actor_parser.py b/.../parser/jsonlikedict/test_actor_parser.py → .../parser/jsonlikedict/test_actor_parser.py
diff --git a/...er/jsonlikedict/test_annotation_parser.py → ...er/jsonlikedict/test_annotation_parser.py b/...er/jsonlikedict/test_annotation_parser.py → ...er/jsonlikedict/test_annotation_parser.py
diff --git a/...rser/jsonlikedict/test_checksum_parser.py → ...rser/jsonlikedict/test_checksum_parser.py b/...rser/jsonlikedict/test_checksum_parser.py → ...rser/jsonlikedict/test_checksum_parser.py
diff --git a/...jsonlikedict/test_creation_info_parser.py → ...jsonlikedict/test_creation_info_parser.py b/...jsonlikedict/test_creation_info_parser.py → ...jsonlikedict/test_creation_info_parser.py
diff --git a/...onlikedict/test_dict_parsing_functions.py → ...onlikedict/test_dict_parsing_functions.py b/...onlikedict/test_dict_parsing_functions.py → ...onlikedict/test_dict_parsing_functions.py
diff --git a/...t/test_extracted_licensing_info_parser.py → ...t/test_extracted_licensing_info_parser.py b/...t/test_extracted_licensing_info_parser.py → ...t/test_extracted_licensing_info_parser.py
diff --git a/...s/parser/jsonlikedict/test_file_parser.py → ...x/parser/jsonlikedict/test_file_parser.py b/...s/parser/jsonlikedict/test_file_parser.py → ...x/parser/jsonlikedict/test_file_parser.py
diff --git a/...ikedict/test_license_expression_parser.py → ...ikedict/test_license_expression_parser.py b/...ikedict/test_license_expression_parser.py → ...ikedict/test_license_expression_parser.py
diff --git a/...arser/jsonlikedict/test_package_parser.py → ...arser/jsonlikedict/test_package_parser.py b/...arser/jsonlikedict/test_package_parser.py → ...arser/jsonlikedict/test_package_parser.py
diff --git a/.../jsonlikedict/test_relationship_parser.py → .../jsonlikedict/test_relationship_parser.py b/.../jsonlikedict/test_relationship_parser.py → .../jsonlikedict/test_relationship_parser.py
diff --git a/...arser/jsonlikedict/test_snippet_parser.py → ...arser/jsonlikedict/test_snippet_parser.py b/...arser/jsonlikedict/test_snippet_parser.py → ...arser/jsonlikedict/test_snippet_parser.py
diff --git a/tests/test_datetime_conversions.py → tests/spdx/test_datetime_conversions.py b/tests/test_datetime_conversions.py → tests/spdx/test_datetime_conversions.py
diff --git a/tests/writer/__init__.py → tests/spdx/validation/__init__.py b/tests/writer/__init__.py → tests/spdx/validation/__init__.py
diff --git a/tests/validation/test_actor_validator.py → ...s/spdx/validation/test_actor_validator.py b/tests/validation/test_actor_validator.py → ...s/spdx/validation/test_actor_validator.py
@@ -16,7 +16,7 @@
 from spdx.model.actor import ActorType
 from spdx.validation.actor_validator import validate_actor
 from spdx.validation.validation_message import ValidationMessage, ValidationContext, SpdxElementType
-from tests.fixtures import actor_fixture
+from tests.spdx.fixtures import actor_fixture
 
 
 def test_valid_actor_person():

diff --git a/...s/validation/test_annotation_validator.py → ...x/validation/test_annotation_validator.py b/...s/validation/test_annotation_validator.py → ...x/validation/test_annotation_validator.py
@@ -17,7 +17,7 @@
 from spdx.model.document import Document
 from spdx.validation.annotation_validator import validate_annotation
 from spdx.validation.validation_message import ValidationMessage, ValidationContext, SpdxElementType
-from tests.fixtures import document_fixture, annotation_fixture, file_fixture
+from tests.spdx.fixtures import document_fixture, annotation_fixture, file_fixture
 
 
 def test_valid_annotation():

diff --git a/tests/validation/test_checksum_validator.py → ...pdx/validation/test_checksum_validator.py b/tests/validation/test_checksum_validator.py → ...pdx/validation/test_checksum_validator.py
@@ -16,7 +16,7 @@
 from spdx.model.checksum import Checksum, ChecksumAlgorithm
 from spdx.validation.checksum_validator import validate_checksum
 from spdx.validation.validation_message import ValidationMessage, ValidationContext, SpdxElementType
-from tests.fixtures import checksum_fixture
+from tests.spdx.fixtures import checksum_fixture
 
 
 @pytest.mark.parametrize("checksum",

diff --git a/...alidation/test_creation_info_validator.py → ...alidation/test_creation_info_validator.py b/...alidation/test_creation_info_validator.py → ...alidation/test_creation_info_validator.py
@@ -15,7 +15,7 @@
 
 from spdx.validation.creation_info_validator import validate_creation_info
 from spdx.validation.validation_message import ValidationMessage, ValidationContext, SpdxElementType
-from tests.fixtures import creation_info_fixture
+from tests.spdx.fixtures import creation_info_fixture
 
 
 def test_valid_creation_info():

diff --git a/tests/validation/test_document_validator.py → ...pdx/validation/test_document_validator.py b/tests/validation/test_document_validator.py → ...pdx/validation/test_document_validator.py
@@ -16,7 +16,7 @@
 from spdx.model.document import Document, CreationInfo
 from spdx.validation.document_validator import validate_full_spdx_document
 from spdx.validation.validation_message import ValidationMessage, ValidationContext, SpdxElementType
-from tests.fixtures import document_fixture, creation_info_fixture
+from tests.spdx.fixtures import document_fixture, creation_info_fixture
 
 
 def test_valid_document():

diff --git a/...n/test_external_document_ref_validator.py → ...n/test_external_document_ref_validator.py b/...n/test_external_document_ref_validator.py → ...n/test_external_document_ref_validator.py
@@ -13,7 +13,7 @@
 
 from spdx.validation.external_document_ref_validator import validate_external_document_ref
 from spdx.validation.validation_message import ValidationMessage
-from tests.fixtures import external_document_ref_fixture
+from tests.spdx.fixtures import external_document_ref_fixture
 
 
 def test_valid_external_document_ref():

diff --git a/...on/test_external_package_ref_validator.py → ...on/test_external_package_ref_validator.py b/...on/test_external_package_ref_validator.py → ...on/test_external_package_ref_validator.py
@@ -15,7 +15,7 @@
 
 from spdx.validation.external_package_ref_validator import validate_external_package_ref
 from spdx.validation.validation_message import ValidationMessage, ValidationContext, SpdxElementType
-from tests.fixtures import external_package_ref_fixture
+from tests.spdx.fixtures import external_package_ref_fixture
 
 
 def test_valid_external_package_ref():

diff --git a/...est_extracted_licensing_info_validator.py → ...est_extracted_licensing_info_validator.py b/...est_extracted_licensing_info_validator.py → ...est_extracted_licensing_info_validator.py
@@ -15,7 +15,7 @@
 
 from spdx.validation.extracted_licensing_info_validator import validate_extracted_licensing_info
 from spdx.validation.validation_message import ValidationMessage, ValidationContext, SpdxElementType
-from tests.fixtures import extracted_licensing_info_fixture
+from tests.spdx.fixtures import extracted_licensing_info_fixture
 
 
 def test_valid_extracted_licensing_info():

diff --git a/tests/validation/test_file_validator.py → tests/spdx/validation/test_file_validator.py b/tests/validation/test_file_validator.py → tests/spdx/validation/test_file_validator.py
@@ -16,7 +16,7 @@
 from spdx.model.checksum import Checksum, ChecksumAlgorithm
 from spdx.validation.file_validator import validate_file_within_document
 from spdx.validation.validation_message import ValidationMessage, ValidationContext, SpdxElementType
-from tests.fixtures import file_fixture, document_fixture
+from tests.spdx.fixtures import file_fixture, document_fixture
 
 
 def test_valid_file():

diff --git a/...tion/test_license_expression_validator.py → ...tion/test_license_expression_validator.py b/...tion/test_license_expression_validator.py → ...tion/test_license_expression_validator.py
diff --git a/tests/validation/test_package_validator.py → ...spdx/validation/test_package_validator.py b/tests/validation/test_package_validator.py → ...spdx/validation/test_package_validator.py
@@ -18,7 +18,7 @@
 from spdx.model.spdx_none import SpdxNone
 from spdx.validation.package_validator import validate_package_within_document
 from spdx.validation.validation_message import ValidationMessage, ValidationContext, SpdxElementType
-from tests.fixtures import package_fixture, package_verification_code_fixture, document_fixture
+from tests.spdx.fixtures import package_fixture, package_verification_code_fixture, document_fixture
 
 
 def test_valid_package():

diff --git a/...validation/test_relationship_validator.py → ...validation/test_relationship_validator.py b/...validation/test_relationship_validator.py → ...validation/test_relationship_validator.py
@@ -19,7 +19,7 @@
 from spdx.model.spdx_none import SpdxNone
 from spdx.validation.relationship_validator import validate_relationship
 from spdx.validation.validation_message import ValidationMessage, SpdxElementType, ValidationContext
-from tests.fixtures import document_fixture, relationship_fixture
+from tests.spdx.fixtures import document_fixture, relationship_fixture
 
 
 @pytest.mark.parametrize("related_spdx_element",

diff --git a/tests/validation/test_snippet_validator.py → ...spdx/validation/test_snippet_validator.py b/tests/validation/test_snippet_validator.py → ...spdx/validation/test_snippet_validator.py
@@ -15,7 +15,7 @@
 
 from spdx.validation.snippet_validator import validate_snippet_within_document
 from spdx.validation.validation_message import ValidationMessage, ValidationContext, SpdxElementType
-from tests.fixtures import document_fixture, snippet_fixture
+from tests.spdx.fixtures import document_fixture, snippet_fixture
 
 
 def test_valid_snippet():

diff --git a/tests/validation/test_spdx_id_validators.py → ...pdx/validation/test_spdx_id_validators.py b/tests/validation/test_spdx_id_validators.py → ...pdx/validation/test_spdx_id_validators.py
diff --git a/tests/validation/test_uri_validators.py → tests/spdx/validation/test_uri_validators.py b/tests/validation/test_uri_validators.py → tests/spdx/validation/test_uri_validators.py
diff --git a/tests/writer/json/__init__.py → tests/spdx/writer/__init__.py b/tests/writer/json/__init__.py → tests/spdx/writer/__init__.py
diff --git a/.../writer/json/expected_results/__init__.py → tests/spdx/writer/json/__init__.py b/.../writer/json/expected_results/__init__.py → tests/spdx/writer/json/__init__.py
diff --git a/tests/writer/tagvalue/__init__.py → .../writer/json/expected_results/__init__.py b/tests/writer/tagvalue/__init__.py → .../writer/json/expected_results/__init__.py
diff --git a/...riter/json/expected_results/expected.json → ...riter/json/expected_results/expected.json b/...riter/json/expected_results/expected.json → ...riter/json/expected_results/expected.json
diff --git a/tests/writer/json/test_json_writer.py → tests/spdx/writer/json/test_json_writer.py b/tests/writer/json/test_json_writer.py → tests/spdx/writer/json/test_json_writer.py
@@ -14,7 +14,7 @@
 import pytest
 
 from spdx.writer.json.json_writer import write_document
-from tests.fixtures import document_fixture
+from tests.spdx.fixtures import document_fixture
 
 
 @pytest.fixture

diff --git a/tests/spdx/writer/tagvalue/__init__.py b/tests/spdx/writer/tagvalue/__init__.py
diff --git a/.../expected_results/expected_tag_value.spdx → .../expected_results/expected_tag_value.spdx b/.../expected_results/expected_tag_value.spdx → .../expected_results/expected_tag_value.spdx
diff --git a/tests/writer/tagvalue/test_package_writer.py → ...dx/writer/tagvalue/test_package_writer.py b/tests/writer/tagvalue/test_package_writer.py → ...dx/writer/tagvalue/test_package_writer.py
@@ -10,7 +10,7 @@
 #  limitations under the License.
 from unittest.mock import patch, mock_open, call
 
-from tests.fixtures import package_fixture
+from tests.spdx.fixtures import package_fixture
 from spdx.writer.tagvalue.package_writer import write_package
 
 

diff --git a/...s/writer/tagvalue/test_tagvalue_writer.py → ...x/writer/tagvalue/test_tagvalue_writer.py b/...s/writer/tagvalue/test_tagvalue_writer.py → ...x/writer/tagvalue/test_tagvalue_writer.py
@@ -13,7 +13,7 @@
 
 import pytest
 
-from tests.fixtures import document_fixture
+from tests.spdx.fixtures import document_fixture
 from spdx.writer.tagvalue.tagvalue_writer import write_document_to_file