From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 17 Apr 2021 11:16:16 +0000 (+0100)
Subject: packetframe: Provide read_all
X-Git-Tag: otter-0.6.0~568
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=63c644719fae1d524b3a54789407b85a62c572ba;p=otter.git

packetframe: Provide read_all

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/packetframe.rs b/src/packetframe.rs
index ba1f7086..f64960f7 100644
--- a/src/packetframe.rs
+++ b/src/packetframe.rs
@@ -340,6 +340,12 @@ fn write_test(){
     assert_eq!(r.kind(), ErrorKind::Other);
     assert!(r.into_inner().unwrap().is::<SenderError>());
   };
+  let expect_good = |rd: &mut FrameReader<_>, expected: &[u8]| {
+    let mut buf = vec![];
+    let mut frame = rd.new_frame().unwrap();
+    frame.read_to_end(&mut buf).unwrap();
+    assert_eq!(&*buf ,expected);
+  }; 
 
   let mut rd = FrameReader::new(&*msg.buf);
   let mut buf = [0u8;10];
@@ -355,4 +361,12 @@ fn write_test(){
     let mut _frame = rd.new_frame().unwrap();
   }
   expect_boom(&mut rd);
+
+  let read_all = || {
+    let mut rd = FrameReader::new(&*msg.buf);
+    expect_good(&mut rd, b"hello");
+    expect_boom(&mut rd);
+    expect_good(&mut rd, b"longer!");
+  };
+  read_all();
 }