Refactor plugin paths in test suite (#817)

bytecodealliance · Nov 6, 2024 · c315cde · c315cde
1 parent 6daa25b
commit c315cde
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 36 deletions.
diff --git a/crates/cli/tests/dylib_test.rs b/crates/cli/tests/dylib_test.rs
@@ -1,10 +1,7 @@
 use anyhow::Result;
-use javy_runner::{Runner, RunnerError, UseExportedFn};
-use std::path::{Path, PathBuf};
+use javy_runner::{Plugin, Runner, RunnerError, UseExportedFn};
 use std::str;
 
-static ROOT: &str = env!("CARGO_MANIFEST_DIR");
-
 #[test]
 fn test_dylib() -> Result<()> {
     let js_src = "console.log(42);";
@@ -60,15 +57,5 @@ fn test_dylib_with_exported_func() -> Result<()> {
 }
 
 fn plugin_module() -> Result<Vec<u8>> {
-    let mut lib_path = PathBuf::from(ROOT);
-    lib_path.pop();
-    lib_path.pop();
-    lib_path = lib_path.join(
-        Path::new("target")
-            .join("wasm32-wasip1")
-            .join("release")
-            .join("plugin_wizened.wasm"),
-    );
-
-    std::fs::read(lib_path).map_err(Into::into)
+    std::fs::read(Plugin::Default.path()).map_err(Into::into)
 }
diff --git a/crates/runner/src/lib.rs b/crates/runner/src/lib.rs
@@ -35,6 +35,27 @@ impl Plugin {
             Self::User { .. } => "test_plugin",
         }
     }
+
+    pub fn path(&self) -> PathBuf {
+        let root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+        match self {
+            Self::V2 => root
+                .join("..")
+                .join("..")
+                .join("crates")
+                .join("cli")
+                .join("src")
+                .join("javy_quickjs_provider_v2.wasm"),
+            Self::User => root.join("test_plugin.wasm"),
+            Self::Default => root
+                .join("..")
+                .join("..")
+                .join("target")
+                .join("wasm32-wasip1")
+                .join("release")
+                .join("plugin_wizened.wasm"),
+        }
+    }
 }
 
 #[derive(Clone)]
@@ -589,7 +610,7 @@ impl Runner {
 
         if let Plugin::User = plugin {
             args.push("-C".to_string());
-            args.push(format!("plugin={}", Self::plugin_path().to_str().unwrap()));
+            args.push(format!("plugin={}", plugin.path().to_str().unwrap()));
         }
 
         args
@@ -815,10 +836,6 @@ impl Runner {
             .into()),
         }
     }
-
-    fn plugin_path() -> PathBuf {
-        PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("test_plugin.wasm")
-    }
 }
 
 #[derive(Debug)]

diff --git a/crates/test-macros/src/lib.rs b/crates/test-macros/src/lib.rs
@@ -290,30 +290,18 @@ fn expand_cli_tests(test_config: &CliTestConfig, func: syn::ItemFn) -> Result<To
             // releases.
             if command_name == "Compile" {
                 quote! {
-                    let root = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
                     let plugin = javy_runner::Plugin::V2;
-                    let namespace = plugin.namespace();
-                    builder.plugin(plugin);
                     builder.preload(
-                        namespace.into(),
-                        root.join("src").join("javy_quickjs_provider_v2.wasm")
+                        plugin.namespace().into(),
+                        plugin.path(),
                     );
+                    builder.plugin(plugin);
                 }
             } else {
                 quote! {
-                    let mut root = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-                    root.pop();
-                    root.pop();
-                    root = root.join(
-                        std::path::Path::new("target")
-                            .join("wasm32-wasip1")
-                            .join("release")
-                            .join("plugin_wizened.wasm"),
-                    );
                     let plugin = javy_runner::Plugin::Default;
-                    let namespace = plugin.namespace();
+                    builder.preload(plugin.namespace().into(), plugin.path());
                     builder.plugin(plugin);
-                    builder.preload(namespace.into(), root);
                 }
             }
         } else {