aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGeorgeFI2023-02-25 14:28:41 +0100
committerGeorgeFI2023-02-25 14:28:41 +0100
commit81f78accf96b3680a5f97e6475a5d6f8a051ddd0 (patch)
treec1bb58afeccf8e108afb7e98deb486069938b3d3
parent21ee2d787fa6279acc6672fbe223717b928aa039 (diff)
downloadsec-certs-81f78accf96b3680a5f97e6475a5d6f8a051ddd0.tar.gz
sec-certs-81f78accf96b3680a5f97e6475a5d6f8a051ddd0.tar.zst
sec-certs-81f78accf96b3680a5f97e6475a5d6f8a051ddd0.zip
refactor: Refactored test for CC
-rw-r--r--tests/cc/test_cc_analysis.py32
1 files changed, 8 insertions, 24 deletions
diff --git a/tests/cc/test_cc_analysis.py b/tests/cc/test_cc_analysis.py
index 6d0f4cfe..d6f316fa 100644
--- a/tests/cc/test_cc_analysis.py
+++ b/tests/cc/test_cc_analysis.py
@@ -98,20 +98,7 @@ def cc_dset(data_dir: Path, cve_dset: CVEDataset, tmp_path_factory) -> CCDataset
@pytest.fixture(scope="module")
-def cc_config_dset(data_dir: Path, cve_config_dset: CVEDataset, tmp_path_factory) -> CCDataset:
- tmp_dir = tmp_path_factory.mktemp("cc_config_dset")
- shutil.copytree(data_dir, tmp_dir, dirs_exist_ok=True)
- cc_config_dset = CCDataset.from_json(tmp_dir / "vulnerable_dataset.json")
- cc_config_dset.process_protection_profiles()
- cc_config_dset.extract_data()
- cc_config_dset.auxiliary_datasets.cve_dset = cve_config_dset
- cc_config_dset._compute_heuristics()
-
- return cc_config_dset
-
-
-@pytest.fixture(scope="module")
-def cve_config_dset(ibm_xss_cve):
+def cve_config_dset(ibm_xss_cve) -> CVEDataset:
cve_dset = CVEDataset({ibm_xss_cve.cve_id: ibm_xss_cve})
cve_dset.build_lookup_dict(use_nist_mapping=False)
return cve_dset
@@ -168,14 +155,16 @@ def cpes_ibm_websphere_app_with_platform() -> set[CPE]:
def test_find_related_cves_for_cpe_configuration(
- cc_config_dset: CCDataset,
+ cc_dset: CCDataset,
cpes_ibm_websphere_app_with_platform: set[CPE],
ibm_xss_cve: CVE,
- random_config_certificate: CCCertificate,
+ cve_config_dset: CVEDataset,
+ random_certificate: CCCertificate,
):
- random_config_certificate.heuristics.cpe_matches = {cve.uri for cve in cpes_ibm_websphere_app_with_platform}
- cc_config_dset.compute_related_cves()
- assert {ibm_xss_cve.cve_id} == random_config_certificate.heuristics.related_cves
+ random_certificate.heuristics.cpe_matches = {cve.uri for cve in cpes_ibm_websphere_app_with_platform}
+ cc_dset.auxiliary_datasets.cve_dset = cve_config_dset
+ cc_dset.compute_related_cves()
+ assert {ibm_xss_cve.cve_id} == random_certificate.heuristics.related_cves
@pytest.fixture
@@ -183,11 +172,6 @@ def random_certificate(cc_dset: CCDataset) -> CCCertificate:
return cc_dset["ebd276cca70fd723"]
-@pytest.fixture
-def random_config_certificate(cc_config_dset: CCDataset) -> CCCertificate:
- return cc_config_dset["ebd276cca70fd723"]
-
-
def test_match_cpe(cpe_single_sign_on: CPE, random_certificate: CCCertificate):
assert {cpe_single_sign_on.uri} == random_certificate.heuristics.cpe_matches