updated test classes

Author: sacca97

prospector/api/api_test.py

@@ -6,12 +6,6 @@
 client = TestClient(app)
 
 
-# def test_read_main():
-#     response = client.get("/")
-#     assert response.status_code == 200
-#     assert "<title>Prospector</title>" in response.text
-
-
 def test_status():
     response = client.get("/status")
     assert response.status_code == 200
@@ -42,10 +36,7 @@ def test_get_specific_commit():
     assert response.json()[0]["commit_id"] == commit_id
 
 
-# @pytest.mark.skip(reason="will raise exception")
 def test_get_commits_by_repository():
     repository = "https://github.com/apache/dubbo"
     response = client.get("/commits/" + repository)
     assert response.status_code == 200
-    assert response.json()[0]["commit_id"] == "yyy"
-    assert response.json()[1]["commit_id"] == "zzz"

prospector/client/cli/prospector_client.py

@@ -338,7 +338,9 @@ def get_candidates(
                 filter_extension=advisory_record.files_extension,
             )
 
-            core_statistics.record("candidates", len(candidates), unit="commits")
+            core_statistics.record(
+                "candidates", len(candidates), unit="commits", overwrite=True
+            )
             logger.info("Found %d candidates" % len(candidates))
         writer.print(f"Found {len(candidates)} candidates")
 

prospector/client/cli/prospector_client_test.py

@@ -4,57 +4,19 @@
 
 from commitdb.postgres import PostgresCommitDB
 
-# from .prospector_client import prospector
-
-# def test_prospector_client():
-#     results = prospector(
-#         "CVE-2014-0050",
-#         "https://github.com/apache/struts",
-#         publication_date="2016-12-12T12:18Z",
-#         debug=True,
-#     )
-#     pprint(results)
-
-
-@pytest.fixture
-def setupdb():
-    db = PostgresCommitDB()
-    db.connect()
-    db.reset()
-    return db
-
-
-@pytest.mark.skip(reason="not implemented yet")
-def test_main_runonce(setupdb: PostgresCommitDB):
-    args = [
-        "python",
-        "main.py",
-        "CVE-2019-11278",
-        "--repository",
-        "https://github.com/cloudfoundry/uaa",
-        "--tag-interval=v74.0.0:v74.1.0",
-        "--use-backend=optional",
-    ]
-    subprocess.run(args)
-
-    setupdb.reset()
-
-
-# def test_main_runtwice(setupdb):
-#     db = setupdb
-#     db.connect(DB_CONNECT_STRING)
-#     args = [
-#         "PROGRAM_NAME",
-#         "CVE-2019-11278",
-#         "--repository",
-#         "https://github.com/cloudfoundry/uaa",
-#         "--tag-interval=v74.0.0:v74.1.0",
-#     ]
-#     main(args)
-#     main(args)
-#     db.reset()
-
-
-# def test_main_ping_server():
-#     args = ["PROGRAM_NAME", "--verbose", "--ping"]
-#     assert main(args)
+from .prospector_client import prospector
+
+OPENCAST_CVE = "CVE-2021-21318"
+OPENCAST_REPO = "https://github.com/opencast/opencast"
+
+
+def test_prospector_client():
+    results, _ = prospector(
+        vulnerability_id=OPENCAST_CVE,
+        repository_url=OPENCAST_REPO,
+        version_interval="9.1:9.2",
+        fetch_references=False,
+        git_cache="/tmp/gitcache",
+        limit_candidates=5000,
+    )
+    assert results[0].commit_id == "b18c6a7f81f08ed14884592a6c14c9ab611ad450"

prospector/commitdb/commitdb_test.py

@@ -8,7 +8,7 @@
 def setupdb():
     db = PostgresCommitDB()
     db.connect()
-    db.reset()
+    # db.reset()
     return db
 
 

prospector/datamodel/advisory_test.py

@@ -69,22 +69,12 @@ def test_advisory_basic():
 def test_get_advisory():
     advisory = AdvisoryRecord("CVE-2021-22696")
     advisory.get_advisory()
-    print(advisory.__dict__)
     assert advisory.cve_id == "CVE-2021-22696"
-    assert ("3.4.0", "3.4.3") in advisory.versions
+    assert "3.4.0" in advisory.versions["affected"]
+    assert "3.4.3" in advisory.versions["fixed"]
 
 
 def test_build_advisory_record():
     advisory = build_advisory_record("CVE-2021-29943", fetch_references=True)
-    print(advisory.__dict__)
 
-    assert advisory.cve_id == "CVE-2014-005"
-    assert advisory.versions == []
-
-
-def test_private():
-    for i in cve_list.split()[:10]:
-        advisory = build_advisory_record(i, fetch_references=False)
-        print(advisory.cve_id, advisory.affected_products)
-        time.sleep(6)
-    raise NotImplementedError
+    assert advisory.cve_id == "CVE-2021-29943"

prospector/datamodel/commit_test.py

@@ -30,7 +30,7 @@ def test_preprocess_commit(repository: Git):
 def test_preprocess_commit_set(repository: Git):
 
     repo = repository
-    commit_set = repo.get_commits(since="1615441712", until="1617441712")
+    commit_set = repo.create_commits(since="1615441712", until="1617441712")
     preprocessed_commits = []
 
     for commit_id in commit_set:

prospector/datamodel/nlp_test.py

@@ -29,58 +29,27 @@ def test_extract_similar_words():
 
 
 def test_extract_affected_filenames():
-    result1 = extract_affected_filenames(ADVISORY_TEXT_1)
-    result2 = extract_affected_filenames(ADVISORY_TEXT_2)
-    result3 = extract_affected_filenames(ADVISORY_TEXT_3)
-    result4 = extract_affected_filenames(ADVISORY_TEXT_4)
-    result5 = extract_affected_filenames(ADVISORY_TEXT_5)
-    assert result1 == set(["JwtRequestCodeFilter", "request_uri"])
-    assert result2 == set(
-        [
-            "OAuthConfirmationController.java",
-            "@ModelAttribute",
-            "authorizationRequest",
-            "OpenID",
-        ]
-    )
-    assert result3 == set(["FileNameUtils"])
-
-    assert result4 == set(["MultipartStream.java", "FileUpload"])  # Content-Type
-    assert result5 == set(["JsonMapObjectReaderWriter"])
-
+    result1, _ = extract_affected_filenames(ADVISORY_TEXT_1)
+    result2, ext2 = extract_affected_filenames(ADVISORY_TEXT_2)
 
-def test_adv_record_path_extraction_has_real_paths():
-    # result = extract_affected_files_paths(ADVISORY_TEXT_2)
-    print("")
-    # assert result == ["FileNameUtils", "//../foo", "\\..\\foo"]
-
-
-def test_adv_record_path_extraction_strict_extensions():
-    """
-    If strict_extensions is True, it will always extract tokens with (back) slashes,
-    but it will only collect single file names if they have the correct extension.
-    """
-    # result = extract_affected_files_paths(
-    #     ADVISORY_TEXT_2
-    #     + " Developer.gery put something here to check if foo.java and bar.cpp will be found.",
-    #     strict_extensions=True,
-    # )
-    print("result")
-    # assert result == ["FileNameUtils", "//../foo", "\\..\\foo", "foo", "bar"]
+    assert "JwtRequestCodeFilter" in result1
+    assert "OAuthConfirmationController" in result2 and "java" in ext2
 
 
 def test_extract_jira_references():
-    x = extract_jira_references("apache/ambari", "AMBARI-25329")
-    print(x)
+    # x = extract_jira_references("apache/ambari", "AMBARI-25329")
     pass
 
 
 def test_extract_gh_issues():
     d = extract_ghissue_references("https://github.com/apache/commons-text", "#341")
-    print(d)
-    raise NotImplementedError
+    assert "341" in d
+    assert (
+        "Interpolation Defaults Interpolation Defaults Changes similar to what was recently released in commons-configuration"
+        in d["341"]
+    )
 
 
 def test_extract_filenames_single():
-    d = extract_affected_filenames(ADVISORY_TEXT_6)
-    raise Exception(d)
+    fn, ext = extract_affected_filenames(ADVISORY_TEXT_6)
+    assert "Content-Length" in fn

prospector/git/fixtures_test.py

@@ -1,13 +1,9 @@
-# from pprint import pprint
 import os.path
 import time
 
 import pytest
 
-from .git import Exec, Git
-
-# from .version_to_tag import version_to_wide_interval_tags
-from .version_to_tag import get_possible_tags
+from git.git import Exec, Git
 
 NEBULA = "https://github.com/slackhq/nebula"
 BEAM = "https://github.com/apache/beam"
@@ -29,75 +25,48 @@ def repository() -> Git:
 
 
 def test_extract_timestamp(repository: Git):
-    commit = repository.get_commit(COMMIT_ID)
+    commit = repository.get_commit(OPENCAST_COMMIT)
     commit.extract_timestamp(format_date=True)
-    assert commit.get_timestamp() == "2020-07-01 15:20:52"
+    assert commit.get_timestamp() == "2020-01-16 22:34:35"
     commit.extract_timestamp(format_date=False)
-    assert commit.get_timestamp() == 1593616852
+    assert commit.get_timestamp() == 1579214075
 
 
 def test_show_tags(repository: Git):
     tags = repository.execute("git name-rev --tags")
-    print(tags)
-    raise Exception()
+    assert tags is not None
 
 
 def test_get_tags_for_commit(repository: Git):
     commits = repository.create_commits()
     commit = commits.get(OPENCAST_COMMIT)
     if commit is not None:
-        tags = commit.find_tag("8.1")
-        raise Exception(tags)
+        tags = commit.find_tags()
+        assert len(tags) == 62
+        assert "10.2" in tags and "11.3" in tags and "9.4" in tags
 
 
 def test_create_commits(repository: Git):
     commits = repository.create_commits()
-    commit = commits.get(COMMIT_ID)
-    assert len(commits) == 357
-    assert commit.get_id() == COMMIT_ID
+    commit = commits.get(OPENCAST_COMMIT)
+    assert len(commits) == 18178
+    assert commit.get_id() == OPENCAST_COMMIT
 
 
 def test_get_hunks_count(repository: Git):
     commits = repository.create_commits()
     commit = commits.get(OPENCAST_COMMIT)
-    diff, hunks = commit.get_diff()
-    print(diff)
-    raise Exception()
-    assert hunks == 2
+    _, hunks = commit.get_diff()
+    assert hunks == 7
 
 
 def test_get_changed_files(repository: Git):
-    commit = repository.get_commit(COMMIT_ID)
+    commit = repository.get_commit(OPENCAST_COMMIT)
 
     changed_files = commit.get_changed_files()
     assert len(changed_files) == 0
 
 
-@pytest.mark.skip(reason="Skipping this test")
-def test_extract_timestamp_from_version():
-    repo = Git(NEBULA)
-    repo.clone()
-    assert repo.extract_timestamp_from_version("v1.5.2") == 1639518536
-    assert repo.extract_timestamp_from_version("INVALID_VERSION_1_0_0") is None
-
-
-def test_get_tag_for_version():
-    repo = Git(NEBULA)
-    repo.clone()
-    tags = repo.get_tags()
-    assert get_possible_tags(tags, "1.5.2") == ["v1.5.2"]
-
-
-def test_get_commit_parent():
-    repo = Git(NEBULA)
-    repo.clone()
-    id = repo.get_commit_id_for_tag("v1.6.1")
-    commit = repo.get_commit(id)
-
-    commit.get_parent_id()
-    assert True  # commit.parent_id == "4c0ae3df5ef79482134b1c08570ff51e52fdfe06"
-
-
 def test_run_cache():
     _exec = Exec(workdir=os.path.abspath("."))
     start = time.time_ns()