From feebf8c5b0b8538ea9214c151394998ca7b2fb2b Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Fri, 6 Dec 2019 15:26:35 -0800 Subject: [PATCH] Update the tests. --- .../wasi-common/src/sandboxed_tty_writer.rs | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/crates/wasi-common/src/sandboxed_tty_writer.rs b/crates/wasi-common/src/sandboxed_tty_writer.rs index cf75a8554bbf..77cc2221e0c5 100644 --- a/crates/wasi-common/src/sandboxed_tty_writer.rs +++ b/crates/wasi-common/src/sandboxed_tty_writer.rs @@ -135,14 +135,14 @@ mod tests { #[test] fn basic() -> Result<()> { - let mut safe = SandboxedTTYWriter::new(Vec::new()); + let mut buffer = Vec::new(); + let mut safe = SandboxedTTYWriter::new(&mut buffer); safe.write_str("a\0b\u{0080}")?; safe.write_char('\u{0007}')?; safe.write(&[0x80])?; safe.write(&[0xed, 0xa0, 0x80, 0xff, 0xfe])?; - let output = safe.into_inner_writer(); assert_eq!( - output, + buffer, "a\u{2400}b\u{FFFD}\u{2407}\u{FFFD}\u{FFFD}\u{FFFD}\u{FFFD}\u{FFFD}\u{FFFD}".as_bytes() ); Ok(()) @@ -152,25 +152,25 @@ mod tests { fn how_many_replacements() -> Result<()> { // See https://hsivonen.fi/broken-utf-8/ for background. - let mut safe = SandboxedTTYWriter::new(Vec::new()); + let mut buffer = Vec::new(); + let mut safe = SandboxedTTYWriter::new(&mut buffer); safe.write(&[0x80, 0x80, 0x80, 0x80])?; - let output = safe.into_inner_writer(); - assert_eq!(output, "\u{FFFD}\u{FFFD}\u{FFFD}\u{FFFD}".as_bytes()); + assert_eq!(buffer, "\u{FFFD}\u{FFFD}\u{FFFD}\u{FFFD}".as_bytes()); - let mut safe = SandboxedTTYWriter::new(Vec::new()); + let mut buffer = Vec::new(); + let mut safe = SandboxedTTYWriter::new(&mut buffer); safe.write(&[0xF0, 0x80, 0x80, 0x41])?; - let output = safe.into_inner_writer(); - assert_eq!(output, "\u{FFFD}\u{FFFD}\u{FFFD}A".as_bytes()); + assert_eq!(buffer, "\u{FFFD}\u{FFFD}\u{FFFD}A".as_bytes()); - let mut safe = SandboxedTTYWriter::new(Vec::new()); + let mut buffer = Vec::new(); + let mut safe = SandboxedTTYWriter::new(&mut buffer); safe.write(&[0xF0, 0x80, 0x80])?; - let output = safe.into_inner_writer(); - assert_eq!(output, "\u{FFFD}\u{FFFD}\u{FFFD}".as_bytes()); + assert_eq!(buffer, "\u{FFFD}\u{FFFD}\u{FFFD}".as_bytes()); - let mut safe = SandboxedTTYWriter::new(Vec::new()); + let mut buffer = Vec::new(); + let mut safe = SandboxedTTYWriter::new(&mut buffer); safe.write(&[0xF4, 0x80, 0x80, 0xC0])?; - let output = safe.into_inner_writer(); - assert_eq!(output, "\u{FFFD}\u{FFFD}".as_bytes()); + assert_eq!(buffer, "\u{FFFD}\u{FFFD}".as_bytes()); Ok(()) }