TC-1593 CycloneDX SBOM package to Product relationship is missing: so…

…rted HasMetadata output Signed-off-by: mrizzi <[email protected]>
trustification · Jun 25, 2024 · dbaaba0 · dbaaba0
1 parent 095c075
commit dbaaba0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/internal/testing/e2e-trustification/e2e b/internal/testing/e2e-trustification/e2e
@@ -89,7 +89,7 @@ time go run ./cmd/guacone collect files ${GUAC_DIR}/internal/testing/testdata/ex
 
 echo @@@@ Running TC_1593 queries and validating output
 
-cat "$queries" | gql-cli http://localhost:8080/query -o TC_1593_HasMetadata | jq 'del(.. | .id?) | .HasMetadata' > "${GUAC_DIR}/gotTC_1593_HasMetadata.json"
+cat "$queries" | gql-cli http://localhost:8080/query -o TC_1593_HasMetadata | jq 'del(.. | .id?) | .HasMetadata | sort ' > "${GUAC_DIR}/gotTC_1593_HasMetadata.json"
 diff -u "${SCRIPT_DIR}/expectTC_1593_HasMetadata.json" "${GUAC_DIR}/gotTC_1593_HasMetadata.json"
 
 cat "$queries" | gql-cli http://localhost:8080/query -o TC_1593_FindDependentProduct | jq 'del(.. | .id?) | del(.. | .downloadLocation?) | .findDependentProduct' > "${GUAC_DIR}/gotTC_1593_FindDependentProduct.json"

diff --git a/internal/testing/e2e-trustification/expectTC_1593_HasMetadata.json b/internal/testing/e2e-trustification/expectTC_1593_HasMetadata.json
@@ -7,7 +7,7 @@
           "namespace": "com.fasterxml.jackson.core",
           "names": [
             {
-              "name": "jackson-core",
+              "name": "jackson-annotations",
               "versions": [
                 {
                   "version": "2.14.0",
@@ -31,13 +31,13 @@
       "type": "maven",
       "namespaces": [
         {
-          "namespace": "org.projectlombok",
+          "namespace": "com.fasterxml.jackson.core",
           "names": [
             {
-              "name": "lombok",
+              "name": "jackson-core",
               "versions": [
                 {
-                  "version": "1.16.6",
+                  "version": "2.14.0",
                   "qualifiers": [
                     {
                       "key": "type",
@@ -58,13 +58,13 @@
       "type": "maven",
       "namespaces": [
         {
-          "namespace": "log4j",
+          "namespace": "com.fasterxml.jackson.core",
           "names": [
             {
-              "name": "log4j",
+              "name": "jackson-databind",
               "versions": [
                 {
-                  "version": "1.2.17",
+                  "version": "2.14.0",
                   "qualifiers": [
                     {
                       "key": "type",
@@ -85,13 +85,13 @@
       "type": "maven",
       "namespaces": [
         {
-          "namespace": "pom-with-deps-no-ignore",
+          "namespace": "log4j",
           "names": [
             {
-              "name": "pom-with-dependency-not-ignored-for-tests",
+              "name": "log4j",
               "versions": [
                 {
-                  "version": "0.0.1",
+                  "version": "1.2.17",
                   "qualifiers": [
                     {
                       "key": "type",
@@ -112,13 +112,13 @@
       "type": "maven",
       "namespaces": [
         {
-          "namespace": "com.fasterxml.jackson.core",
+          "namespace": "org.projectlombok",
           "names": [
             {
-              "name": "jackson-databind",
+              "name": "lombok",
               "versions": [
                 {
-                  "version": "2.14.0",
+                  "version": "1.16.6",
                   "qualifiers": [
                     {
                       "key": "type",
@@ -139,13 +139,13 @@
       "type": "maven",
       "namespaces": [
         {
-          "namespace": "com.fasterxml.jackson.core",
+          "namespace": "pom-with-deps-no-ignore",
           "names": [
             {
-              "name": "jackson-annotations",
+              "name": "pom-with-dependency-not-ignored-for-tests",
               "versions": [
                 {
-                  "version": "2.14.0",
+                  "version": "0.0.1",
                   "qualifiers": [
                     {
                       "key": "type",