test: fix unit tests

Signed-off-by: behnazh-w <behnaz.hassanshahi@oracle.com>

Author: behnazh-w

src/macaron/config/defaults.ini

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 - 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022 - 2026, 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/.
 
 [requests]
@@ -288,7 +288,7 @@ build_configs =
     setup.py
     setup.cfg
     pyproject.toml
-packager =
+builder =
     build
 publisher =
     twine
@@ -304,9 +304,6 @@ interpreter =
     python3
 interpreter_flag =
     -m
-build_arg =
-    build
-    setup.py
 deploy_arg =
     publish
     upload

src/macaron/slsa_analyzer/build_tool/base_build_tool.py

@@ -133,7 +133,11 @@ def file_exists(
     root_dir = Path(path)
 
     def _accepted(p: Path) -> bool:
-        return True if predicate is None else bool(predicate(p, **predicate_kwargs))
+        return (
+            True
+            if predicate is None or predicate_kwargs == {"group_id": None, "artifact_id": None}
+            else bool(predicate(p, **predicate_kwargs))
+        )
 
     # Check for file directly at root.
     if target_path := find_first_matching_file(root_dir, file_name):

tests/build_spec_generator/common_spec/test_core.py

@@ -53,6 +53,7 @@ def test_compose_shell_commands(
                 BuildToolFacts(
                     language="python",
                     build_tool_name="pip",
+                    confidence=1.0,
                 )
             ],
             "python",
@@ -64,6 +65,7 @@ def test_compose_shell_commands(
                 BuildToolFacts(
                     language="java",
                     build_tool_name="gradle",
+                    confidence=1.0,
                 )
             ],
             "java",
@@ -75,6 +77,7 @@ def test_compose_shell_commands(
                 BuildToolFacts(
                     language="java",
                     build_tool_name="maven",
+                    confidence=1.0,
                 )
             ],
             "java",
@@ -86,6 +89,7 @@ def test_compose_shell_commands(
                 BuildToolFacts(
                     language="not_java",
                     build_tool_name="maven",
+                    confidence=1.0,
                 )
             ],
             "java",
@@ -97,6 +101,7 @@ def test_compose_shell_commands(
                 BuildToolFacts(
                     language="java",
                     build_tool_name="some_java_build_tool",
+                    confidence=1.0,
                 )
             ],
             "java",

tests/slsa_analyzer/build_tool/test_gradle.py

@@ -21,40 +21,30 @@
         Path(__file__).parent.joinpath("mock_repos", "gradle_repos", "no_gradle"),
     ],
 )
-def test_get_build_dirs(gradle_tool: Gradle, mock_repo: Path) -> None:
+def test_get_build_dirs(snapshot: list, gradle_tool: Gradle, mock_repo: Path) -> None:
     """Test discovering build directories."""
-    # Gradle detection now relies on group/artifact validation, which is not
-    # provided by get_build_dirs().
-    assert not list(gradle_tool.get_build_dirs(str(mock_repo)))
+    assert list(gradle_tool.get_build_dirs(str(mock_repo))) == snapshot
 
 
 @pytest.mark.parametrize(
-    ("mock_repo", "group_id", "artifact_id", "expected_value"),
+    ("mock_repo", "expected_value"),
     [
         (
             Path(__file__).parent.joinpath("mock_repos", "gradle_repos", "groovy_gradle"),
-            "mock_repos",
-            "project1",
             [
-                ("project1/build.gradle", 1.0, None, "settings.gradle"),
-                ("build.gradle", 50.0, None, "settings.gradle"),
-                ("settings.gradle", 2500.0, None, "settings.gradle"),
+                ("build.gradle", 1.0, None, "settings.gradle"),
+                ("settings.gradle", 0.5, None, "settings.gradle"),
             ],
         ),
         (
             Path(__file__).parent.joinpath("mock_repos", "gradle_repos", "kotlin_gradle"),
-            "mock_repos",
-            "project1",
             [
-                ("project1/build.gradle.kts", 1.0, None, "settings.gradle.kts"),
-                ("build.gradle.kts", 50.0, None, "settings.gradle.kts"),
-                ("settings.gradle.kts", 2500.0, None, "settings.gradle.kts"),
+                ("build.gradle.kts", 1.0, None, "settings.gradle.kts"),
+                ("settings.gradle.kts", 0.5, None, "settings.gradle.kts"),
             ],
         ),
         (
             Path(__file__).parent.joinpath("mock_repos", "gradle_repos", "no_gradle"),
-            "mock_repos",
-            "project1",
             [],
         ),
     ],
@@ -63,16 +53,12 @@ def test_gradle_build_tool(
     gradle_tool: Gradle,
     macaron_path: str,
     mock_repo: str,
-    group_id: str,
-    artifact_id: str,
     expected_value: list[tuple[str, float, str | None, str | None]],
 ) -> None:
     """Test the Gradle build tool."""
     base_dir = Path(__file__).parent
     ctx = prepare_repo_for_testing(mock_repo, macaron_path, base_dir)
-    assert gradle_tool.is_detected(ctx.component.repository.fs_path, group_id=group_id, artifact_id=artifact_id) == (
-        expected_value
-    )
+    assert gradle_tool.is_detected(ctx.component.repository.fs_path) == (expected_value)
 
 
 def test_gradle_build_tool_with_group_artifact_validation(gradle_tool: Gradle, tmp_path: Path) -> None:
@@ -108,18 +94,6 @@ def test_gradle_build_tool_with_project_group_and_multimodule_name(gradle_tool:
     assert detected[0][3] == "settings.gradle"
 
 
-def test_gradle_build_tool_with_repo_namespace_group(gradle_tool: Gradle, tmp_path: Path) -> None:
-    """Test Gradle detection when group input is a repository namespace."""
-    gradle_repo = tmp_path.joinpath("micronaut-test")
-    gradle_repo.mkdir(parents=True)
-    gradle_repo.joinpath("build.gradle").write_text("plugins { id 'java' }\n")
-    gradle_repo.joinpath("settings.gradle").write_text("rootProject.name = 'test-parent'\ninclude 'test-junit5'\n")
-    gradle_repo.joinpath("gradle.properties").write_text("projectGroup=io.micronaut.test\n")
-
-    detected = gradle_tool.is_detected(str(gradle_repo), group_id="micronaut-projects", artifact_id="micronaut-test")
-    assert detected
-
-
 @pytest.mark.parametrize(
     (
         "command",

tests/slsa_analyzer/build_tool/test_maven.py

@@ -21,11 +21,9 @@
         Path(__file__).parent.joinpath("mock_repos", "maven_repos", "no_pom"),
     ],
 )
-def test_get_build_dirs(maven_tool: Maven, mock_repo: Path) -> None:
+def test_get_build_dirs(snapshot: list, maven_tool: Maven, mock_repo: Path) -> None:
     """Test discovering build directories."""
-    # Maven detection now relies on group/artifact validation, which is not
-    # provided by get_build_dirs().
-    assert not list(maven_tool.get_build_dirs(str(mock_repo)))
+    assert list(maven_tool.get_build_dirs(str(mock_repo))) == snapshot
 
 
 @pytest.mark.parametrize(

tests/slsa_analyzer/build_tool/test_pip.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2024 - 2025, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024 - 2026, 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/.
 
 """This module tests the Pip build functions."""
@@ -113,7 +113,7 @@ def test_is_pip_deploy_command(
     ),
     [
         (
-            ["pip", "build"],
+            ["python", "-m", "build"],
             BuildLanguage.PYTHON,
             None,
             None,
@@ -123,17 +123,6 @@ def test_is_pip_deploy_command(
             ["codeql-analysis.yaml"],
             True,
         ),
-        (
-            ["python", "-m", "pip", "build"],
-            BuildLanguage.PYTHON,
-            None,
-            None,
-            ".github/workflows/release.yaml",
-            [{"key", "pass"}],
-            ["push"],
-            ["codeql-analysis.yaml"],
-            True,
-        ),
         (
             ["python", "-m", "flit", "build"],
             BuildLanguage.PYTHON,