test: replace some micronaut-core tests with micronaut-test to reduce…

… integration test time

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

scripts/dev_scripts/integration_tests.sh

@@ -35,8 +35,12 @@ echo -e "=======================================================================
 echo -e "\n----------------------------------------------------------------------------------"
 echo "micronaut-projects/micronaut-core: Analyzing the repo path and the branch name when automatic dependency resolution is skipped."
 echo -e "----------------------------------------------------------------------------------\n"
+JSON_EXPECTED=$WORKSPACE/tests/e2e/expected_results/micronaut-core/micronaut-core.json
+JSON_RESULT=$WORKSPACE/output/reports/gitlab_com/micronaut-projects/micronaut-core/micronaut-core.json
 $RUN_MACARON analyze -rp https://github.com/micronaut-projects/micronaut-core -b 3.5.x --skip-deps || log_fail
 
+python $COMPARE_JSON_OUT $JSON_RESULT $JSON_EXPECTED || log_fail
+
 echo -e "\n----------------------------------------------------------------------------------"
 echo "gitlab.com/tinyMediaManager/tinyMediaManager: Analyzing the repo path and the branch name when automatic dependency resolution is skipped."
 echo -e "----------------------------------------------------------------------------------\n"
@@ -195,42 +199,42 @@ $RUN_MACARON analyze -purl pkg:private_domain.com/apache/maven -sbom "$SBOM_FILE
 
 python $COMPARE_DEPS $DEP_RESULT $DEP_EXPECTED || log_fail
 
-# Analyze micronaut-projects/micronaut-core.
+# Analyze micronaut-projects/micronaut-test.
 echo -e "\n=================================================================================="
-echo "Run integration tests with configurations for micronaut-projects/micronaut-core..."
+echo "Run integration tests with configurations for micronaut-projects/micronaut-test..."
 echo -e "==================================================================================\n"
-DEP_RESULT=$WORKSPACE/output/reports/github_com/micronaut-projects/micronaut-core/dependencies.json
+DEP_RESULT=$WORKSPACE/output/reports/github_com/micronaut-projects/micronaut-test/dependencies.json
 
 echo -e "\n----------------------------------------------------------------------------------"
-echo "micronaut-projects/micronaut-core: Check the resolved dependency output when automatic dependency resolution is skipped."
+echo "micronaut-projects/micronaut-test: Check the resolved dependency output when automatic dependency resolution is skipped."
 echo -e "----------------------------------------------------------------------------------\n"
-DEP_EXPECTED=$WORKSPACE/tests/dependency_analyzer/expected_results/skipdep_micronaut-projects_micronaut-core.json
-$RUN_MACARON analyze -c $WORKSPACE/tests/dependency_analyzer/configurations/micronaut_core_config.yaml --skip-deps || log_fail
+DEP_EXPECTED=$WORKSPACE/tests/dependency_analyzer/expected_results/skipdep_micronaut-projects_micronaut-test.json
+$RUN_MACARON analyze -c $WORKSPACE/tests/dependency_analyzer/configurations/micronaut_test_config.yaml --skip-deps || log_fail
 
 python $COMPARE_DEPS $DEP_RESULT $DEP_EXPECTED || log_fail
 
+# TODO: uncomment the test below after resolving https://github.com/oracle/macaron/issues/60.
 # echo -e "\n----------------------------------------------------------------------------------"
-# echo "micronaut-projects/micronaut-core: Check the resolved dependency output with config for cyclonedx gradle plugin (default)."
+# echo "micronaut-projects/micronaut-test: Check the resolved dependency output with config for cyclonedx gradle plugin (default)."
 # echo -e "----------------------------------------------------------------------------------\n"
-DEP_EXPECTED=$WORKSPACE/tests/dependency_analyzer/expected_results/cyclonedx_micronaut-projects_micronaut-core.json
-$RUN_MACARON analyze -c $WORKSPACE/tests/dependency_analyzer/configurations/micronaut_core_config.yaml || log_fail
+# DEP_EXPECTED=$WORKSPACE/tests/dependency_analyzer/expected_results/cyclonedx_micronaut-projects_micronaut-test.json
+# $RUN_MACARON analyze -c $WORKSPACE/tests/dependency_analyzer/configurations/micronaut_test_config.yaml || log_fail
 
-# TODO: uncomment the test below after resolving https://github.com/oracle/macaron/issues/60.
 # python $COMPARE_DEPS $DEP_RESULT $DEP_EXPECTED || log_fail
 
 echo -e "\n----------------------------------------------------------------------------------"
-echo "micronaut-projects/micronaut-core: Check the e2e output JSON file with config and no dependency analyzing."
+echo "micronaut-projects/micronaut-test: Check the e2e output JSON file with config and no dependency analyzing."
 echo -e "----------------------------------------------------------------------------------\n"
-JSON_RESULT_DIR=$WORKSPACE/output/reports/github_com/micronaut-projects/micronaut-core/
-JSON_EXPECT_DIR=$WORKSPACE/tests/e2e/expected_results/micronaut-core
+JSON_RESULT_DIR=$WORKSPACE/output/reports/github_com/micronaut-projects/micronaut-test/
+JSON_EXPECT_DIR=$WORKSPACE/tests/e2e/expected_results/micronaut-test
 
 declare -a COMPARE_FILES=(
-    "micronaut-core.json"
+    "micronaut-test.json"
     "caffeine.json"
     "slf4j.json"
 )
 
-$RUN_MACARON analyze -c $WORKSPACE/tests/e2e/configurations/micronaut_core_config.yaml --skip-deps || log_fail
+$RUN_MACARON analyze -c $WORKSPACE/tests/e2e/configurations/micronaut_test_config.yaml --skip-deps || log_fail
 
 for i in "${COMPARE_FILES[@]}"
 do

tests/dependency_analyzer/configurations/micronaut_core_config.yaml → tests/dependency_analyzer/configurations/micronaut_test_config.yaml

@@ -1,13 +1,12 @@
-# Copyright (c) 2022 - 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023 - 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/.
 
 target:
-  id: micronaut-core
-  # For version 3.8.3
-  # https://github.com/micronaut-projects/micronaut-core/commit/68f9bb0a78fa930865d37fca39252b9ec66e4a43
-  branch: 3.8.x
-  digest: 68f9bb0a78fa930865d37fca39252b9ec66e4a43
-  path: https://github.com/micronaut-projects/micronaut-core
+  id: micronaut-test
+  # https://github.com/micronaut-projects/micronaut-test/commit/7679d10b4073a3b842b6c56877c35fa8cd10acff
+  branch: master
+  digest: 7679d10b4073a3b842b6c56877c35fa8cd10acff
+  path: https://github.com/micronaut-projects/micronaut-test
 
 dependencies:
 - id: slf4j