Fix cyclic dependency issue in test

Signed-off-by: Aminu Oluwaseun Joshua <[email protected]>

Author: seun-ja

Cargo.lock

@@ -14,5 +14,4 @@ thiserror = { workspace = true }
 
 [dev-dependencies]
 toml = { workspace = true }
-spin-factors-test = { path = "../factors-test" }
 tokio = { workspace = true }

crates/app/Cargo.toml

@@ -341,40 +341,3 @@ pub fn retain_components(
 ) -> Result<LockedApp> {
     App::new("unused", locked).retain_components(components, validators)
 }
-
-#[cfg(test)]
-mod test {
-    // TODO Joshua: Fix error issue
-    // use spin_factors_test::build_locked_app;
-
-    // use super::*;
-
-    // fn does_nothing_validator(_: &App, _: &[&str]) -> anyhow::Result<()> {
-    //     Ok(())
-    // }
-
-    // #[tokio::test]
-    // async fn test_retain_components_filtering_for_only_component_works() {
-    //     let manifest = toml::toml! {
-    //         spin_manifest_version = 2
-
-    //         [application]
-    //         name = "test-app"
-
-    //         [[trigger.test-trigger]]
-    //         component = "empty"
-
-    //         [component.empty]
-    //         source = "does-not-exist.wasm"
-    //     };
-    //     let mut locked_app = build_locked_app(&manifest).await.unwrap();
-    //     locked_app = retain_components(locked_app, &["empty"], &[&does_nothing_validator]).unwrap();
-    //     let components = locked_app
-    //         .components
-    //         .iter()
-    //         .map(|c| c.id.to_string())
-    //         .collect::<HashSet<_>>();
-    //     assert!(components.contains("empty"));
-    //     assert!(components.len() == 1);
-    // }
-}

crates/app/src/lib.rs

@@ -11,6 +11,7 @@ spin-loader = { path = "../loader" }
 spin-telemetry = { path = "../telemetry", features = ["testing"] }
 tempfile = { workspace = true }
 toml = { workspace = true }
+tokio = { workspace = true }
 
 [lints]
 workspace = true

crates/factors-test/Cargo.toml

@@ -104,3 +104,41 @@ pub async fn build_locked_app(manifest: &toml::Table) -> anyhow::Result<LockedAp
     std::fs::write(&path, toml_str).context("failed writing manifest")?;
     spin_loader::from_file(&path, FilesMountStrategy::Direct, None).await
 }
+
+#[cfg(test)]
+mod test {
+    use std::collections::HashSet;
+
+    use spin_app::retain_components;
+
+    use super::*;
+
+    fn does_nothing_validator(_: &App, _: &[&str]) -> anyhow::Result<()> {
+        Ok(())
+    }
+
+    #[tokio::test]
+    async fn test_retain_components_filtering_for_only_component_works() {
+        let manifest = toml::toml! {
+            spin_manifest_version = 2
+
+            [application]
+            name = "test-app"
+
+            [[trigger.test-trigger]]
+            component = "empty"
+
+            [component.empty]
+            source = "does-not-exist.wasm"
+        };
+        let mut locked_app = build_locked_app(&manifest).await.unwrap();
+        locked_app = retain_components(locked_app, &["empty"], &[&does_nothing_validator]).unwrap();
+        let components = locked_app
+            .components
+            .iter()
+            .map(|c| c.id.to_string())
+            .collect::<HashSet<_>>();
+        assert!(components.contains("empty"));
+        assert!(components.len() == 1);
+    }
+}