Add unit tests and changelog #286

Signed-off-by: tdruez <[email protected]>

Author: tdruez

CHANGELOG.rst

@@ -120,6 +120,9 @@ Release notes
   simplicity, and readability.
   https://github.com/aboutcode-org/dejacode/issues/241
 
+- Refine the way the PURL fragments are handled in searches.
+  https://github.com/aboutcode-org/dejacode/issues/286
+
 ### Version 5.2.1
 
 - Fix the models documentation navigation.

component_catalog/tests/test_admin.py

@@ -1676,11 +1676,6 @@ def test_package_changelist_advanced_search_on_protocol(self):
         self.assertEqual(1, response.context_data["cl"].result_count)
         self.assertIn(package3, response.context_data["cl"].result_list)
 
-        response = self.client.get(changelist_url + "[email protected]")
-        self.assertEqual(200, response.status_code)
-        self.assertEqual(1, response.context_data["cl"].result_count)
-        self.assertIn(package3, response.context_data["cl"].result_list)
-
     def test_package_changelist_set_policy_action_proper(self):
         self.client.login(username=self.user.username, password="secret")
         p1 = Package.objects.create(filename="p1.zip", dataspace=self.dataspace1)

product_portfolio/tests/__init__.py

@@ -6,13 +6,16 @@
 # See https://aboutcode.org for more information about AboutCode FOSS projects.
 #
 
+import uuid
+
 from component_catalog.models import Component
 from component_catalog.models import Package
 from component_catalog.tests import make_component
 from component_catalog.tests import make_package
 from dje.tests import make_string
 from product_portfolio.models import Product
 from product_portfolio.models import ProductComponent
+from product_portfolio.models import ProductDependency
 from product_portfolio.models import ProductItemPurpose
 from product_portfolio.models import ProductPackage
 
@@ -74,3 +77,14 @@ def make_product_item_purpose(dataspace, **data):
         dataspace=dataspace,
         **data,
     )
+
+
+def make_product_dependency(product, **data):
+    if "dependency_uid" not in data:
+        data["dependency_uid"] = str(uuid.uuid4())
+
+    return ProductDependency.objects.create(
+        product=product,
+        dataspace=product.dataspace,
+        **data,
+    )

product_portfolio/tests/test_admin.py

@@ -13,6 +13,7 @@
 
 from component_catalog.models import Component
 from component_catalog.models import Package
+from component_catalog.tests import make_package
 from dje.filters import DataspaceFilter
 from dje.models import Dataspace
 from dje.tests import create_superuser
@@ -21,6 +22,7 @@
 from product_portfolio.models import Product
 from product_portfolio.models import ProductComponent
 from product_portfolio.models import ProductPackage
+from product_portfolio.tests import make_product_dependency
 
 
 class ProductPortfolioAdminsTestCase(TestCase):
@@ -482,3 +484,58 @@ def test_codebaseresource_admin_changeform_lookup_autocomplete(self):
         response = self.client.get(url)
         self.assertEqual(200, response.status_code)
         self.assertEqual(expected, response.content)
+
+    def test_product_dependencies_changelist_search(self):
+        self.client.login(username=self.user.username, password="secret")
+        changelist_url = reverse("admin:product_portfolio_productdependency_changelist")
+
+        package1 = make_package(self.dataspace, "pkg:pypi/[email protected]")
+        package2 = make_package(self.dataspace, "pkg:pypi/[email protected]")
+
+        dependency1 = make_product_dependency(self.product1, for_package=package1)
+        dependency2 = make_product_dependency(
+            self.product1, for_package=package1, resolved_to_package=package2
+        )
+
+        response = self.client.get(changelist_url)
+        self.assertEqual(2, response.context_data["cl"].result_count)
+
+        response = self.client.get(changelist_url + "?q=django")
+        self.assertEqual(2, response.context_data["cl"].result_count)
+
+        response = self.client.get(changelist_url + "?q=pkg:pypi/[email protected]")
+        self.assertEqual(2, response.context_data["cl"].result_count)
+        self.assertIn(dependency1, response.context_data["cl"].result_list)
+        self.assertIn(dependency2, response.context_data["cl"].result_list)
+
+        response = self.client.get(changelist_url + "?q=dep")
+        self.assertEqual(1, response.context_data["cl"].result_count)
+        self.assertIn(dependency2, response.context_data["cl"].result_list)
+
+        response = self.client.get(changelist_url + "?q=pkg:pypi/[email protected]")
+        self.assertEqual(1, response.context_data["cl"].result_count)
+        self.assertIn(dependency2, response.context_data["cl"].result_list)
+
+        response = self.client.get(changelist_url + "?q=pypi/dep")
+        self.assertEqual(1, response.context_data["cl"].result_count)
+        self.assertIn(dependency2, response.context_data["cl"].result_list)
+
+    def test_product_dependencies_add_view(self):
+        self.client.login(username=self.user.username, password="secret")
+        url = reverse("admin:product_portfolio_productdependency_add")
+        package2 = make_package(self.dataspace, "pkg:pypi/[email protected]")
+        data = {
+            "product": self.product1.pk,
+            "dependency_uid": "a7e28b42-2212-456e-9215-9b3760db32c3",
+            "for_package": self.package1.pk,
+            "resolved_to_package": package2.pk,
+            "is_runtime": "on",
+            "is_pinned": "on",
+            "is_direct": "on",
+        }
+
+        response = self.client.post(url, data, follow=True)
+        self.assertContains(response, "was added successfully")
+        dependency = self.product1.dependencies.get()
+        self.assertEqual(self.package1, dependency.for_package)
+        self.assertEqual(package2, dependency.resolved_to_package)

product_portfolio/tests/test_models.py

@@ -33,13 +33,14 @@
 from product_portfolio.models import Product
 from product_portfolio.models import ProductComponent
 from product_portfolio.models import ProductComponentAssignedLicense
-from product_portfolio.models import ProductDependency
 from product_portfolio.models import ProductInventoryItem
 from product_portfolio.models import ProductPackage
 from product_portfolio.models import ProductRelationStatus
 from product_portfolio.models import ProductSecuredManager
 from product_portfolio.models import ProductStatus
 from product_portfolio.models import ScanCodeProject
+from product_portfolio.tests import make_product
+from product_portfolio.tests import make_product_dependency
 from product_portfolio.tests import make_product_item_purpose
 from product_portfolio.tests import make_product_package
 from vulnerabilities.tests import make_vulnerability
@@ -1118,32 +1119,29 @@ def test_product_portfolio_scancode_project_model_can_start_import(self):
     def test_product_dependency_model_save_validation(self):
         package1 = Package.objects.create(filename="package1", dataspace=self.dataspace)
         with self.assertRaises(ValidationError) as cm:
-            ProductDependency.objects.create(
+            make_product_dependency(
                 product=self.product1,
                 for_package=package1,
                 resolved_to_package=package1,
-                dataspace=self.dataspace,
             )
         self.assertEqual(
             ["The 'for_package' cannot be the same as 'resolved_to_package'."],
             cm.exception.messages,
         )
 
     def test_product_dependency_prackage_queryset_declared_dependencies_count(self):
-        package1 = Package.objects.create(filename="package1", dataspace=self.dataspace)
-        package2 = Package.objects.create(filename="package2", dataspace=self.dataspace)
-        ProductDependency.objects.create(
+        package1 = make_package(filename="package1", dataspace=self.dataspace)
+        package2 = make_package(filename="package2", dataspace=self.dataspace)
+        make_product_dependency(
             product=self.product1,
             for_package=package1,
             resolved_to_package=package2,
-            dataspace=self.dataspace,
         )
-        product2 = Product.objects.create(name="Product2", dataspace=self.dataspace)
-        ProductDependency.objects.create(
+        product2 = make_product(name="Product2", dataspace=self.dataspace)
+        make_product_dependency(
             product=product2,
             for_package=package1,
             resolved_to_package=package2,
-            dataspace=self.dataspace,
         )
 
         self.assertEqual(2, package1.declared_dependencies.count())

product_portfolio/tests/test_views.py

@@ -50,13 +50,13 @@
 from product_portfolio.models import CodebaseResource
 from product_portfolio.models import Product
 from product_portfolio.models import ProductComponent
-from product_portfolio.models import ProductDependency
 from product_portfolio.models import ProductItemPurpose
 from product_portfolio.models import ProductPackage
 from product_portfolio.models import ProductRelationStatus
 from product_portfolio.models import ProductStatus
 from product_portfolio.models import ScanCodeProject
 from product_portfolio.tests import make_product
+from product_portfolio.tests import make_product_dependency
 from product_portfolio.tests import make_product_package
 from product_portfolio.views import ManageComponentGridView
 from vulnerabilities.models import VulnerabilityAnalysis
@@ -243,33 +243,25 @@ def test_product_portfolio_detail_view_tab_dependency_view(self):
 
         package2 = Package.objects.create(filename="package2", dataspace=self.dataspace)
         # Unresolved package dependency
-        ProductDependency.objects.create(
-            dependency_uid=str(uuid.uuid4()),
+        make_product_dependency(
             product=self.product1,
             for_package=self.package1,
-            dataspace=self.dataspace,
         )
         # Resolved package dependency
-        ProductDependency.objects.create(
-            dependency_uid=str(uuid.uuid4()),
+        make_product_dependency(
             product=self.product1,
             for_package=self.package1,
             resolved_to_package=package2,
-            dataspace=self.dataspace,
         )
         # Unresolved Product dependency
-        ProductDependency.objects.create(
-            dependency_uid=str(uuid.uuid4()),
+        make_product_dependency(
             product=self.product1,
             declared_dependency="pkg:type/name",
-            dataspace=self.dataspace,
         )
         # Unresolved Product dependency
-        ProductDependency.objects.create(
-            dependency_uid=str(uuid.uuid4()),
+        make_product_dependency(
             product=self.product1,
             resolved_to_package=package2,
-            dataspace=self.dataspace,
         )
 
         with self.assertMaxQueries(9):