test: update expected results and add a new integration test

Signed-off-by: behnazh-w <[email protected]>
oracle · Sep 12, 2023 · f6128e4 · f6128e4
1 parent 0387a7b
commit f6128e4
Show file tree

Hide file tree

Showing 20 changed files with 1,277 additions and 736 deletions.
diff --git a/scripts/dev_scripts/integration_tests.sh b/scripts/dev_scripts/integration_tests.sh
@@ -267,6 +267,16 @@ python $COMPARE_JSON_OUT $JSON_RESULT $JSON_EXPECTED || log_fail
 
 # python $COMPARE_DEPS $DEP_RESULT $DEP_EXPECTED || log_fail
 
+echo -e "\n----------------------------------------------------------------------------------"
+echo "google/guava: Analyzing with PURL and repository path without dependency resolution."
+echo -e "----------------------------------------------------------------------------------\n"
+JSON_EXPECTED=$WORKSPACE/tests/e2e/expected_results/purl/com_google_guava/guava/guava.json
+JSON_RESULT=$WORKSPACE/output/reports/maven/com_google_guava/guava/guava.json
+$RUN_MACARON analyze -purl pkg:maven/com.google.guava/[email protected]?type=jar -rp https://github.com/google/guava -b master -d d8633ac8539dae52c8361f79c7a0dbd9ad6dd2c4 --skip-deps || log_fail
+
+python $COMPARE_JSON_OUT $JSON_RESULT $JSON_EXPECTED || log_fail
+
+
 # Running Macaron using local paths.
 echo -e "\n=================================================================================="
 echo "Run integration tests with local paths for apache/maven..."

diff --git a/tests/dependency_analyzer/expected_results/apache_maven_with_sbom_provided.json b/tests/dependency_analyzer/expected_results/apache_maven_with_sbom_provided.json
@@ -1,7 +1,7 @@
 [
     {
         "id": "org.junit.jupiter:junit-jupiter-engine",
-        "purl": "",
+        "purl": "pkg:maven/org.junit.jupiter/[email protected]?type=jar",
         "path": "https://github.com/junit-team/junit5",
         "branch": "",
         "digest": "",
@@ -10,7 +10,7 @@
     },
     {
         "id": "org.hamcrest:hamcrest-core",
-        "purl": "",
+        "purl": "pkg:maven/org.hamcrest/[email protected]?type=jar",
         "path": "https://github.com/hamcrest/JavaHamcrest",
         "branch": "",
         "digest": "",
@@ -19,7 +19,7 @@
     },
     {
         "id": "org.apache.maven:maven-model",
-        "purl": "",
+        "purl": "pkg:maven/org.apache.maven/[email protected]?type=jar",
         "path": "",
         "branch": "",
         "digest": "",
@@ -28,7 +28,7 @@
     },
     {
         "id": "org.apache.maven:maven-artifact",
-        "purl": "",
+        "purl": "pkg:maven/org.apache.maven/[email protected]?type=jar",
         "path": "",
         "branch": "",
         "digest": "",
@@ -37,7 +37,7 @@
     },
     {
         "id": "org.apache.maven:maven-plugin-api",
-        "purl": "",
+        "purl": "pkg:maven/org.apache.maven/[email protected]?type=jar",
         "path": "",
         "branch": "",
         "digest": "",
@@ -46,7 +46,7 @@
     },
     {
         "id": "org.apache.maven:maven-builder-support",
-        "purl": "",
+        "purl": "pkg:maven/org.apache.maven/[email protected]?type=jar",
         "path": "",
         "branch": "",
         "digest": "",
@@ -55,7 +55,7 @@
     },
     {
         "id": "org.apache.maven:maven-model-transform",
-        "purl": "",
+        "purl": "pkg:maven/org.apache.maven/[email protected]?type=jar",
         "path": "",
         "branch": "",
         "digest": "",
@@ -64,7 +64,7 @@
     },
     {
         "id": "org.apache.maven:maven-model-builder",
-        "purl": "",
+        "purl": "pkg:maven/org.apache.maven/[email protected]?type=jar",
         "path": "",
         "branch": "",
         "digest": "",
@@ -73,7 +73,7 @@
     },
     {
         "id": "org.apache.maven:maven-settings",
-        "purl": "",
+        "purl": "pkg:maven/org.apache.maven/[email protected]?type=jar",
         "path": "",
         "branch": "",
         "digest": "",
@@ -82,7 +82,7 @@
     },
     {
         "id": "org.apache.maven:maven-settings-builder",
-        "purl": "",
+        "purl": "pkg:maven/org.apache.maven/[email protected]?type=jar",
         "path": "",
         "branch": "",
         "digest": "",
@@ -91,7 +91,7 @@
     },
     {
         "id": "org.apache.maven:maven-toolchain-model",
-        "purl": "",
+        "purl": "pkg:maven/org.apache.maven/[email protected]?type=jar",
         "path": "",
         "branch": "",
         "digest": "",
@@ -100,7 +100,7 @@
     },
     {
         "id": "org.apache.maven:maven-toolchain-builder",
-        "purl": "",
+        "purl": "pkg:maven/org.apache.maven/[email protected]?type=jar",
         "path": "",
         "branch": "",
         "digest": "",
@@ -109,7 +109,7 @@
     },
     {
         "id": "org.apache.maven:maven-repository-metadata",
-        "purl": "",
+        "purl": "pkg:maven/org.apache.maven/[email protected]?type=jar",
         "path": "",
         "branch": "",
         "digest": "",
@@ -118,7 +118,7 @@
     },
     {
         "id": "org.apache.maven:maven-resolver-provider",
-        "purl": "",
+        "purl": "pkg:maven/org.apache.maven/[email protected]?type=jar",
         "path": "",
         "branch": "",
         "digest": "",
@@ -127,7 +127,7 @@
     },
     {
         "id": "org.apache.maven:maven-core",
-        "purl": "",
+        "purl": "pkg:maven/org.apache.maven/[email protected]?type=jar",
         "path": "",
         "branch": "",
         "digest": "",
@@ -136,7 +136,7 @@
     },
     {
         "id": "org.apache.maven:maven-slf4j-wrapper",
-        "purl": "",
+        "purl": "pkg:maven/org.apache.maven/[email protected]?type=jar",
         "path": "",
         "branch": "",
         "digest": "",
@@ -145,7 +145,7 @@
     },
     {
         "id": "org.apache.maven:maven-slf4j-provider",
-        "purl": "",
+        "purl": "pkg:maven/org.apache.maven/[email protected]?type=jar",
         "path": "",
         "branch": "",
         "digest": "",
@@ -154,7 +154,7 @@
     },
     {
         "id": "org.apache.maven:maven-embedder",
-        "purl": "",
+        "purl": "pkg:maven/org.apache.maven/[email protected]?type=jar",
         "path": "",
         "branch": "",
         "digest": "",
@@ -163,7 +163,7 @@
     },
     {
         "id": "org.apache.maven:maven-compat",
-        "purl": "",
+        "purl": "pkg:maven/org.apache.maven/[email protected]?type=jar",
         "path": "",
         "branch": "",
         "digest": "",
@@ -172,7 +172,7 @@
     },
     {
         "id": "org.apache.maven:apache-maven",
-        "purl": "",
+        "purl": "pkg:maven/org.apache.maven/[email protected]?type=pom",
         "path": "",
         "branch": "",
         "digest": "",