Fix sonatype-lift warnings

Signed-off-by: Rodney Richardson <[email protected]>

Author: RodneyRichardson

tests/test_model.py

@@ -170,8 +170,8 @@ def test_sort(self) -> None:
 class TestModelLicenseChoice(TestCase):
 
     def test_sort(self) -> None:
-        license_a = License(spdx_license_id='Apache-2.0'),
-        license_b = License(spdx_license_id='MIT'),
+        license_a = License(spdx_license_id='Apache-2.0')
+        license_b = License(spdx_license_id='MIT')
 
         # expected sort order: ([license], [expression])
         expected_order = [1, 0, 3, 2]
@@ -553,7 +553,7 @@ def test_sort(self) -> None:
             Property(name='a', value='a'),
             Property(name='b', value='b'),
             Property(name='a', value='c'),
-            Property(name='a', value=None),
+            Property(name='a', value='d'),
             Property(name='b', value='a'),
             Property(name='a', value='b'),
         ]

tests/test_model_vulnerability.py

@@ -17,6 +17,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright (c) OWASP Foundation. All Rights Reserved.
 
+from decimal import Decimal
 import unittest
 from unittest import TestCase
 from unittest.mock import Mock, patch
@@ -272,17 +273,18 @@ def test_sort(self) -> None:
         # expected sort order: ([severity], [score], [source], [method], [vector], [justification])
         expected_order = [0, 1, 2, 3, 4, 5, 6, 7]
         refs = [
-            VulnerabilityRating(severity=VulnerabilitySeverity.HIGH, score=10, source=source_a,
-                                method=method_a, vector='a', justification='a'),
-            VulnerabilityRating(severity=VulnerabilitySeverity.HIGH, score=10,
+            VulnerabilityRating(severity=VulnerabilitySeverity.HIGH, score=Decimal(10),
+                                source=source_a, method=method_a, vector='a', justification='a'),
+            VulnerabilityRating(severity=VulnerabilitySeverity.HIGH, score=Decimal(10),
                                 source=source_a, method=method_a, vector='a'),
-            VulnerabilityRating(severity=VulnerabilitySeverity.HIGH, score=10, source=source_a, method=method_a),
-            VulnerabilityRating(severity=VulnerabilitySeverity.HIGH, score=10, source=source_a),
-            VulnerabilityRating(severity=VulnerabilitySeverity.HIGH, score=10),
+            VulnerabilityRating(severity=VulnerabilitySeverity.HIGH, score=Decimal(10),
+                                source=source_a, method=method_a),
+            VulnerabilityRating(severity=VulnerabilitySeverity.HIGH, score=Decimal(10), source=source_a),
+            VulnerabilityRating(severity=VulnerabilitySeverity.HIGH, score=Decimal(10)),
             VulnerabilityRating(severity=VulnerabilitySeverity.HIGH),
-            VulnerabilityRating(severity=VulnerabilitySeverity.LOW, score=10, source=source_a,
-                                method=method_a, vector='a', justification='a'),
-            VulnerabilityRating(score=10, source=source_a, method=method_a, vector='a', justification='a'),
+            VulnerabilityRating(severity=VulnerabilitySeverity.LOW, score=Decimal(10),
+                                source=source_a, method=method_a, vector='a', justification='a'),
+            VulnerabilityRating(score=Decimal(10), source=source_a, method=method_a, vector='a', justification='a'),
         ]
         sorted_refs = sorted(refs)
         expected_refs = reorder(refs, expected_order)