Fix tests, probably

Author: Keavon

node-graph/gcore/src/raster/adjustments.rs

@@ -1414,28 +1414,6 @@ async fn color_overlay<F: 'n + Copy + Send, T: Adjust<Color>>(
 	input
 }
 
-#[test]
-fn color_overlay_multiply() {
-	use crate::raster::Image;
-
-	let image_color = Color::from_rgbaf32_unchecked(0.7, 0.6, 0.5, 0.4);
-	let image = ImageFrame {
-		image: Image::new(1, 1, image_color),
-		..Default::default()
-	};
-
-	// Color { red: 0., green: 1., blue: 0., alpha: 1. }
-	let overlay_color = Color::GREEN;
-
-	// 100% of the output should come from the multiplied value
-	let opacity = 100_f64;
-
-	let result = color_overlay(image, overlay_color, BlendMode::Multiply, opacity);
-
-	// The output should just be the original green and alpha channels (as we multiply them by 1 and other channels by 0)
-	assert_eq!(result.image.data[0], Color::from_rgbaf32_unchecked(0., image_color.g(), 0., image_color.a()));
-}
-
 #[cfg(feature = "alloc")]
 pub use index_node::IndexNode;
 
@@ -1453,3 +1431,41 @@ mod index_node {
 		}
 	}
 }
+
+#[cfg(test)]
+mod test {
+	use crate::raster::{BlendMode, Image, ImageFrame};
+	use crate::{Color, Node};
+	use std::pin::Pin;
+
+	#[derive(Clone)]
+	pub struct FutureWrapperNode<T: Clone>(T);
+
+	impl<'i, T: 'i + Clone + Send> Node<'i, ()> for FutureWrapperNode<T> {
+		type Output = Pin<Box<dyn core::future::Future<Output = T> + 'i + Send>>;
+		fn eval(&'i self, _input: ()) -> Self::Output {
+			let value = self.0.clone();
+			Box::pin(async move { value })
+		}
+	}
+
+	#[tokio::test]
+	async fn color_overlay_multiply() {
+		let image_color = Color::from_rgbaf32_unchecked(0.7, 0.6, 0.5, 0.4);
+		let image = ImageFrame {
+			image: Image::new(1, 1, image_color),
+			..Default::default()
+		};
+
+		// Color { red: 0., green: 1., blue: 0., alpha: 1. }
+		let overlay_color = Color::GREEN;
+
+		// 100% of the output should come from the multiplied value
+		let opacity = 100_f64;
+
+		let result = super::color_overlay((), &FutureWrapperNode(image), overlay_color, BlendMode::Multiply, opacity).await;
+
+		// The output should just be the original green and alpha channels (as we multiply them by 1 and other channels by 0)
+		assert_eq!(result.image.data[0], Color::from_rgbaf32_unchecked(0., image_color.g(), 0., image_color.a()));
+	}
+}

node-graph/gcore/src/vector/vector_nodes.rs

@@ -748,7 +748,7 @@ mod test {
 	async fn morph() {
 		let source = Subpath::new_rect(DVec2::ZERO, DVec2::ONE * 100.);
 		let target = Subpath::new_ellipse(DVec2::NEG_ONE * 100., DVec2::ZERO);
-		let sample_points = super::morph(Footprint::default(), &vector_node(source), &vector_node(target), 0, 0.5).await;
+		let sample_points = super::morph(Footprint::default(), &vector_node(source), &vector_node(target), 0.5, 0).await;
 		assert_eq!(
 			&sample_points.point_domain.positions()[..4],
 			vec![DVec2::new(-25., -50.), DVec2::new(50., -25.), DVec2::new(25., 50.), DVec2::new(-50., 25.)]