From 14da8537bdc1cd1a80f9873bc8aab49894f93d81 Mon Sep 17 00:00:00 2001
From: Hiram Chirino <hiram@hiramchirino.com>
Date: Fri, 24 Jan 2025 13:37:32 -0500
Subject: [PATCH] Fix failing test.

Signed-off-by: Hiram Chirino <hiram@hiramchirino.com>
---
 modules/analysis/src/endpoints/test.rs | 42 +++++++++-----------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/modules/analysis/src/endpoints/test.rs b/modules/analysis/src/endpoints/test.rs
index ad970f033..6194ee312 100644
--- a/modules/analysis/src/endpoints/test.rs
+++ b/modules/analysis/src/endpoints/test.rs
@@ -656,21 +656,15 @@ async fn spdx_package_of(ctx: &TrustifyContext) -> Result<(), anyhow::Error> {
     let response: Value = app.call_and_read_body_json(request).await;
     log::debug!("{}", serde_json::to_string_pretty(&response)?);
 
-    let sbom = &response["items"][0];
-    let matches: Vec<_> = sbom["deps"]
-        .as_array()
-        .into_iter()
-        .flatten()
-        .filter(|m| {
-            m.contains_subset(json!({
+    assert!(response.contains_deep_subset(json!({
+        "items": [ {
+            "deps": [ {
                 "relationship": "PackageOf",
                 "name": "SATELLITE-6.15-RHEL-8",
                 "version": "6.15",
-            }))
-        })
-        .collect();
-
-    assert_eq!(1, matches.len());
+            }]
+        }]
+    })));
 
     let uri = format!(
         "/api/v2/analysis/root-component?q={}",
@@ -680,21 +674,15 @@ async fn spdx_package_of(ctx: &TrustifyContext) -> Result<(), anyhow::Error> {
     let response: Value = app.call_and_read_body_json(request).await;
     log::debug!("{}", serde_json::to_string_pretty(&response)?);
 
-    let sbom = &response["items"][0];
-    let matches: Vec<_> = sbom["ancestors"]
-        .as_array()
-        .into_iter()
-        .flatten()
-        .filter(|m| {
-            m.contains_subset(json!({
-              "relationship": "PackageOf",
-              "name": "rubygem-google-cloud-compute",
-              "version": "0.5.0-1.el8sat"
-            }))
-        })
-        .collect();
-
-    assert_eq!(1, matches.len());
+    assert!(response.contains_deep_subset(json!({
+        "items": [ {
+            "ancestors": [ {
+                "relationship": "PackageOf",
+                "name": "rubygem-google-cloud-compute",
+                "version": "0.5.0-1.el8sat"
+            }]
+        }]
+    })));
 
     Ok(())
 }