Migrate resource_with_lists test to wit-bindgen test (#1263)

Author: alexcrichton

crates/test-rust-wasm/Cargo.toml

@@ -26,7 +26,3 @@ test = false
 [[bin]]
 name = "resources"
 test = false
-
-[[bin]]
-name = "resource_with_lists"
-test = false

crates/test-rust-wasm/src/bin/resource_with_lists.rs

@@ -0,0 +1,7 @@
+package example:composition;
+
+let a = new test:leaf { ... };
+let b = new test:resource-with-lists { ...a, ... };
+let c = new test:runner { ...b, ... };
+
+export c...;

tests/runtime-new/resource_with_lists/compose.wac

@@ -0,0 +1,38 @@
+include!(env!("BINDINGS"));
+
+use crate::exports::test::resource_with_lists::test::{Guest, GuestThing};
+use std::cell::RefCell;
+
+#[derive(Default)]
+pub struct MyThing(RefCell<Vec<u8>>);
+
+struct Component;
+
+export!(Component);
+
+impl Guest for Component {
+    type Thing = MyThing;
+}
+
+impl GuestThing for MyThing {
+    fn new(mut l: Vec<u8>) -> MyThing {
+        l.extend_from_slice(" HostThing".as_bytes());
+        MyThing(RefCell::new(l))
+    }
+
+    fn foo(&self) -> Vec<u8> {
+        let mut list = self.0.borrow().clone();
+        list.extend_from_slice(" HostThing.foo".as_bytes());
+        list
+    }
+
+    fn bar(&self, mut l: Vec<u8>) {
+        l.extend_from_slice(" HostThing.bar".as_bytes());
+        *self.0.borrow_mut() = l;
+    }
+
+    fn baz(mut l: Vec<u8>) -> Vec<u8> {
+        l.extend_from_slice(" HostThing.baz".as_bytes());
+        l
+    }
+}

tests/runtime-new/resource_with_lists/leaf.rs

@@ -1,6 +1,4 @@
-wit_bindgen::generate!({
-    path: "../../tests/runtime/resource_with_lists",
-});
+include!(env!("BINDINGS"));
 
 use exports::test::resource_with_lists::test::GuestThing;
 use test::resource_with_lists::test::Thing;

tests/runtime/resource_with_lists/wasm.cs renamed to tests/runtime-new/resource_with_lists/resource-with-lists.cs

@@ -0,0 +1,24 @@
+include!(env!("BINDINGS"));
+
+use crate::test::resource_with_lists::test::Thing;
+
+fn main() {
+    let thing_instance = Thing::new(b"Hi");
+
+    assert_eq!(
+        thing_instance.foo(),
+        b"Hi Thing HostThing HostThing.foo Thing.foo"
+    );
+
+    thing_instance.bar(b"Hola");
+
+    assert_eq!(
+        thing_instance.foo(),
+        b"Hola Thing.bar HostThing.bar HostThing.foo Thing.foo"
+    );
+
+    assert_eq!(
+        Thing::baz(b"Ohayo Gozaimas"),
+        b"Ohayo Gozaimas Thing.baz HostThing.baz Thing.baz again"
+    );
+}

tests/runtime/resource_with_lists/wasm.rs renamed to tests/runtime-new/resource_with_lists/resource-with-lists.rs

@@ -1,3 +1,6 @@
+//@ dependencies = ['resource-with-lists', 'leaf']
+//@ wac = 'compose.wac'
+
 package test:resource-with-lists;
 
 interface test {
@@ -9,7 +12,15 @@ interface test {
  }
 }
 
+world leaf {
+  export test;
+}
+
 world resource-with-lists {
   import test;
   export test;
 }
+
+world runner {
+  import test;
+}

tests/runtime-new/resource_with_lists/runner.rs

@@ -15,7 +15,6 @@ use wit_parser::{Resolve, WorldId, WorldItem};
 
 mod flavorful;
 mod options;
-mod resource_with_lists;
 mod resources;
 mod results;