Inline test fixtures

Signed-off-by: Keshav Priyadarshi <[email protected]>

Author: keshav-space

vulnerabilities/tests/__init__.py

@@ -6,50 +6,3 @@
 # See https://github.com/aboutcode-org/vulnerablecode for support or download.
 # See https://aboutcode.org for more information about nexB OSS projects.
 #
-
-from django.utils import timezone
-from packageurl import PackageURL
-from univers.version_range import VersionRange
-
-from vulnerabilities import models
-from vulnerabilities.importer import AdvisoryData
-from vulnerabilities.importer import AffectedPackage
-from vulnerabilities.importer import Reference
-
-advisory_data1 = AdvisoryData(
-    aliases=["CVE-2020-13371337"],
-    summary="vulnerability description here",
-    affected_packages=[
-        AffectedPackage(
-            package=PackageURL(type="pypi", name="dummy"),
-            affected_version_range=VersionRange.from_string("vers:pypi/>=1.0.0|<=2.0.0"),
-        )
-    ],
-    references=[Reference(url="https://example.com/with/more/info/CVE-2020-13371337")],
-    date_published=timezone.now(),
-    url="https://test.com",
-)
-
-
-def get_advisory1(created_by="test_pipeline"):
-    return models.Advisory.objects.create(
-        aliases=advisory_data1.aliases,
-        summary=advisory_data1.summary,
-        affected_packages=[pkg.to_dict() for pkg in advisory_data1.affected_packages],
-        references=[ref.to_dict() for ref in advisory_data1.references],
-        url=advisory_data1.url,
-        created_by=created_by,
-        date_collected=timezone.now(),
-    )
-
-
-def get_all_vulnerability_relationships_objects():
-    return {
-        "vulnerabilities": list(models.Vulnerability.objects.all()),
-        "aliases": list(models.Alias.objects.all()),
-        "references": list(models.VulnerabilityReference.objects.all()),
-        "advisories": list(models.Advisory.objects.all()),
-        "packages": list(models.Package.objects.all()),
-        "references": list(models.VulnerabilityReference.objects.all()),
-        "severity": list(models.VulnerabilitySeverity.objects.all()),
-    }

vulnerabilities/tests/pipelines/test_base_pipeline.py

@@ -10,11 +10,41 @@
 from unittest.mock import patch
 
 from django.test import TestCase
+from django.utils import timezone
+from packageurl import PackageURL
+from univers.version_range import VersionRange
 
 from vulnerabilities import models
+from vulnerabilities.importer import AdvisoryData
+from vulnerabilities.importer import AffectedPackage
+from vulnerabilities.importer import Reference
 from vulnerabilities.pipelines import VulnerableCodeBaseImporterPipeline
-from vulnerabilities.tests import advisory_data1
-from vulnerabilities.tests import get_advisory1
+
+advisory_data1 = AdvisoryData(
+    aliases=["CVE-2020-13371337"],
+    summary="vulnerability description here",
+    affected_packages=[
+        AffectedPackage(
+            package=PackageURL(type="pypi", name="dummy"),
+            affected_version_range=VersionRange.from_string("vers:pypi/>=1.0.0|<=2.0.0"),
+        )
+    ],
+    references=[Reference(url="https://example.com/with/more/info/CVE-2020-13371337")],
+    date_published=timezone.now(),
+    url="https://test.com",
+)
+
+
+def get_advisory1(created_by="test_pipeline"):
+    return models.Advisory.objects.create(
+        aliases=advisory_data1.aliases,
+        summary=advisory_data1.summary,
+        affected_packages=[pkg.to_dict() for pkg in advisory_data1.affected_packages],
+        references=[ref.to_dict() for ref in advisory_data1.references],
+        url=advisory_data1.url,
+        created_by=created_by,
+        date_collected=timezone.now(),
+    )
 
 
 class TestVulnerableCodeBaseImporterPipeline(TestCase):

vulnerabilities/tests/pipes/test_advisory.py

@@ -8,10 +8,53 @@
 #
 
 import pytest
+from django.utils import timezone
+from packageurl import PackageURL
+from univers.version_range import VersionRange
 
+from vulnerabilities import models
+from vulnerabilities.importer import AdvisoryData
+from vulnerabilities.importer import AffectedPackage
+from vulnerabilities.importer import Reference
 from vulnerabilities.pipes.advisory import import_advisory
-from vulnerabilities.tests import get_advisory1
-from vulnerabilities.tests import get_all_vulnerability_relationships_objects
+
+advisory_data1 = AdvisoryData(
+    aliases=["CVE-2020-13371337"],
+    summary="vulnerability description here",
+    affected_packages=[
+        AffectedPackage(
+            package=PackageURL(type="pypi", name="dummy"),
+            affected_version_range=VersionRange.from_string("vers:pypi/>=1.0.0|<=2.0.0"),
+        )
+    ],
+    references=[Reference(url="https://example.com/with/more/info/CVE-2020-13371337")],
+    date_published=timezone.now(),
+    url="https://test.com",
+)
+
+
+def get_advisory1(created_by="test_pipeline"):
+    return models.Advisory.objects.create(
+        aliases=advisory_data1.aliases,
+        summary=advisory_data1.summary,
+        affected_packages=[pkg.to_dict() for pkg in advisory_data1.affected_packages],
+        references=[ref.to_dict() for ref in advisory_data1.references],
+        url=advisory_data1.url,
+        created_by=created_by,
+        date_collected=timezone.now(),
+    )
+
+
+def get_all_vulnerability_relationships_objects():
+    return {
+        "vulnerabilities": list(models.Vulnerability.objects.all()),
+        "aliases": list(models.Alias.objects.all()),
+        "references": list(models.VulnerabilityReference.objects.all()),
+        "advisories": list(models.Advisory.objects.all()),
+        "packages": list(models.Package.objects.all()),
+        "references": list(models.VulnerabilityReference.objects.all()),
+        "severity": list(models.VulnerabilitySeverity.objects.all()),
+    }
 
 
 @pytest.mark.django_db