wip

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

cyclonedx/model/vulnerability.py

@@ -847,7 +847,9 @@ def justification(self, justification: Optional[str]) -> None:
 
     def __comparable_tuple(self) -> _ComparableTuple:
         return _ComparableTuple((
-            self.source, self.score or 0, self.severity, self.method, self.vector, self.justification
+            self.severity, self.score or 0,
+            self.source, self.method, self.vector,
+            self.justification
         ))
 
     def __eq__(self, other: object) -> bool:
@@ -864,7 +866,9 @@ def __hash__(self) -> int:
         return hash(self.__comparable_tuple())
 
     def __repr__(self) -> str:
-        return f'<VulnerabilityRating score={self.score}, source={self.source}>'
+        return f'<VulnerabilityRating severity={self.severity} score={self.score}, ' \
+            f'source={self.source} method={self.method} vector={self.vector}' \
+            f'justification={self.justification}>'
 
 
 @serializable.serializable_class

tests/test_model_component.py

@@ -351,8 +351,8 @@ def test_sort(self) -> None:
 class TestModelAttachedText(TestCase):
 
     def test_sort(self) -> None:
-        # expected sort order: (content_type, content, encoding)
-        expected_order = [0, 4, 2, 1, 3]
+        # expected sort order: (content_type, encoding, content)
+        expected_order = [0, 1, 2, 4, 3,]
         text = [
             AttachedText(content='a', content_type='a', encoding=Encoding.BASE_64),
             AttachedText(content='a', content_type='b', encoding=Encoding.BASE_64),

tests/test_model_vulnerability.py

@@ -298,6 +298,7 @@ def test_sort(self) -> None:
         ]
         sorted_refs = sorted(refs)
         expected_refs = reorder(refs, expected_order)
+        self.maxDiff = None  # gimme all diff on error
         self.assertListEqual(sorted_refs, expected_refs)