Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-12 22:32:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

od: refactor: readability of expected output

Browse source 
use multiple lines in source too and use unindent crate to fix spacing
This commit is contained in:
Wim Hueskes 2016-07-18 22:25:33 +02:00
parent 783daa5839
commit a900b42a1f
3 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Cargo.lock generated
View file

@ -90,6 +90,7 @@ dependencies = [
"tty 0.0.1", "tty 0.0.1",
"uname 0.0.1", "uname 0.0.1",
"unexpand 0.0.1", "unexpand 0.0.1",
"unindent 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"uniq 0.0.1", "uniq 0.0.1",
"unlink 0.0.1", "unlink 0.0.1",
"uptime 0.0.1", "uptime 0.0.1",
@ -1129,6 +1130,11 @@ name = "unicode-width"
version = "0.1.3" version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "unindent"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] [[package]]
name = "uniq" name = "uniq"
version = "0.0.1" version = "0.0.1"

1
Cargo.toml
View file

@ -203,6 +203,7 @@ libc = "*"
regex="*" regex="*"
rand="*" rand="*"
tempdir="*" tempdir="*"
unindent="*"
[[bin]] [[bin]]
name = "uutils" name = "uutils"

30
tests/test_od.rs
View file

@ -1,13 +1,20 @@
extern crate unindent;
use common::util::*; use common::util::*;
use std::path::Path; use std::path::Path;
use std::env; use std::env;
use std::io::Write; use std::io::Write;
use std::fs::File; use std::fs::File;
use std::fs::remove_file; use std::fs::remove_file;
use self::unindent::*;
// octal dump of 'abcdefghijklmnopqrstuvwxyz\n' // octal dump of 'abcdefghijklmnopqrstuvwxyz\n'
static ALPHA_OUT: &'static str = "0000000 061141 062143 063145 064147 065151 066153 067155 070157\n0000020 071161 072163 073165 074167 075171 000012 \n0000033\n"; static ALPHA_OUT: &'static str = "
0000000 061141 062143 063145 064147 065151 066153 067155 070157
0000020 071161 072163 073165 074167 075171 000012
0000033
";
// XXX We could do a better job of ensuring that we have a fresh temp dir to ourself, // XXX We could do a better job of ensuring that we have a fresh temp dir to ourself,
// not a general one ful of other proc's leftovers. // not a general one ful of other proc's leftovers.
@ -32,7 +39,7 @@ fn test_file() {
assert_empty_stderr!(result); assert_empty_stderr!(result);
assert!(result.success); assert!(result.success);
assert_eq!(result.stdout, ALPHA_OUT); assert_eq!(result.stdout, unindent(ALPHA_OUT));
let _ = remove_file(file); let _ = remove_file(file);
} }
@ -61,7 +68,7 @@ fn test_2files() {
assert_empty_stderr!(result); assert_empty_stderr!(result);
assert!(result.success); assert!(result.success);
assert_eq!(result.stdout, ALPHA_OUT); assert_eq!(result.stdout, unindent(ALPHA_OUT));
let _ = remove_file(file1); let _ = remove_file(file1);
let _ = remove_file(file2); let _ = remove_file(file2);
@ -88,7 +95,7 @@ fn test_from_stdin() {
assert_empty_stderr!(result); assert_empty_stderr!(result);
assert!(result.success); assert!(result.success);
assert_eq!(result.stdout, ALPHA_OUT); assert_eq!(result.stdout, unindent(ALPHA_OUT));
} }
@ -114,7 +121,7 @@ fn test_from_mixed() {
assert_empty_stderr!(result); assert_empty_stderr!(result);
assert!(result.success); assert!(result.success);
assert_eq!(result.stdout, ALPHA_OUT); assert_eq!(result.stdout, unindent(ALPHA_OUT));
} }
@ -126,7 +133,13 @@ fn test_multiple_formats() {
assert_empty_stderr!(result); assert_empty_stderr!(result);
assert!(result.success); assert!(result.success);
assert_eq!(result.stdout, "0000000 a b c d e f g h i j k l m n o p\n 141 142 143 144 145 146 147 150 151 152 153 154 155 156 157 160\n0000020 q r s t u v w x y z \\n \n 161 162 163 164 165 166 167 170 171 172 012 \n0000033\n"); assert_eq!(result.stdout, unindent("
0000000 a b c d e f g h i j k l m n o p
141 142 143 144 145 146 147 150 151 152 153 154 155 156 157 160
0000020 q r s t u v w x y z \\n
161 162 163 164 165 166 167 170 171 172 012
0000033
"));
} }
@ -142,7 +155,10 @@ fn test_dec() {
0xffu8,0x7fu8, 0xffu8,0x7fu8,
0x00u8,0x80u8, 0x00u8,0x80u8,
0x01u8,0x80u8,]; 0x01u8,0x80u8,];
let expected_output = "0000000 0 1 2 3 32767 -32768 -32767 \n0000016\n"; let expected_output = unindent("
0000000 0 1 2 3 32767 -32768 -32767
0000016
");
let result = new_ucmd!().arg("-i").run_piped_stdin(&input[..]); let result = new_ucmd!().arg("-i").run_piped_stdin(&input[..]);
assert_empty_stderr!(result); assert_empty_stderr!(result);