chore: update template file as input test case and unit test run_maca…

…ron.sh test case to use files within the test directory Signed-off-by: Trong Nhan Mai <trong.nhan.mai@oracle.com>
oracle · Jul 8, 2024 · 22c2e32 · 22c2e32
1 parent df0a4a9
commit 22c2e32
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/...integration/cases/apache_maven_using_default_template_file_as_input_template/macaron.html b/...integration/cases/apache_maven_using_default_template_file_as_input_template/macaron.html
@@ -0,0 +1,20 @@
+<!-- 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/. -->
+
+<!DOCTYPE html>
+<html lang='en'>
+
+<head>
+    <meta charset='UTF-8'>
+    <title>Macaron - Report</title>
+</head>
+
+<body>
+    <header>
+        <div>MACARON REPORT</div>
+    </header>
+
+    SAMPLE MACARON REPORT CONTENT
+</body>
+
+</html>
diff --git a/tests/integration/cases/apache_maven_using_default_template_file_as_input_template/test.yaml b/tests/integration/cases/apache_maven_using_default_template_file_as_input_template/test.yaml
@@ -16,7 +16,7 @@ steps:
     - -d
     - 3fc399318edef0d5ba593723a24fff64291d6f9b
     - -g
-    - ../../../../src/macaron/output_reporter/templates/macaron.html
+    - macaron.html
     - --skip-deps
 - name: Run verify-policy
   kind: verify

diff --git a/tests/integration/cases/run_macaron_sh_script_unit_test/setup.sh b/tests/integration/cases/run_macaron_sh_script_unit_test/setup.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+# 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/.
+
+mkdir ./output
+cp ../../../../scripts/release_scripts/run_macaron.sh ./output/run_macaron.sh
diff --git a/tests/integration/cases/run_macaron_sh_script_unit_test/test.yaml b/tests/integration/cases/run_macaron_sh_script_unit_test/test.yaml
@@ -8,6 +8,10 @@ tags:
 - docker-only
 
 steps:
+- name: Copy the run_macaron.sh from the source repo to ./output which will eventually be cleaned up.
+  kind: shell
+  options:
+    cmd: ./setup.sh
 - name: Run test_run_macaron_sh.py
   kind: shell
   options:

diff --git a/tests/integration/cases/run_macaron_sh_script_unit_test/test_run_macaron_sh.py b/tests/integration/cases/run_macaron_sh_script_unit_test/test_run_macaron_sh.py
@@ -41,7 +41,7 @@ def test_macaron_command() -> int:
 
         result = subprocess.run(
             [  # nosec B603
-                "../../../../scripts/release_scripts/run_macaron.sh",
+                "./output/run_macaron.sh",
                 *script_args,
             ],
             capture_output=True,