From c2dbd3e2e67c57ec38454ba99976495c182d8601 Mon Sep 17 00:00:00 2001 From: Lizzy Fleckenstein Date: Sun, 12 Feb 2023 18:10:55 +0100 Subject: [PATCH] Tweak random tests --- Cargo.toml | 3 +-- tests/random.rs | 12 +++++++++--- tests/reserialize/.gitignore | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7b8e51d..af76262 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ serde = ["dep:serde", "dep:serde_arrays", "enumset/serde"] server = [] [dependencies] -mt_ser = { path = "../mt_ser" } +mt_ser = { git = "https://github.com/minetest-rust/mt_ser" } enumset = { git = "https://github.com/Lymia/enumset" } generate-random = { git = "https://github.com/minetest-rust/generate-random", features = ["enumset"], optional = true } rand = { version = "0.8.5", optional = true } @@ -20,7 +20,6 @@ serde_arrays = { version = "0.1.0", optional = true } [dev-dependencies] libtest-mimic = "0.6.0" -serde_json = "1.0.93" [[test]] name = "random" diff --git a/tests/random.rs b/tests/random.rs index 4d2ad42..a9d1609 100644 --- a/tests/random.rs +++ b/tests/random.rs @@ -1,4 +1,4 @@ -use libtest_mimic::{Arguments, Failed, Trial}; +use libtest_mimic::{Arguments, Trial}; use mt_net::{generate_random::GenerateRandomVariant, rand, ToCltPkt, ToSrvPkt}; use mt_ser::{DefCfg, MtDeserialize, MtSerialize}; @@ -21,14 +21,20 @@ where .map_err(|e| format!("serialize error: {e}\ninput: {input:?}"))?; let mut reader = std::io::Cursor::new(writer); - let output = T::mt_deserialize::(&mut reader) - .map_err(|e| format!("deserialize error: {e}\ninput: {input:?}"))?; + let output = T::mt_deserialize::(&mut reader).map_err(|e| { + format!( + "deserialize error: {e}\ninput: {input:?}\npayload: {:?}", + reader.get_ref() + ) + })?; if input != output { return Err(format!( "output did not match input\n\ input: {input:?}\n\ + payload: {:?}\n\ output: {output:?}", + reader.get_ref(), ) .into()); } diff --git a/tests/reserialize/.gitignore b/tests/reserialize/.gitignore index 49a0751..5d5b471 100644 --- a/tests/reserialize/.gitignore +++ b/tests/reserialize/.gitignore @@ -1 +1 @@ -validate +reserialize -- 2.44.0