Fix tests.

crocs-muni · Nov 20, 2024 · 25f8962 · 25f8962
1 parent f5ce1a5
commit 25f8962
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 10 deletions.
diff --git a/src/sec_certs/dataset/dataset.py b/src/sec_certs/dataset/dataset.py
@@ -544,7 +544,7 @@ def filter_condition(cpe: CPE) -> bool:
                 return False
             if re.match(constants.RELEASE_CANDIDATE_REGEX, cpe.update):
                 return False
-            return cpe in WINDOWS_WEAK_CPES
+            return cpe not in WINDOWS_WEAK_CPES
 
         if not self.auxiliary_datasets.cpe_dset:
             self.auxiliary_datasets.cpe_dset = self._prepare_cpe_dataset()

diff --git a/tests/data/cc/analysis/cc_full_dataset.json b/tests/data/cc/analysis/cc_full_dataset.json
@@ -729,7 +729,9 @@
                     ]
                 },
                 "direct_transitive_cves": null,
-                "indirect_transitive_cves": null
+                "indirect_transitive_cves": null,
+                    "next_certificates": null,
+                    "prev_certificates": null
             }
         }
     ]

diff --git a/tests/data/cc/analysis/reference_dataset.json b/tests/data/cc/analysis/reference_dataset.json
@@ -578,7 +578,9 @@
           ]
         },
         "direct_transitive_cves": null,
-        "indirect_transitive_cves": null
+        "indirect_transitive_cves": null,
+        "next_certificates": null,
+        "prev_certificates": null
       }
     },
     {
@@ -1224,7 +1226,9 @@
           ]
         },
         "direct_transitive_cves": null,
-        "indirect_transitive_cves": null
+        "indirect_transitive_cves": null,
+        "next_certificates": null,
+        "prev_certificates": null
       }
     },
     {
@@ -1864,7 +1868,9 @@
           ]
         },
         "direct_transitive_cves": null,
-        "indirect_transitive_cves": null
+        "indirect_transitive_cves": null,
+        "next_certificates": null,
+        "prev_certificates": null
       }
     }
   ]

diff --git a/tests/data/cc/analysis/transitive_vulnerability_dataset.json b/tests/data/cc/analysis/transitive_vulnerability_dataset.json
@@ -1334,7 +1334,9 @@
           "elements": [
             "CVE-2013-5385"
           ]
-        }
+        },
+        "next_certificates": null,
+        "prev_certificates": null
       }
     },
     {
@@ -2283,7 +2285,9 @@
           "elements": [
             "CVE-2013-5385"
           ]
-        }
+        },
+        "next_certificates": null,
+        "prev_certificates": null
       }
     },
     {
@@ -3634,7 +3638,9 @@
           ]
         },
         "direct_transitive_cves": null,
-        "indirect_transitive_cves": null
+        "indirect_transitive_cves": null,
+        "next_certificates": null,
+        "prev_certificates": null
       }
     }
   ]

diff --git a/tests/data/cc/analysis/vulnerable_dataset.json b/tests/data/cc/analysis/vulnerable_dataset.json
@@ -92,7 +92,9 @@
                 "verified_cpe_matches": null,
                 "related_cves": null,
                 "cert_lab": null,
-                "cert_id": null
+                "cert_id": null,
+                "next_certificates": null,
+                "prev_certificates": null
             }
         },
         {
@@ -173,7 +175,9 @@
                 "verified_cpe_matches": null,
                 "related_cves": null,
                 "cert_lab": null,
-                "cert_id": null
+                "cert_id": null,
+                "next_certificates": null,
+                "prev_certificates": null
             }
         }
     ]

diff --git a/tests/data/cc/certificate/fictional_cert.json b/tests/data/cc/certificate/fictional_cert.json
@@ -96,6 +96,8 @@
         "extracted_sars": null,
         "direct_transitive_cves": null,
         "indirect_transitive_cves": null,
+        "next_certificates": null,
+        "prev_certificates": null,
         "report_references": {
             "_type": "sec_certs.sample.certificate.References",
             "directly_referenced_by": null,

diff --git a/tests/data/cc/dataset/toy_dataset.json b/tests/data/cc/dataset/toy_dataset.json
@@ -100,6 +100,8 @@
         "extracted_sars": null,
         "direct_transitive_cves": null,
         "indirect_transitive_cves": null,
+        "next_certificates": null,
+        "prev_certificates": null,
         "report_references": {
           "_type": "sec_certs.sample.certificate.References",
           "directly_referenced_by": null,
@@ -208,6 +210,8 @@
         "extracted_sars": null,
         "direct_transitive_cves": null,
         "indirect_transitive_cves": null,
+        "next_certificates": null,
+        "prev_certificates": null,
         "report_references": {
           "_type": "sec_certs.sample.certificate.References",
           "directly_referenced_by": null,
@@ -324,6 +328,8 @@
         "extracted_sars": null,
         "direct_transitive_cves": null,
         "indirect_transitive_cves": null,
+        "next_certificates": null,
+        "prev_certificates": null,
         "report_references": {
           "_type": "sec_certs.sample.certificate.References",
           "directly_referenced_by": null,