diff --git a/.github/workflows/install_and_test.yml b/.github/workflows/install_and_test.yml index eb3539380..77078c5f6 100644 --- 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 b/tests/spdx/__init__.py similarity index 100% rename from tests/jsonschema/__init__.py rename to tests/spdx/__init__.py diff --git a/tests/data/doc_parse/SBOMexpected.json b/tests/spdx/data/doc_parse/SBOMexpected.json similarity index 100% rename from tests/data/doc_parse/SBOMexpected.json rename to tests/spdx/data/doc_parse/SBOMexpected.json diff --git a/tests/data/doc_parse/expected.json b/tests/spdx/data/doc_parse/expected.json similarity index 100% rename from tests/data/doc_parse/expected.json rename to tests/spdx/data/doc_parse/expected.json diff --git a/tests/data/doc_parse/spdx-expected.json b/tests/spdx/data/doc_parse/spdx-expected.json similarity index 100% rename from tests/data/doc_parse/spdx-expected.json rename to tests/spdx/data/doc_parse/spdx-expected.json diff --git a/tests/data/doc_write/json-simple-multi-package.json b/tests/spdx/data/doc_write/json-simple-multi-package.json similarity index 100% rename from tests/data/doc_write/json-simple-multi-package.json rename to tests/spdx/data/doc_write/json-simple-multi-package.json diff --git a/tests/data/doc_write/json-simple-plus.json b/tests/spdx/data/doc_write/json-simple-plus.json similarity index 100% rename from tests/data/doc_write/json-simple-plus.json rename to tests/spdx/data/doc_write/json-simple-plus.json diff --git a/tests/data/doc_write/json-simple.json b/tests/spdx/data/doc_write/json-simple.json similarity index 100% rename from tests/data/doc_write/json-simple.json rename to tests/spdx/data/doc_write/json-simple.json diff --git a/tests/data/doc_write/rdf-mini.json b/tests/spdx/data/doc_write/rdf-mini.json similarity index 100% rename from tests/data/doc_write/rdf-mini.json rename to tests/spdx/data/doc_write/rdf-mini.json diff --git a/tests/data/doc_write/rdf-simple-plus.json b/tests/spdx/data/doc_write/rdf-simple-plus.json similarity index 100% rename from tests/data/doc_write/rdf-simple-plus.json rename to tests/spdx/data/doc_write/rdf-simple-plus.json diff --git a/tests/data/doc_write/rdf-simple.json b/tests/spdx/data/doc_write/rdf-simple.json similarity index 100% rename from tests/data/doc_write/rdf-simple.json rename to tests/spdx/data/doc_write/rdf-simple.json diff --git a/tests/data/doc_write/tv-mini.tv b/tests/spdx/data/doc_write/tv-mini.tv similarity index 100% rename from tests/data/doc_write/tv-mini.tv rename to tests/spdx/data/doc_write/tv-mini.tv diff --git a/tests/data/doc_write/tv-simple-plus.tv b/tests/spdx/data/doc_write/tv-simple-plus.tv similarity index 100% rename from tests/data/doc_write/tv-simple-plus.tv rename to tests/spdx/data/doc_write/tv-simple-plus.tv diff --git a/tests/data/doc_write/tv-simple.tv b/tests/spdx/data/doc_write/tv-simple.tv similarity index 100% rename from tests/data/doc_write/tv-simple.tv rename to tests/spdx/data/doc_write/tv-simple.tv diff --git a/tests/data/doc_write/xml-simple-multi-package.xml b/tests/spdx/data/doc_write/xml-simple-multi-package.xml similarity index 100% rename from tests/data/doc_write/xml-simple-multi-package.xml rename to tests/spdx/data/doc_write/xml-simple-multi-package.xml diff --git a/tests/data/doc_write/xml-simple-plus.xml b/tests/spdx/data/doc_write/xml-simple-plus.xml similarity index 100% rename from tests/data/doc_write/xml-simple-plus.xml rename to tests/spdx/data/doc_write/xml-simple-plus.xml diff --git a/tests/data/doc_write/xml-simple.xml b/tests/spdx/data/doc_write/xml-simple.xml similarity index 100% rename from tests/data/doc_write/xml-simple.xml rename to tests/spdx/data/doc_write/xml-simple.xml diff --git a/tests/data/doc_write/yaml-simple-multi-package.yaml b/tests/spdx/data/doc_write/yaml-simple-multi-package.yaml similarity index 100% rename from tests/data/doc_write/yaml-simple-multi-package.yaml rename to tests/spdx/data/doc_write/yaml-simple-multi-package.yaml diff --git a/tests/data/doc_write/yaml-simple-plus.yaml b/tests/spdx/data/doc_write/yaml-simple-plus.yaml similarity index 100% rename from tests/data/doc_write/yaml-simple-plus.yaml rename to tests/spdx/data/doc_write/yaml-simple-plus.yaml diff --git a/tests/data/doc_write/yaml-simple.yaml b/tests/spdx/data/doc_write/yaml-simple.yaml similarity index 100% rename from tests/data/doc_write/yaml-simple.yaml rename to tests/spdx/data/doc_write/yaml-simple.yaml diff --git a/tests/data/formats/SPDXJSONExample-v2.2.spdx.json b/tests/spdx/data/formats/SPDXJSONExample-v2.2.spdx.json similarity index 100% rename from tests/data/formats/SPDXJSONExample-v2.2.spdx.json rename to tests/spdx/data/formats/SPDXJSONExample-v2.2.spdx.json diff --git a/tests/data/formats/SPDXJSONExample-v2.3.spdx.json b/tests/spdx/data/formats/SPDXJSONExample-v2.3.spdx.json similarity index 100% rename from tests/data/formats/SPDXJSONExample-v2.3.spdx.json rename to tests/spdx/data/formats/SPDXJSONExample-v2.3.spdx.json diff --git a/tests/data/formats/SPDXJsonExample.json b/tests/spdx/data/formats/SPDXJsonExample.json similarity index 100% rename from tests/data/formats/SPDXJsonExample.json rename to tests/spdx/data/formats/SPDXJsonExample.json diff --git a/tests/data/formats/SPDXRdfExample.rdf b/tests/spdx/data/formats/SPDXRdfExample.rdf similarity index 100% rename from tests/data/formats/SPDXRdfExample.rdf rename to tests/spdx/data/formats/SPDXRdfExample.rdf diff --git a/tests/data/formats/SPDXSBOMExample.spdx.yml b/tests/spdx/data/formats/SPDXSBOMExample.spdx.yml similarity index 100% rename from tests/data/formats/SPDXSBOMExample.spdx.yml rename to tests/spdx/data/formats/SPDXSBOMExample.spdx.yml diff --git a/tests/data/formats/SPDXSBOMExample.tag b/tests/spdx/data/formats/SPDXSBOMExample.tag similarity index 100% rename from tests/data/formats/SPDXSBOMExample.tag rename to tests/spdx/data/formats/SPDXSBOMExample.tag diff --git a/tests/data/formats/SPDXSimpleTag.tag b/tests/spdx/data/formats/SPDXSimpleTag.tag similarity index 100% rename from tests/data/formats/SPDXSimpleTag.tag rename to tests/spdx/data/formats/SPDXSimpleTag.tag diff --git a/tests/data/formats/SPDXTagExample-v2.2.spdx b/tests/spdx/data/formats/SPDXTagExample-v2.2.spdx similarity index 100% rename from tests/data/formats/SPDXTagExample-v2.2.spdx rename to tests/spdx/data/formats/SPDXTagExample-v2.2.spdx diff --git a/tests/data/formats/SPDXTagExample-v2.3.spdx b/tests/spdx/data/formats/SPDXTagExample-v2.3.spdx similarity index 100% rename from tests/data/formats/SPDXTagExample-v2.3.spdx rename to tests/spdx/data/formats/SPDXTagExample-v2.3.spdx diff --git a/tests/data/formats/SPDXTagExample.tag b/tests/spdx/data/formats/SPDXTagExample.tag similarity index 100% rename from tests/data/formats/SPDXTagExample.tag rename to tests/spdx/data/formats/SPDXTagExample.tag diff --git a/tests/data/formats/SPDXXMLExample-v2.2.spdx.xml b/tests/spdx/data/formats/SPDXXMLExample-v2.2.spdx.xml similarity index 100% rename from tests/data/formats/SPDXXMLExample-v2.2.spdx.xml rename to tests/spdx/data/formats/SPDXXMLExample-v2.2.spdx.xml diff --git a/tests/data/formats/SPDXXMLExample-v2.3.spdx.xml b/tests/spdx/data/formats/SPDXXMLExample-v2.3.spdx.xml similarity index 100% rename from tests/data/formats/SPDXXMLExample-v2.3.spdx.xml rename to tests/spdx/data/formats/SPDXXMLExample-v2.3.spdx.xml diff --git a/tests/data/formats/SPDXXmlExample.xml b/tests/spdx/data/formats/SPDXXmlExample.xml similarity index 100% rename from tests/data/formats/SPDXXmlExample.xml rename to tests/spdx/data/formats/SPDXXmlExample.xml diff --git a/tests/data/formats/SPDXYAMLExample-2.2.spdx.yaml b/tests/spdx/data/formats/SPDXYAMLExample-2.2.spdx.yaml similarity index 100% rename from tests/data/formats/SPDXYAMLExample-2.2.spdx.yaml rename to tests/spdx/data/formats/SPDXYAMLExample-2.2.spdx.yaml diff --git a/tests/data/formats/SPDXYAMLExample-2.3.spdx.yaml b/tests/spdx/data/formats/SPDXYAMLExample-2.3.spdx.yaml similarity index 100% rename from tests/data/formats/SPDXYAMLExample-2.3.spdx.yaml rename to tests/spdx/data/formats/SPDXYAMLExample-2.3.spdx.yaml diff --git a/tests/data/formats/SPDXYamlExample.yaml b/tests/spdx/data/formats/SPDXYamlExample.yaml similarity index 100% rename from tests/data/formats/SPDXYamlExample.yaml rename to tests/spdx/data/formats/SPDXYamlExample.yaml diff --git a/tests/fixtures.py b/tests/spdx/fixtures.py similarity index 100% rename from tests/fixtures.py rename to tests/spdx/fixtures.py diff --git a/tests/model/__init__.py b/tests/spdx/jsonschema/__init__.py similarity index 100% rename from tests/model/__init__.py rename to tests/spdx/jsonschema/__init__.py diff --git a/tests/jsonschema/test_annotation_converter.py b/tests/spdx/jsonschema/test_annotation_converter.py similarity index 100% rename from tests/jsonschema/test_annotation_converter.py rename to tests/spdx/jsonschema/test_annotation_converter.py diff --git a/tests/jsonschema/test_checksum_converter.py b/tests/spdx/jsonschema/test_checksum_converter.py similarity index 100% rename from tests/jsonschema/test_checksum_converter.py rename to tests/spdx/jsonschema/test_checksum_converter.py diff --git a/tests/jsonschema/test_converter.py b/tests/spdx/jsonschema/test_converter.py similarity index 100% rename from tests/jsonschema/test_converter.py rename to tests/spdx/jsonschema/test_converter.py diff --git a/tests/jsonschema/test_creation_info_converter.py b/tests/spdx/jsonschema/test_creation_info_converter.py similarity index 98% rename from tests/jsonschema/test_creation_info_converter.py rename to tests/spdx/jsonschema/test_creation_info_converter.py index 47b825802..7e20cbbbe 100644 --- a/tests/jsonschema/test_creation_info_converter.py +++ b/tests/spdx/jsonschema/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 b/tests/spdx/jsonschema/test_document_converter.py similarity index 98% rename from tests/jsonschema/test_document_converter.py rename to tests/spdx/jsonschema/test_document_converter.py index 95bf0dd15..0d5603fb4 100644 --- a/tests/jsonschema/test_document_converter.py +++ b/tests/spdx/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/tests/jsonschema/test_external_document_ref_converter.py b/tests/spdx/jsonschema/test_external_document_ref_converter.py similarity index 100% rename from tests/jsonschema/test_external_document_ref_converter.py rename to tests/spdx/jsonschema/test_external_document_ref_converter.py diff --git a/tests/jsonschema/test_external_package_ref_converter.py b/tests/spdx/jsonschema/test_external_package_ref_converter.py similarity index 100% rename from tests/jsonschema/test_external_package_ref_converter.py rename to tests/spdx/jsonschema/test_external_package_ref_converter.py diff --git a/tests/jsonschema/test_extracted_licensing_info_converter.py b/tests/spdx/jsonschema/test_extracted_licensing_info_converter.py similarity index 98% rename from tests/jsonschema/test_extracted_licensing_info_converter.py rename to tests/spdx/jsonschema/test_extracted_licensing_info_converter.py index 52fef8f80..05ec55a5f 100644 --- a/tests/jsonschema/test_extracted_licensing_info_converter.py +++ b/tests/spdx/jsonschema/test_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 b/tests/spdx/jsonschema/test_file_converter.py similarity index 98% rename from tests/jsonschema/test_file_converter.py rename to tests/spdx/jsonschema/test_file_converter.py index f0e968ae6..f5d167b1f 100644 --- a/tests/jsonschema/test_file_converter.py +++ b/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 b/tests/spdx/jsonschema/test_package_converter.py similarity index 98% rename from tests/jsonschema/test_package_converter.py rename to tests/spdx/jsonschema/test_package_converter.py index f6c757a17..ba0332ee0 100644 --- a/tests/jsonschema/test_package_converter.py +++ b/tests/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/tests/jsonschema/test_package_verification_code_converter.py b/tests/spdx/jsonschema/test_package_verification_code_converter.py similarity index 100% rename from tests/jsonschema/test_package_verification_code_converter.py rename to tests/spdx/jsonschema/test_package_verification_code_converter.py diff --git a/tests/jsonschema/test_relationship_converter.py b/tests/spdx/jsonschema/test_relationship_converter.py similarity index 98% rename from tests/jsonschema/test_relationship_converter.py rename to tests/spdx/jsonschema/test_relationship_converter.py index 98ff88e46..f6d3d5050 100644 --- a/tests/jsonschema/test_relationship_converter.py +++ b/tests/spdx/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 b/tests/spdx/jsonschema/test_snippet_converter.py similarity index 98% rename from tests/jsonschema/test_snippet_converter.py rename to tests/spdx/jsonschema/test_snippet_converter.py index 788bb43b0..35f988f64 100644 --- a/tests/jsonschema/test_snippet_converter.py +++ b/tests/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 b/tests/spdx/mock_utils.py similarity index 100% rename from tests/mock_utils.py rename to tests/spdx/mock_utils.py diff --git a/tests/parser/__init__.py b/tests/spdx/model/__init__.py similarity index 100% rename from tests/parser/__init__.py rename to tests/spdx/model/__init__.py diff --git a/tests/model/test_actor.py b/tests/spdx/model/test_actor.py similarity index 100% rename from tests/model/test_actor.py rename to tests/spdx/model/test_actor.py diff --git a/tests/model/test_annotation.py b/tests/spdx/model/test_annotation.py similarity index 100% rename from tests/model/test_annotation.py rename to tests/spdx/model/test_annotation.py diff --git a/tests/model/test_checksum.py b/tests/spdx/model/test_checksum.py similarity index 100% rename from tests/model/test_checksum.py rename to tests/spdx/model/test_checksum.py diff --git a/tests/model/test_creation_info.py b/tests/spdx/model/test_creation_info.py similarity index 100% rename from tests/model/test_creation_info.py rename to tests/spdx/model/test_creation_info.py diff --git a/tests/model/test_document.py b/tests/spdx/model/test_document.py similarity index 100% rename from tests/model/test_document.py rename to tests/spdx/model/test_document.py diff --git a/tests/model/test_external_document_ref.py b/tests/spdx/model/test_external_document_ref.py similarity index 100% rename from tests/model/test_external_document_ref.py rename to tests/spdx/model/test_external_document_ref.py diff --git a/tests/model/test_external_package_reference.py b/tests/spdx/model/test_external_package_reference.py similarity index 100% rename from tests/model/test_external_package_reference.py rename to tests/spdx/model/test_external_package_reference.py diff --git a/tests/model/test_extracted_licensing_info.py b/tests/spdx/model/test_extracted_licensing_info.py similarity index 100% rename from tests/model/test_extracted_licensing_info.py rename to tests/spdx/model/test_extracted_licensing_info.py diff --git a/tests/model/test_file.py b/tests/spdx/model/test_file.py similarity index 100% rename from tests/model/test_file.py rename to tests/spdx/model/test_file.py diff --git a/tests/model/test_license.py b/tests/spdx/model/test_license.py similarity index 100% rename from tests/model/test_license.py rename to tests/spdx/model/test_license.py diff --git a/tests/model/test_package.py b/tests/spdx/model/test_package.py similarity index 100% rename from tests/model/test_package.py rename to tests/spdx/model/test_package.py diff --git a/tests/model/test_package_verification_code.py b/tests/spdx/model/test_package_verification_code.py similarity index 100% rename from tests/model/test_package_verification_code.py rename to tests/spdx/model/test_package_verification_code.py diff --git a/tests/model/test_relationship.py b/tests/spdx/model/test_relationship.py similarity index 100% rename from tests/model/test_relationship.py rename to tests/spdx/model/test_relationship.py diff --git a/tests/model/test_snippet.py b/tests/spdx/model/test_snippet.py similarity index 100% rename from tests/model/test_snippet.py rename to tests/spdx/model/test_snippet.py diff --git a/tests/model/test_version.py b/tests/spdx/model/test_version.py similarity index 100% rename from tests/model/test_version.py rename to tests/spdx/model/test_version.py diff --git a/tests/parser/json/__init__.py b/tests/spdx/parser/__init__.py similarity index 100% rename from tests/parser/json/__init__.py rename to tests/spdx/parser/__init__.py diff --git a/tests/parser/jsonlikedict/__init__.py b/tests/spdx/parser/json/__init__.py similarity index 100% rename from tests/parser/jsonlikedict/__init__.py rename to tests/spdx/parser/json/__init__.py diff --git a/tests/parser/json/test_json_parser.py b/tests/spdx/parser/json/test_json_parser.py similarity index 100% rename from tests/parser/json/test_json_parser.py rename to tests/spdx/parser/json/test_json_parser.py diff --git a/tests/validation/__init__.py b/tests/spdx/parser/jsonlikedict/__init__.py similarity index 100% rename from tests/validation/__init__.py rename to tests/spdx/parser/jsonlikedict/__init__.py diff --git a/tests/parser/jsonlikedict/test_actor_parser.py b/tests/spdx/parser/jsonlikedict/test_actor_parser.py similarity index 100% rename from tests/parser/jsonlikedict/test_actor_parser.py rename to tests/spdx/parser/jsonlikedict/test_actor_parser.py diff --git a/tests/parser/jsonlikedict/test_annotation_parser.py b/tests/spdx/parser/jsonlikedict/test_annotation_parser.py similarity index 100% rename from tests/parser/jsonlikedict/test_annotation_parser.py rename to tests/spdx/parser/jsonlikedict/test_annotation_parser.py diff --git a/tests/parser/jsonlikedict/test_checksum_parser.py b/tests/spdx/parser/jsonlikedict/test_checksum_parser.py similarity index 100% rename from tests/parser/jsonlikedict/test_checksum_parser.py rename to tests/spdx/parser/jsonlikedict/test_checksum_parser.py diff --git a/tests/parser/jsonlikedict/test_creation_info_parser.py b/tests/spdx/parser/jsonlikedict/test_creation_info_parser.py similarity index 100% rename from tests/parser/jsonlikedict/test_creation_info_parser.py rename to tests/spdx/parser/jsonlikedict/test_creation_info_parser.py diff --git a/tests/parser/jsonlikedict/test_dict_parsing_functions.py b/tests/spdx/parser/jsonlikedict/test_dict_parsing_functions.py similarity index 100% rename from tests/parser/jsonlikedict/test_dict_parsing_functions.py rename to tests/spdx/parser/jsonlikedict/test_dict_parsing_functions.py diff --git a/tests/parser/jsonlikedict/test_extracted_licensing_info_parser.py b/tests/spdx/parser/jsonlikedict/test_extracted_licensing_info_parser.py similarity index 100% rename from tests/parser/jsonlikedict/test_extracted_licensing_info_parser.py rename to tests/spdx/parser/jsonlikedict/test_extracted_licensing_info_parser.py diff --git a/tests/parser/jsonlikedict/test_file_parser.py b/tests/spdx/parser/jsonlikedict/test_file_parser.py similarity index 100% rename from tests/parser/jsonlikedict/test_file_parser.py rename to tests/spdx/parser/jsonlikedict/test_file_parser.py diff --git a/tests/parser/jsonlikedict/test_license_expression_parser.py b/tests/spdx/parser/jsonlikedict/test_license_expression_parser.py similarity index 100% rename from tests/parser/jsonlikedict/test_license_expression_parser.py rename to tests/spdx/parser/jsonlikedict/test_license_expression_parser.py diff --git a/tests/parser/jsonlikedict/test_package_parser.py b/tests/spdx/parser/jsonlikedict/test_package_parser.py similarity index 100% rename from tests/parser/jsonlikedict/test_package_parser.py rename to tests/spdx/parser/jsonlikedict/test_package_parser.py diff --git a/tests/parser/jsonlikedict/test_relationship_parser.py b/tests/spdx/parser/jsonlikedict/test_relationship_parser.py similarity index 100% rename from tests/parser/jsonlikedict/test_relationship_parser.py rename to tests/spdx/parser/jsonlikedict/test_relationship_parser.py diff --git a/tests/parser/jsonlikedict/test_snippet_parser.py b/tests/spdx/parser/jsonlikedict/test_snippet_parser.py similarity index 100% rename from tests/parser/jsonlikedict/test_snippet_parser.py rename to tests/spdx/parser/jsonlikedict/test_snippet_parser.py diff --git a/tests/test_datetime_conversions.py b/tests/spdx/test_datetime_conversions.py similarity index 100% rename from tests/test_datetime_conversions.py rename to tests/spdx/test_datetime_conversions.py diff --git a/tests/writer/__init__.py b/tests/spdx/validation/__init__.py similarity index 100% rename from tests/writer/__init__.py rename to tests/spdx/validation/__init__.py diff --git a/tests/validation/test_actor_validator.py b/tests/spdx/validation/test_actor_validator.py similarity index 97% rename from tests/validation/test_actor_validator.py rename to tests/spdx/validation/test_actor_validator.py index f7f7e22da..dbee17547 100644 --- a/tests/validation/test_actor_validator.py +++ b/tests/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/tests/validation/test_annotation_validator.py b/tests/spdx/validation/test_annotation_validator.py similarity index 95% rename from tests/validation/test_annotation_validator.py rename to tests/spdx/validation/test_annotation_validator.py index b6a624855..b37a6860d 100644 --- a/tests/validation/test_annotation_validator.py +++ b/tests/spdx/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 b/tests/spdx/validation/test_checksum_validator.py similarity index 99% rename from tests/validation/test_checksum_validator.py rename to tests/spdx/validation/test_checksum_validator.py index c57e7b022..99a127db5 100644 --- a/tests/validation/test_checksum_validator.py +++ b/tests/spdx/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/tests/validation/test_creation_info_validator.py b/tests/spdx/validation/test_creation_info_validator.py similarity index 97% rename from tests/validation/test_creation_info_validator.py rename to tests/spdx/validation/test_creation_info_validator.py index 323252f97..7ad38e5fd 100644 --- a/tests/validation/test_creation_info_validator.py +++ b/tests/spdx/validation/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 b/tests/spdx/validation/test_document_validator.py similarity index 97% rename from tests/validation/test_document_validator.py rename to tests/spdx/validation/test_document_validator.py index 6156f4ca4..c3b805587 100644 --- a/tests/validation/test_document_validator.py +++ b/tests/spdx/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/tests/validation/test_external_document_ref_validator.py b/tests/spdx/validation/test_external_document_ref_validator.py similarity index 94% rename from tests/validation/test_external_document_ref_validator.py rename to tests/spdx/validation/test_external_document_ref_validator.py index 870e80f06..5010f69cb 100644 --- a/tests/validation/test_external_document_ref_validator.py +++ b/tests/spdx/validation/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/tests/validation/test_external_package_ref_validator.py b/tests/spdx/validation/test_external_package_ref_validator.py similarity index 97% rename from tests/validation/test_external_package_ref_validator.py rename to tests/spdx/validation/test_external_package_ref_validator.py index f347f9a7c..ee0c3865b 100644 --- a/tests/validation/test_external_package_ref_validator.py +++ b/tests/spdx/validation/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/tests/validation/test_extracted_licensing_info_validator.py b/tests/spdx/validation/test_extracted_licensing_info_validator.py similarity index 97% rename from tests/validation/test_extracted_licensing_info_validator.py rename to tests/spdx/validation/test_extracted_licensing_info_validator.py index 2017c151c..a85068f59 100644 --- a/tests/validation/test_extracted_licensing_info_validator.py +++ b/tests/spdx/validation/test_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 b/tests/spdx/validation/test_file_validator.py similarity index 97% rename from tests/validation/test_file_validator.py rename to tests/spdx/validation/test_file_validator.py index 433fd1145..040edde6e 100644 --- a/tests/validation/test_file_validator.py +++ b/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/tests/validation/test_license_expression_validator.py b/tests/spdx/validation/test_license_expression_validator.py similarity index 100% rename from tests/validation/test_license_expression_validator.py rename to tests/spdx/validation/test_license_expression_validator.py diff --git a/tests/validation/test_package_validator.py b/tests/spdx/validation/test_package_validator.py similarity index 96% rename from tests/validation/test_package_validator.py rename to tests/spdx/validation/test_package_validator.py index 929f17bcc..0bbb8d77d 100644 --- a/tests/validation/test_package_validator.py +++ b/tests/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/tests/validation/test_relationship_validator.py b/tests/spdx/validation/test_relationship_validator.py similarity index 98% rename from tests/validation/test_relationship_validator.py rename to tests/spdx/validation/test_relationship_validator.py index 684334b7f..c93c2e24c 100644 --- a/tests/validation/test_relationship_validator.py +++ b/tests/spdx/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 b/tests/spdx/validation/test_snippet_validator.py similarity index 97% rename from tests/validation/test_snippet_validator.py rename to tests/spdx/validation/test_snippet_validator.py index 46c72ae0d..f6594d93d 100644 --- a/tests/validation/test_snippet_validator.py +++ b/tests/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 b/tests/spdx/validation/test_spdx_id_validators.py similarity index 100% rename from tests/validation/test_spdx_id_validators.py rename to tests/spdx/validation/test_spdx_id_validators.py diff --git a/tests/validation/test_uri_validators.py b/tests/spdx/validation/test_uri_validators.py similarity index 100% rename from tests/validation/test_uri_validators.py rename to tests/spdx/validation/test_uri_validators.py diff --git a/tests/writer/json/__init__.py b/tests/spdx/writer/__init__.py similarity index 100% rename from tests/writer/json/__init__.py rename to tests/spdx/writer/__init__.py diff --git a/tests/writer/json/expected_results/__init__.py b/tests/spdx/writer/json/__init__.py similarity index 100% rename from tests/writer/json/expected_results/__init__.py rename to tests/spdx/writer/json/__init__.py diff --git a/tests/writer/tagvalue/__init__.py b/tests/spdx/writer/json/expected_results/__init__.py similarity index 100% rename from tests/writer/tagvalue/__init__.py rename to tests/spdx/writer/json/expected_results/__init__.py diff --git a/tests/writer/json/expected_results/expected.json b/tests/spdx/writer/json/expected_results/expected.json similarity index 100% rename from tests/writer/json/expected_results/expected.json rename to tests/spdx/writer/json/expected_results/expected.json diff --git a/tests/writer/json/test_json_writer.py b/tests/spdx/writer/json/test_json_writer.py similarity index 97% rename from tests/writer/json/test_json_writer.py rename to tests/spdx/writer/json/test_json_writer.py index 280e0fa4e..2bfeb5aa5 100644 --- a/tests/writer/json/test_json_writer.py +++ b/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 new file mode 100644 index 000000000..e69de29bb diff --git a/tests/writer/tagvalue/expected_results/expected_tag_value.spdx b/tests/spdx/writer/tagvalue/expected_results/expected_tag_value.spdx similarity index 100% rename from tests/writer/tagvalue/expected_results/expected_tag_value.spdx rename to tests/spdx/writer/tagvalue/expected_results/expected_tag_value.spdx diff --git a/tests/writer/tagvalue/test_package_writer.py b/tests/spdx/writer/tagvalue/test_package_writer.py similarity index 98% rename from tests/writer/tagvalue/test_package_writer.py rename to tests/spdx/writer/tagvalue/test_package_writer.py index 47ec20297..eb87a6f13 100644 --- a/tests/writer/tagvalue/test_package_writer.py +++ b/tests/spdx/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/tests/writer/tagvalue/test_tagvalue_writer.py b/tests/spdx/writer/tagvalue/test_tagvalue_writer.py similarity index 96% rename from tests/writer/tagvalue/test_tagvalue_writer.py rename to tests/spdx/writer/tagvalue/test_tagvalue_writer.py index f6b1af6c2..556b724ac 100644 --- a/tests/writer/tagvalue/test_tagvalue_writer.py +++ b/tests/spdx/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