From 722348c453197506a2120b9356cb6e0a8708698e Mon Sep 17 00:00:00 2001 From: Abdul Khan Date: Wed, 3 Jun 2026 20:56:26 -0400 Subject: [PATCH] Address serialize helper review --- tests/rojo_test/serve_util.rs | 12 +----------- tests/tests/serve.rs | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/tests/rojo_test/serve_util.rs b/tests/rojo_test/serve_util.rs index 40274314..01781e9c 100644 --- a/tests/rojo_test/serve_util.rs +++ b/tests/rojo_test/serve_util.rs @@ -224,16 +224,6 @@ impl TestServeSession { } } - pub fn get_api_serialize( - &self, - ids: &[Ref], - session_id: SessionId, - ) -> Result { - let body = self.post_api_serialize(ids, session_id)?.bytes()?; - - Ok(deserialize_msgpack(&body).expect("Server returned malformed response")) - } - pub fn post_api_serialize( &self, ids: &[Ref], @@ -262,7 +252,7 @@ fn serialize_msgpack(value: T) -> Result, rmp_serde::encod Ok(serialized) } -fn deserialize_msgpack<'a, T: Deserialize<'a>>( +pub fn deserialize_msgpack<'a, T: Deserialize<'a>>( input: &'a [u8], ) -> Result { let mut deserializer = rmp_serde::Deserializer::new(input).with_human_readable(); diff --git a/tests/tests/serve.rs b/tests/tests/serve.rs index a51df864..7ea41ccd 100644 --- a/tests/tests/serve.rs +++ b/tests/tests/serve.rs @@ -7,10 +7,10 @@ use tempfile::tempdir; use crate::rojo_test::{ internable::InternAndRedact, - serve_util::{run_serve_test, serialize_to_xml_model}, + serve_util::{deserialize_msgpack, run_serve_test, serialize_to_xml_model}, }; -use librojo::web_api::SocketPacketType; +use librojo::web_api::{SerializeResponse, SocketPacketType}; #[test] fn empty() { @@ -647,9 +647,13 @@ fn meshpart_with_id() { .find(|(_, inst)| inst.class_name == "ObjectValue") .unwrap(); - let serialize_response = session - .get_api_serialize(&[*meshpart, *objectvalue], info.session_id) + let body = session + .post_api_serialize(&[*meshpart, *objectvalue], info.session_id) + .unwrap() + .bytes() .unwrap(); + let serialize_response: SerializeResponse = + deserialize_msgpack(&body).expect("Server returned malformed response"); // We don't assert a snapshot on the SerializeResponse because the model includes the // Refs from the DOM as names, which means it will obviously be different every time @@ -689,9 +693,13 @@ fn forced_parent() { read_response.intern_and_redact(&mut redactions, root_id) ); - let serialize_response = session - .get_api_serialize(&[root_id], info.session_id) + let body = session + .post_api_serialize(&[root_id], info.session_id) + .unwrap() + .bytes() .unwrap(); + let serialize_response: SerializeResponse = + deserialize_msgpack(&body).expect("Server returned malformed response"); assert_eq!(serialize_response.session_id, info.session_id);