From 41a16725b6466f80d120746fee116bc5e2edb723 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 18 Apr 2021 12:58:12 +0100 Subject: [PATCH] packetframe: Tests: Fold read_all into lumpreader loop Just code motion and removal of an indiredtion. Signed-off-by: Ian Jackson --- src/packetframe.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/packetframe.rs b/src/packetframe.rs index 7fd71717..0bbf4dad 100644 --- a/src/packetframe.rs +++ b/src/packetframe.rs @@ -482,13 +482,6 @@ fn write_test(){ let frame = rd.new_frame().unwrap(); assert!(frame.is_none()); let frame = rd.new_frame().unwrap(); assert!(frame.is_none()); } - let read_all = |input: &mut dyn Read| { - let mut rd = FrameReader::new_unbuf(input); - expect_good(&mut rd, b"hello"); - expect_boom(&mut rd); - expect_good(&mut rd, b"longer!"); - expect_good_eof(&mut rd); - }; // try lumpy reads (ie, short reads) at every plausible boundary size // this approach is not very principled but ought to test every boundary @@ -517,8 +510,12 @@ fn write_test(){ } dbgc!(lumpsize); - let mut lr = LumpReader::new(lumpsize, &*msg.buf); - read_all(&mut lr); + let lr = LumpReader::new(lumpsize, &*msg.buf); + let mut rd = FrameReader::new_unbuf(lr); + expect_good(&mut rd, b"hello"); + expect_boom(&mut rd); + expect_good(&mut rd, b"longer!"); + expect_good_eof(&mut rd); } // Unexpected EOF mid-chunk-header -- 2.30.2