chore: convert case invalid_branch_or_commit_yaml_input

Signed-off-by: Nathan Nguyen <[email protected]>

Author: nathanwn

scripts/dev_scripts/integration_tests.sh

@@ -134,25 +134,6 @@ run_macaron_clean $ANALYZE -c $WORKSPACE/tests/dependency_analyzer/configuration
 
 check_or_update_expected_output $COMPARE_DEPS $DEP_RESULT $DEP_EXPECTED || log_fail
 
-echo -e "\n----------------------------------------------------------------------------------"
-echo "apache/maven: Check: Check the e2e status code of running with invalid branch or digest defined in the yaml configuration."
-echo -e "----------------------------------------------------------------------------------\n"
-declare -a INVALID_BRANCH_DIGEST=(
-    "maven_invalid_branch.yaml"
-    "maven_invalid_digest.yaml"
-)
-
-for i in "${INVALID_BRANCH_DIGEST[@]}"
-do
-    echo -e "Running with $WORKSPACE/tests/e2e/configurations/$i"
-    run_macaron_clean $ANALYZE -c $WORKSPACE/tests/e2e/configurations/$i
-    if [ $? -eq 0 ];
-    then
-        echo -e "Expect non-zero status code for $WORKSPACE/test/e2e/configurations/$i but got $?."
-        log_fail
-    fi
-done
-
 echo -e "\n----------------------------------------------------------------------------------"
 echo "Test using the default template file."
 echo -e "----------------------------------------------------------------------------------\n"

tests/e2e/configurations/maven_invalid_branch.yaml renamed to tests/integration/cases/invalid_branch_or_commit_yaml_input/maven_invalid_branch.yaml

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 - 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022 - 2024, 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/.
 
 target:

tests/e2e/configurations/maven_invalid_digest.yaml renamed to tests/integration/cases/invalid_branch_or_commit_yaml_input/maven_invalid_commit.yaml

@@ -1,4 +1,4 @@
-# Copyright (c) 2022 - 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022 - 2024, 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/.
 
 target:

tests/integration/cases/invalid_branch_or_commit_yaml_input/test.yaml

@@ -0,0 +1,21 @@
+# Copyright (c) 2024 - 2024, 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/.
+
+description: |
+  Check the e2e status code of running with invalid branch or commit defined in the yaml configuration.
+
+steps:
+- name: Run macaron analyze with yaml input containing invalid branch
+  kind: analyze
+  options:
+    command_args:
+    - -c
+    - maven_invalid_branch.yaml
+  expect_fail: true
+- name: Run macaron analyze with yaml input containing invalid commit
+  kind: analyze
+  options:
+    command_args:
+    - -c
+    - maven_invalid_commit.yaml
+  expect_fail: true