Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ log = "0.4"

[dev-dependencies]
rstest = "0.18.2"
wireframe_testing = { path = "./wireframe_testing" }

[lints.clippy]
pedantic = "warn"
25 changes: 8 additions & 17 deletions tests/metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@ use std::sync::{
atomic::{AtomicUsize, Ordering},
};

use bytes::BytesMut;
use wireframe::{
app::{Envelope, WireframeApp},
frame::{FrameMetadata, FrameProcessor, LengthPrefixedProcessor},
frame::{FrameMetadata, LengthPrefixedProcessor},
serializer::{BincodeSerializer, Serializer},
};

mod util;
use util::{TestSerializer, run_app_with_frame};
use wireframe_testing::{TestSerializer, drive_with_bincode};

fn mock_wireframe_app_with_serializer<S>(serializer: S) -> WireframeApp<S>
where
Expand Down Expand Up @@ -60,13 +57,10 @@ async fn metadata_parser_invoked_before_deserialize() {
let app = mock_wireframe_app_with_serializer(serializer);

let env = Envelope::new(1, vec![42]);
let bytes = BincodeSerializer.serialize(&env).unwrap();
let mut framed = BytesMut::new();
LengthPrefixedProcessor::default()
.encode(&bytes, &mut framed)
.unwrap();

let out = run_app_with_frame(app, framed.to_vec()).await.unwrap();
let out = drive_with_bincode(app, env)
.await
.expect("drive_with_bincode failed");
assert!(!out.is_empty());
assert_eq!(counter.load(Ordering::SeqCst), 1);
}
Expand Down Expand Up @@ -108,13 +102,10 @@ async fn falls_back_to_deserialize_after_parse_error() {
let app = mock_wireframe_app_with_serializer(serializer);

let env = Envelope::new(1, vec![7]);
let bytes = BincodeSerializer.serialize(&env).unwrap();
let mut framed = BytesMut::new();
LengthPrefixedProcessor::default()
.encode(&bytes, &mut framed)
.unwrap();

let out = run_app_with_frame(app, framed.to_vec()).await.unwrap();
let out = drive_with_bincode(app, env)
.await
.expect("drive_with_bincode failed");
assert!(!out.is_empty());
assert_eq!(parse_calls.load(Ordering::SeqCst), 1);
assert_eq!(deser_calls.load(Ordering::SeqCst), 1);
Expand Down
17 changes: 7 additions & 10 deletions tests/routes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ use wireframe::{
message::Message,
serializer::BincodeSerializer,
};

mod util;
use util::{run_app_with_frame, run_app_with_frames};
use wireframe_testing::{drive_with_bincode, drive_with_frames};

#[derive(bincode::Encode, bincode::BorrowDecode, PartialEq, Debug)]
struct TestEnvelope {
Expand Down Expand Up @@ -57,13 +55,10 @@ async fn handler_receives_message_and_echoes_response() {
id: 1,
msg: msg_bytes,
};
let env_bytes = BincodeSerializer.serialize(&env).unwrap();
let mut framed = BytesMut::new();
LengthPrefixedProcessor::default()
.encode(&env_bytes, &mut framed)
.unwrap();

let out = run_app_with_frame(app, framed.to_vec()).await.unwrap();
let out = drive_with_bincode(app, env)
.await
.expect("drive_with_bincode failed");

let mut buf = BytesMut::from(&out[..]);
let frame = LengthPrefixedProcessor::default()
Expand Down Expand Up @@ -105,7 +100,9 @@ async fn multiple_frames_processed_in_sequence() {
})
.collect();

let out = run_app_with_frames(app, frames).await.unwrap();
let out = drive_with_frames(app, frames)
.await
.expect("drive_with_frames failed");

let mut buf = BytesMut::from(&out[..]);
let first = LengthPrefixedProcessor::default()
Expand Down
132 changes: 0 additions & 132 deletions tests/util.rs

This file was deleted.

13 changes: 13 additions & 0 deletions wireframe_testing/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[package]
name = "wireframe_testing"
version = "0.1.0"
edition = "2024"

[dependencies]
tokio = { version = "1", features = ["macros", "rt", "io-util"] }
wireframe = { path = ".." }
bincode = "^2.0"
bytes = "^1.0"

[dev-dependencies]
rstest = "0.18.2"
Loading