Fix tests

Author: Keavon

editor/src/messages/portfolio/document/document_message_handler.rs

@@ -2124,7 +2124,7 @@ impl DocumentMessageHandler {
 /// Create a network interface with a single export
 fn default_document_network_interface() -> NodeNetworkInterface {
 	let mut network_interface = NodeNetworkInterface::default();
-	network_interface.add_export(TaggedValue::ArtboardGroup(graphene_core::ArtboardGroup::EMPTY), -1, "", &[]);
+	network_interface.add_export(TaggedValue::ArtboardGroup(graphene_core::ArtboardGroup::default()), -1, "", &[]);
 	network_interface
 }
 

editor/src/messages/portfolio/document/graph_operation/utility_types.rs

@@ -126,7 +126,7 @@ impl<'a> ModifyInputsContext<'a> {
 	/// Creates an artboard as the primary export for the document network
 	pub fn create_artboard(&mut self, new_id: NodeId, artboard: Artboard) -> LayerNodeIdentifier {
 		let artboard_node_template = resolve_document_node_type("Artboard").expect("Node").node_template_input_override([
-			Some(NodeInput::value(TaggedValue::ArtboardGroup(graphene_std::ArtboardGroup::EMPTY), true)),
+			Some(NodeInput::value(TaggedValue::ArtboardGroup(graphene_std::ArtboardGroup::default()), true)),
 			Some(NodeInput::value(TaggedValue::GraphicGroup(graphene_core::GraphicGroupTable::default()), true)),
 			Some(NodeInput::value(TaggedValue::IVec2(artboard.location), false)),
 			Some(NodeInput::value(TaggedValue::IVec2(artboard.dimensions), false)),

editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs

@@ -310,7 +310,7 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
 						..Default::default()
 					}),
 					inputs: vec![
-						NodeInput::value(TaggedValue::ArtboardGroup(ArtboardGroup::EMPTY), true),
+						NodeInput::value(TaggedValue::ArtboardGroup(ArtboardGroup::default()), true),
 						NodeInput::value(TaggedValue::GraphicGroup(GraphicGroupTable::default()), true),
 						NodeInput::value(TaggedValue::IVec2(glam::IVec2::ZERO), false),
 						NodeInput::value(TaggedValue::IVec2(glam::IVec2::new(1920, 1080)), false),

editor/src/messages/tool/tool_messages/path_tool.rs

@@ -502,7 +502,7 @@ impl PathToolData {
 					});
 
 					// Make handles colinear if opposite handle is zero length
-					if opposite_handle_length.map_or(false, |l| l == 0.) {
+					if opposite_handle_length == Some(0.) {
 						shape_editor.convert_selected_manipulators_to_colinear_handles(responses, document);
 						return true;
 					}

node-graph/gcore/src/graphic_element.rs

@@ -350,8 +350,6 @@ pub struct ArtboardGroup {
 }
 
 impl ArtboardGroup {
-	pub const EMPTY: Self = Self { artboards: Vec::new() };
-
 	pub fn new() -> Self {
 		Default::default()
 	}

node-graph/gcore/src/graphic_element/renderer.rs

@@ -9,7 +9,7 @@ use crate::transform::{Footprint, Transform};
 use crate::uuid::{generate_uuid, NodeId};
 use crate::vector::style::{Fill, Stroke, ViewMode};
 use crate::vector::{PointId, VectorDataTable};
-use crate::{AlphaBlending, Artboard, ArtboardGroup, Color, GraphicElement, GraphicGroup, GraphicGroupTable, RasterFrame};
+use crate::{Artboard, ArtboardGroup, Color, GraphicElement, GraphicGroup, GraphicGroupTable, RasterFrame};
 
 use bezier_rs::Subpath;
 use dyn_any::DynAny;
@@ -978,7 +978,7 @@ impl GraphicElementRendered for RasterFrame {
 	fn render_to_vello(&self, scene: &mut Scene, transform: DAffine2, context: &mut RenderContext) {
 		use vello::peniko;
 
-		let mut render_stuff = |image: vello::peniko::Image, blend_mode: AlphaBlending| {
+		let mut render_stuff = |image: vello::peniko::Image, blend_mode: crate::AlphaBlending| {
 			let image_transform = transform * self.transform() * DAffine2::from_scale(1. / DVec2::new(image.width as f64, image.height as f64));
 			let layer = blend_mode != Default::default();
 

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

@@ -1698,7 +1698,7 @@ async fn color_overlay<F: 'n + Send, T: Adjust<Color>>(
 
 #[cfg(test)]
 mod test {
-	use crate::raster::image::ImageFrame;
+	use crate::raster::image::{ImageFrame, ImageFrameTable};
 	use crate::raster::{BlendMode, Image};
 	use crate::{Color, Node};
 	use std::pin::Pin;
@@ -1721,18 +1721,17 @@ mod test {
 			image: Image::new(1, 1, image_color),
 			..Default::default()
 		};
-		let expected = result.image.data[0].clone();
-		let image_frame_table = ImageFrameTable::new(image);
 
 		// 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;
+		let result = super::color_overlay((), &FutureWrapperNode(ImageFrameTable::new(image.clone())), overlay_color, BlendMode::Multiply, opacity).await;
+		let result = result.one_item();
 
 		// The output should just be the original green and alpha channels (as we multiply them by 1 and other channels by 0)
-		assert_eq!(expected, Color::from_rgbaf32_unchecked(0., image_color.g(), 0., image_color.a()));
+		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

@@ -1503,7 +1503,7 @@ mod test {
 		let mut vector_data = VectorData::from_subpath(source);
 		let transform = DAffine2::from_scale_angle_translation(DVec2::splat(10.), 1., DVec2::new(99., 77.));
 		vector_data.transform = transform;
-		let beveled = super::bevel(Footprint::default(), &FutureWrapperNode(vector_data), 5.).await;
+		let beveled = super::bevel(Footprint::default(), &FutureWrapperNode(VectorDataTable::new(vector_data)), 5.).await;
 		let beveled = beveled.one_item();
 
 		assert_eq!(beveled.point_domain.positions().len(), 4);

node-graph/gstd/src/gpu_nodes.rs

@@ -5,7 +5,9 @@ use graph_craft::document::*;
 use graph_craft::proto::*;
 use graphene_core::application_io::ApplicationIo;
 use graphene_core::raster::image::{ImageFrame, ImageFrameTable};
-use graphene_core::raster::*;
+use graphene_core::raster::BlendMode;
+use graphene_core::raster::Image;
+use graphene_core::raster::Pixel;
 use graphene_core::*;
 use wgpu_executor::{Bindgroup, PipelineLayout, Shader, ShaderIO, ShaderInput, WgpuExecutor, WgpuShaderInput};
 

node-graph/gstd/src/image_color_palette.rs

@@ -76,7 +76,10 @@ mod test {
 	use super::*;
 
 	use graph_craft::generic::FnNode;
-	use graphene_core::{raster::Image, value::CopiedNode, Node};
+	use graphene_core::raster::image::{ImageFrame, ImageFrameTable};
+	use graphene_core::raster::Image;
+	use graphene_core::value::CopiedNode;
+	use graphene_core::Node;
 
 	#[test]
 	fn test_image_color_palette() {