wip

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

Author: jkowalleck

cyclonedx/model/vulnerability.py

@@ -1334,8 +1334,9 @@ def properties(self, properties: Iterable[Property]) -> None:
 
     def __comparable_tuple(self) -> _ComparableTuple:
         return _ComparableTuple((
-            self.id, self.description, _ComparableTuple(self.ratings), _ComparableTuple(self.cwes),
+            self.id,
             self.source, _ComparableTuple(self.references),
+            _ComparableTuple(self.ratings), _ComparableTuple(self.cwes), self.description,
             self.detail, self.recommendation, self.workaround, _ComparableTuple(self.advisories),
             self.created, self.published, self.updated,
             self.credits, self.tools, self.analysis,

tests/test_model_vulnerability.py

@@ -188,7 +188,7 @@ def test_sort(self) -> None:
         datetime2 = datetime1 + timedelta(seconds=5)
 
         # expected sort order: (id, description, detail, source, created, published)
-        expected_order = [0, 6, 1, 7, 2, 8, 3, 9, 4, 10, 5, 11]
+        expected_order = [0, 6,1,7,2,9,10,8,3,4,5,11]
         vulnerabilities = [
             Vulnerability(bom_ref='0', id='a', description='a', detail='a',
                           source=source1, created=datetime1, published=datetime1),