test: fix unit tests

Signed-off-by: behnazh-w <[email protected]>

Author: behnazh-w

tests/policy_engine/test_policy.py

@@ -33,8 +33,8 @@ def test_dump_prelude(database_setup) -> None:  # type: ignore # pylint: disable
 def test_eval_policy(database_setup) -> None:  # type: ignore # pylint: disable=unused-argument,redefined-outer-name
     """Test loading the policy from file."""
     res = run_souffle(os.path.join(POLICY_FILE, DATABASE_FILE), POLICY_FILE)
-    res.pop("repo_satisfies_policy")
-    res.pop("repo_violates_policy")
+    res.pop("component_satisfies_policy")
+    res.pop("component_violates_policy")
     assert res == {
         "passed_policies": [["trusted_builder"]],
         "failed_policies": [["aggregate_l4"], ["aggregate_l2"]],

tests/slsa_analyzer/mock_git_utils.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 - 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022 - 2023, Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/.
 
 """
@@ -101,9 +101,8 @@ def prepare_repo_for_testing(
             branch_name="master",
             commit_sha="",
             commit_date="",
-            files=git_repo.files,
-            macaron_path=str(macaron_path),
-            output_dir=str(output_dir),
+            files=git_repo.files(),
+            fs_path=str(repo_path),
         ),
     )
 

tests/slsa_analyzer/provenance/expectations/cue/test_cue_validator.py

@@ -35,7 +35,7 @@ def test_make_expectation(expectation_path: str) -> None:
 @pytest.mark.parametrize(
     ("expectation_path", "expected"),
     [
-        (os.path.join(EXPEC_RESOURCE_PATH, "valid_expectations", "urllib3_PASS.cue"), "urllib3/urllib3"),
+        (os.path.join(EXPEC_RESOURCE_PATH, "valid_expectations", "urllib3_PASS.cue"), "pkg:github.com/urllib3/urllib3"),
         (os.path.join(EXPEC_RESOURCE_PATH, "valid_expectations", "urllib3_FAIL.cue"), ""),
     ],
 )

tests/slsa_analyzer/test_git_url.py

@@ -61,33 +61,6 @@ def test_get_repo_name_from_url(
     valid_git_urls: list[str], invalid_git_urls: list[str], repo_name: str, repo_full_name: str, repo_complete_name: str
 ) -> None:
     """Test the extract repo name, full name, and complete name from url method."""
-    valid_git_urls = [
-        f"[email protected]:owner/{repo_name}.git",
-        f"[email protected]:owner/{repo_name}.git",
-        f"https://gitlab.com/owner/{repo_name}",
-        f"https://github.com/owner/{repo_name}.git",
-        f"https://github.com/owner/{repo_name}",
-        f"git+https://github.com/owner/{repo_name}",
-        f"git+ssh://[email protected]/owner/{repo_name}.git",
-        f"git+ssh://[email protected]/owner/{repo_name}",
-        f"git+ssh://[email protected]:owner/{repo_name}.git",
-        f"git+ssh://[email protected]:8080/owner/{repo_name}",
-        f"ssh://[email protected]/owner/{repo_name}.git",
-        f"ssh://[email protected]/owner/{repo_name}",
-        f"ssh://[email protected]:owner/{repo_name}.git",
-        f"ssh://[email protected]:8080/owner/{repo_name}",
-        f"scm:ssh://[email protected]:8080/owner/{repo_name}",
-    ]
-    invalid_git_urls = [
-        "",
-        f"{repo_name}.git",
-        f"{repo_name}.git/",
-        "ssh://[email protected]:8080/invalid/",
-        "https://gitlab.com/invalid.git",
-        "ssh://[email protected]:8080/",
-        "[email protected]:owner",
-    ]
-
     # Test get repo name.
     assert all(git_url.get_repo_name_from_url(url) == repo_name for url in valid_git_urls)
     assert not any(git_url.get_repo_name_from_url(url) for url in invalid_git_urls)
@@ -98,7 +71,7 @@ def test_get_repo_name_from_url(
 
     # Test get repo complete name.
     assert all(git_url.get_repo_complete_name_from_url(url) == repo_complete_name for url in valid_git_urls)
-    assert not all(git_url.get_repo_complete_name_from_url(url) for url in invalid_git_urls)
+    assert not any(git_url.get_repo_complete_name_from_url(url) for url in invalid_git_urls)
 
 
 def test_clone_remote_repo() -> None: