test: use existing ingest method

trustification · Jul 11, 2024 · 89e0c21 · 89e0c21
1 parent d46a519
commit 89e0c21
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/migration/src/m0000460_add_vulnerability_description_adv.rs b/migration/src/m0000460_add_vulnerability_description_adv.rs
@@ -28,7 +28,7 @@ impl MigrationTrait for Migration {
                             .not_null(),
                     )
                     .add_foreign_key(
-                        &TableForeignKey::new()
+                        TableForeignKey::new()
                             .name(FK_NAME)
                             .from_tbl(VulnerabilityDescription::Table)
                             .from_col(VulnerabilityDescription::AdvisoryId)

diff --git a/modules/ingestor/Cargo.toml b/modules/ingestor/Cargo.toml
@@ -45,7 +45,6 @@ uuid = { workspace = true, features = ["v7"] }
 [dev-dependencies]
 trustify-test-context = { workspace = true }
 
-futures-util = { workspace = true }
 rand = { workspace = true }
 rstest = {workspace = true }
 serde_yaml = { workspace = true }

diff --git a/modules/ingestor/tests/cve.rs b/modules/ingestor/tests/cve.rs
@@ -1,31 +1,17 @@
 #![allow(clippy::expect_used)]
 
 use anyhow::bail;
-use futures_util::stream;
-use std::convert::Infallible;
 use test_context::test_context;
 use test_log::test;
 use trustify_common::id::Id;
-use trustify_module_ingestor::service::{Format, IngestorService};
 use trustify_test_context::TrustifyContext;
 
 #[test_context(TrustifyContext)]
 #[test(tokio::test)]
 async fn reingest_cve(ctx: &TrustifyContext) -> Result<(), anyhow::Error> {
-    let ingestor = IngestorService::new(ctx.graph.clone(), ctx.storage.clone());
-
-    let data = ctx.document_bytes("cve/CVE-2021-32714.json").await?;
-
     // ingest once
 
-    let result = ingestor
-        .ingest(
-            (),
-            None,
-            Format::CVE,
-            stream::iter([Ok::<_, Infallible>(data.clone())]),
-        )
-        .await?;
+    let result = ctx.ingest_document("cve/CVE-2021-32714.json").await?;
 
     let Id::Uuid(id) = result.id else {
         bail!("must be an id")
@@ -48,14 +34,7 @@ async fn reingest_cve(ctx: &TrustifyContext) -> Result<(), anyhow::Error> {
 
     // ingest second time
 
-    ingestor
-        .ingest(
-            (),
-            None,
-            Format::CVE,
-            stream::iter([Ok::<_, Infallible>(data)]),
-        )
-        .await?;
+    let result = ctx.ingest_document("cve/CVE-2021-32714.json").await?;
 
     let Id::Uuid(id) = result.id else {
         bail!("must be an id")