extern/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2024-11-25 17:23:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert f8ed8aa7 (add test instrumentation to help understand failing tests) per PR feedback/owner request

Browse Source 
- reverts commit f8ed8aa74b
This commit is contained in:
Roy Ivy III 2020-06-01 16:50:24 -05:00 committed by David Peter
parent 99226b745f
commit 92e93682c6
1 changed files with 86 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

321
tests/integration_tests.rs
View File

@ -25,14 +25,9 @@ fn bat() -> Command {
#[test] #[test]
fn basic() { fn basic() {
let assert = bat() bat()
.arg("test.txt") .arg("test.txt")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
let stderr = String::from_utf8_lossy(&assert.get_output().stderr);
println!("stdout={:#?}", stdout);
println!("stderr={:#?}", stderr);
assert
.success() .success()
.stdout("hello world\n") .stdout("hello world\n")
.stderr(""); .stderr("");
@ -40,216 +35,168 @@ fn basic() {
#[test] #[test]
fn stdin() { fn stdin() {
let assert = bat() bat()
.write_stdin("foo\nbar\n") .write_stdin("foo\nbar\n")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout("foo\nbar\n"); .stdout("foo\nbar\n");
} }
#[test] #[test]
fn concatenate() { fn concatenate() {
let assert = bat() bat()
.arg("test.txt") .arg("test.txt")
.arg("test.txt") .arg("test.txt")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout("hello world\nhello world\n"); .stdout("hello world\nhello world\n");
} }
#[test] #[test]
fn concatenate_stdin() { fn concatenate_stdin() {
let assert = bat() bat()
.arg("test.txt") .arg("test.txt")
.arg("-") .arg("-")
.arg("test.txt") .arg("test.txt")
.write_stdin("stdin\n") .write_stdin("stdin\n")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout("hello world\nstdin\nhello world\n"); .stdout("hello world\nstdin\nhello world\n");
} }
#[test] #[test]
fn concatenate_empty_first() { fn concatenate_empty_first() {
let assert = bat() bat()
.arg("empty.txt") .arg("empty.txt")
.arg("test.txt") .arg("test.txt")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout("hello world\n"); .stdout("hello world\n");
} }
#[test] #[test]
fn concatenate_empty_last() { fn concatenate_empty_last() {
let assert = bat() bat()
.arg("test.txt") .arg("test.txt")
.arg("empty.txt") .arg("empty.txt")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout("hello world\n"); .stdout("hello world\n");
} }
#[test] #[test]
fn concatenate_empty_both() { fn concatenate_empty_both() {
let assert = bat() bat()
.arg("empty.txt") .arg("empty.txt")
.arg("empty.txt") .arg("empty.txt")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout(""); .stdout("");
} }
#[test] #[test]
fn concatenate_empty_between() { fn concatenate_empty_between() {
let assert = bat() bat()
.arg("test.txt") .arg("test.txt")
.arg("empty.txt") .arg("empty.txt")
.arg("test.txt") .arg("test.txt")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout("hello world\nhello world\n"); .stdout("hello world\nhello world\n");
} }
#[test] #[test]
fn concatenate_empty_first_and_last() { fn concatenate_empty_first_and_last() {
let assert = bat() bat()
.arg("empty.txt") .arg("empty.txt")
.arg("test.txt") .arg("test.txt")
.arg("empty.txt") .arg("empty.txt")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout("hello world\n"); .stdout("hello world\n");
} }
#[test] #[test]
fn concatenate_single_line() { fn concatenate_single_line() {
let assert = bat() bat()
.arg("single-line.txt") .arg("single-line.txt")
.arg("single-line.txt") .arg("single-line.txt")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout("Single LineSingle Line"); .stdout("Single LineSingle Line");
} }
#[test] #[test]
fn concatenate_single_line_empty() { fn concatenate_single_line_empty() {
let assert = bat() bat()
.arg("single-line.txt") .arg("single-line.txt")
.arg("empty.txt") .arg("empty.txt")
.arg("single-line.txt") .arg("single-line.txt")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout("Single LineSingle Line"); .stdout("Single LineSingle Line");
} }
#[test] #[test]
fn line_numbers() { fn line_numbers() {
let assert = bat() bat()
.arg("multiline.txt") .arg("multiline.txt")
.arg("--style=numbers") .arg("--style=numbers")
.arg("--decorations=always") .arg("--decorations=always")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout(" 1 line 1\n 2 line 2\n 3 line 3\n 4 line 4\n"); .stdout(" 1 line 1\n 2 line 2\n 3 line 3\n 4 line 4\n");
} }
#[test] #[test]
fn line_range_2_3() { fn line_range_2_3() {
let assert = bat() bat()
.arg("multiline.txt") .arg("multiline.txt")
.arg("--line-range=2:3") .arg("--line-range=2:3")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout("line 2\nline 3\n"); .stdout("line 2\nline 3\n");
} }
#[test] #[test]
fn line_range_first_two() { fn line_range_first_two() {
let assert = bat() bat()
.arg("multiline.txt") .arg("multiline.txt")
.arg("--line-range=:2") .arg("--line-range=:2")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout("line 1\nline 2\n"); .stdout("line 1\nline 2\n");
} }
#[test] #[test]
fn line_range_last_3() { fn line_range_last_3() {
let assert = bat() bat()
.arg("multiline.txt") .arg("multiline.txt")
.arg("--line-range=2:") .arg("--line-range=2:")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout("line 2\nline 3\nline 4\n"); .stdout("line 2\nline 3\nline 4\n");
} }
#[test] #[test]
fn line_range_multiple() { fn line_range_multiple() {
let assert = bat() bat()
.arg("multiline.txt") .arg("multiline.txt")
.arg("--line-range=1:2") .arg("--line-range=1:2")
.arg("--line-range=4:4") .arg("--line-range=4:4")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout("line 1\nline 2\nline 4\n"); .stdout("line 1\nline 2\nline 4\n");
} }
#[test] #[test]
fn tabs_numbers() { fn tabs_numbers() {
let assert = bat() bat()
.arg("tabs.txt") .arg("tabs.txt")
.arg("--tabs=4") .arg("--tabs=4")
.arg("--style=numbers") .arg("--style=numbers")
.arg("--decorations=always") .arg("--decorations=always")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout( .stdout(
" 1 1 2 3 4 " 1 1 2 3 4
@ -267,15 +214,12 @@ fn tabs_numbers() {
#[test] #[test]
fn tabs_passthrough_wrapped() { fn tabs_passthrough_wrapped() {
let assert = bat() bat()
.arg("tabs.txt") .arg("tabs.txt")
.arg("--tabs=0") .arg("--tabs=0")
.arg("--style=plain") .arg("--style=plain")
.arg("--decorations=always") .arg("--decorations=always")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout( .stdout(
" 1 2 3 4 " 1 2 3 4
@ -293,15 +237,12 @@ fn tabs_passthrough_wrapped() {
#[test] #[test]
fn tabs_4_wrapped() { fn tabs_4_wrapped() {
let assert = bat() bat()
.arg("tabs.txt") .arg("tabs.txt")
.arg("--tabs=4") .arg("--tabs=4")
.arg("--style=plain") .arg("--style=plain")
.arg("--decorations=always") .arg("--decorations=always")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout( .stdout(
" 1 2 3 4 " 1 2 3 4
@ -319,15 +260,12 @@ fn tabs_4_wrapped() {
#[test] #[test]
fn tabs_8_wrapped() { fn tabs_8_wrapped() {
let assert = bat() bat()
.arg("tabs.txt") .arg("tabs.txt")
.arg("--tabs=8") .arg("--tabs=8")
.arg("--style=plain") .arg("--style=plain")
.arg("--decorations=always") .arg("--decorations=always")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout( .stdout(
" 1 2 3 4 " 1 2 3 4
@ -345,15 +283,12 @@ fn tabs_8_wrapped() {
#[test] #[test]
fn tabs_passthrough() { fn tabs_passthrough() {
let assert = bat() bat()
.arg("tabs.txt") .arg("tabs.txt")
.arg("--tabs=0") .arg("--tabs=0")
.arg("--style=plain") .arg("--style=plain")
.arg("--decorations=always") .arg("--decorations=always")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout( .stdout(
" 1 2 3 4 " 1 2 3 4
@ -371,15 +306,12 @@ fn tabs_passthrough() {
#[test] #[test]
fn tabs_4() { fn tabs_4() {
let assert = bat() bat()
.arg("tabs.txt") .arg("tabs.txt")
.arg("--tabs=4") .arg("--tabs=4")
.arg("--style=plain") .arg("--style=plain")
.arg("--decorations=always") .arg("--decorations=always")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout( .stdout(
" 1 2 3 4 " 1 2 3 4
@ -397,15 +329,12 @@ fn tabs_4() {
#[test] #[test]
fn tabs_8() { fn tabs_8() {
let assert = bat() bat()
.arg("tabs.txt") .arg("tabs.txt")
.arg("--tabs=8") .arg("--tabs=8")
.arg("--style=plain") .arg("--style=plain")
.arg("--decorations=always") .arg("--decorations=always")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout( .stdout(
" 1 2 3 4 " 1 2 3 4
@ -433,83 +362,65 @@ fn fail_directory() {
#[test] #[test]
fn do_not_exit_directory() { fn do_not_exit_directory() {
let assert = bat() bat()
.arg("sub_directory") .arg("sub_directory")
.arg("test.txt") .arg("test.txt")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.stdout("hello world\n") .stdout("hello world\n")
.failure(); .failure();
} }
#[test] #[test]
fn pager_basic() { fn pager_basic() {
let assert = bat() bat()
.env("PAGER", "echo pager-output") .env("PAGER", "echo pager-output")
.arg("--paging=always") .arg("--paging=always")
.arg("test.txt") .arg("test.txt")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout(predicate::eq("pager-output\n").normalize()); .stdout(predicate::eq("pager-output\n").normalize());
} }
#[test] #[test]
fn pager_overwrite() { fn pager_overwrite() {
let assert = bat() bat()
.env("PAGER", "echo other-pager") .env("PAGER", "echo other-pager")
.env("BAT_PAGER", "echo pager-output") .env("BAT_PAGER", "echo pager-output")
.arg("--paging=always") .arg("--paging=always")
.arg("test.txt") .arg("test.txt")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout(predicate::eq("pager-output\n").normalize()); .stdout(predicate::eq("pager-output\n").normalize());
} }
#[test] #[test]
fn pager_disable() { fn pager_disable() {
let assert = bat() bat()
.env("PAGER", "echo other-pager") .env("PAGER", "echo other-pager")
.env("BAT_PAGER", "") .env("BAT_PAGER", "")
.arg("--paging=always") .arg("--paging=always")
.arg("test.txt") .arg("test.txt")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout(predicate::eq("hello world\n").normalize()); .stdout(predicate::eq("hello world\n").normalize());
} }
#[test] #[test]
fn config_location_test() { fn config_location_test() {
let assert = bat_with_config() bat_with_config()
.env("BAT_CONFIG_PATH", "bat.conf") .env("BAT_CONFIG_PATH", "bat.conf")
.arg("--config-file") .arg("--config-file")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout("bat.conf\n"); .stdout("bat.conf\n");
} }
#[test] #[test]
fn config_read_arguments_from_file() { fn config_read_arguments_from_file() {
let assert = bat_with_config() bat_with_config()
.env("BAT_CONFIG_PATH", "bat.conf") .env("BAT_CONFIG_PATH", "bat.conf")
.arg("test.txt") .arg("test.txt")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout(predicate::eq("dummy-pager-from-config\n").normalize()); .stdout(predicate::eq("dummy-pager-from-config\n").normalize());
} }
@ -517,28 +428,20 @@ fn config_read_arguments_from_file() {
#[test] #[test]
fn utf16() { fn utf16() {
// The output will be converted to UTF-8 with a leading UTF-8 BOM // The output will be converted to UTF-8 with a leading UTF-8 BOM
let assert = bat() bat()
.arg("--plain") .arg("--plain")
.arg("--decorations=always") .arg("--decorations=always")
.arg("test_UTF-16LE.txt") .arg("test_UTF-16LE.txt")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout(std::str::from_utf8(b"\xEF\xBB\xBFhello world\n").unwrap()); .stdout(std::str::from_utf8(b"\xEF\xBB\xBFhello world\n").unwrap());
} }
#[test] #[test]
fn can_print_file_named_cache() { fn can_print_file_named_cache() {
let assert = bat_with_config() bat_with_config()
.arg("cache") .arg("cache")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
let stderr = String::from_utf8_lossy(&assert.get_output().stderr);
println!("stdout={:#?}", stdout);
println!("stderr={:#?}", stderr);
assert
.success() .success()
.stdout("test\n") .stdout("test\n")
.stderr(""); .stderr("");
@ -546,15 +449,10 @@ fn can_print_file_named_cache() {
#[test] #[test]
fn can_print_file_named_cache_with_additional_argument() { fn can_print_file_named_cache_with_additional_argument() {
let assert = bat_with_config() bat_with_config()
.arg("cache") .arg("cache")
.arg("test.txt") .arg("test.txt")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
let stderr = String::from_utf8_lossy(&assert.get_output().stderr);
println!("stdout={:#?}", stdout);
println!("stderr={:#?}", stderr);
assert
.success() .success()
.stdout("test\nhello world\n") .stdout("test\nhello world\n")
.stderr(""); .stderr("");
@ -562,14 +460,9 @@ fn can_print_file_named_cache_with_additional_argument() {
#[test] #[test]
fn can_print_file_starting_with_cache() { fn can_print_file_starting_with_cache() {
let assert = bat_with_config() bat_with_config()
.arg("cache.c") .arg("cache.c")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
let stderr = String::from_utf8_lossy(&assert.get_output().stderr);
println!("stdout={:#?}", stdout);
println!("stderr={:#?}", stderr);
assert
.success() .success()
.stdout("test\n") .stdout("test\n")
.stderr(""); .stderr("");
@ -582,15 +475,12 @@ fn does_not_print_unwanted_file_named_cache() {
#[test] #[test]
fn unicode_wrap() { fn unicode_wrap() {
let assert = bat_with_config() bat_with_config()
.arg("unicode-wrap.txt") .arg("unicode-wrap.txt")
.arg("--style=numbers,snip") .arg("--style=numbers,snip")
.arg("--decorations=always") .arg("--decorations=always")
.arg("--terminal-width=40") .arg("--terminal-width=40")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout( .stdout(
" 1 ビタミンA ビタミンD ビタミンE ビ " 1 ビタミンA ビタミンD ビタミンE ビ
@ -627,17 +517,14 @@ fn unicode_wrap() {
#[test] #[test]
fn snip() { fn snip() {
let assert = bat() bat()
.arg("multiline.txt") .arg("multiline.txt")
.arg("--style=numbers,snip") .arg("--style=numbers,snip")
.arg("--decorations=always") .arg("--decorations=always")
.arg("--line-range=1:2") .arg("--line-range=1:2")
.arg("--line-range=4:") .arg("--line-range=4:")
.arg("--terminal-width=80") .arg("--terminal-width=80")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout( .stdout(
" 1 line 1 " 1 line 1
@ -650,33 +537,25 @@ fn snip() {
#[test] #[test]
fn empty_file_leads_to_empty_output_with_grid_enabled() { fn empty_file_leads_to_empty_output_with_grid_enabled() {
let assert = bat() bat()
.arg("empty.txt") .arg("empty.txt")
.arg("--style=grid") .arg("--style=grid")
.arg("--decorations=always") .arg("--decorations=always")
.arg("--terminal-width=80") .arg("--terminal-width=80")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout(""); .stdout("");
} }
#[test] #[test]
fn filename_basic() { fn filename_basic() {
let assert = bat() bat()
.arg("test.txt") .arg("test.txt")
.arg("--decorations=always") .arg("--decorations=always")
.arg("--style=header") .arg("--style=header")
.arg("-r=0:0") .arg("-r=0:0")
.arg("--file-name=foo") .arg("--file-name=foo")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
let stderr = String::from_utf8_lossy(&assert.get_output().stderr);
println!("stdout={:#?}", stdout);
println!("stderr={:#?}", stderr);
assert
.success() .success()
.stdout("File: foo\n") .stdout("File: foo\n")
.stderr(""); .stderr("");
@ -684,18 +563,13 @@ fn filename_basic() {
#[test] #[test]
fn filename_binary() { fn filename_binary() {
let assert = bat() bat()
.arg("test.binary") .arg("test.binary")
.arg("--decorations=always") .arg("--decorations=always")
.arg("--style=header") .arg("--style=header")
.arg("-r=0:0") .arg("-r=0:0")
.arg("--file-name=foo") .arg("--file-name=foo")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
let stderr = String::from_utf8_lossy(&assert.get_output().stderr);
println!("stdout={:#?}", stdout);
println!("stderr={:#?}", stderr);
assert
.success() .success()
.stdout("File: foo <BINARY>\n") .stdout("File: foo <BINARY>\n")
.stderr(""); .stderr("");
@ -703,19 +577,14 @@ fn filename_binary() {
#[test] #[test]
fn filename_stdin() { fn filename_stdin() {
let assert = bat() bat()
.arg("--decorations=always") .arg("--decorations=always")
.arg("--style=header") .arg("--style=header")
.arg("-r=0:0") .arg("-r=0:0")
.arg("-") .arg("-")
.write_stdin("stdin\n") .write_stdin("stdin\n")
.arg("--file-name=foo") .arg("--file-name=foo")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
let stderr = String::from_utf8_lossy(&assert.get_output().stderr);
println!("stdout={:#?}", stdout);
println!("stderr={:#?}", stderr);
assert
.success() .success()
.stdout("File: foo\n") .stdout("File: foo\n")
.stderr(""); .stderr("");
@ -724,17 +593,12 @@ fn filename_stdin() {
#[test] #[test]
fn filename_stdin_binary() { fn filename_stdin_binary() {
let vec = vec![0; 1]; let vec = vec![0; 1];
let assert = bat_with_config() bat_with_config()
.arg("--decorations=always") .arg("--decorations=always")
.arg("--style=header") .arg("--style=header")
.write_stdin(vec) .write_stdin(vec)
.arg("--file-name=foo") .arg("--file-name=foo")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
let stderr = String::from_utf8_lossy(&assert.get_output().stderr);
println!("stdout={:#?}", stdout);
println!("stderr={:#?}", stderr);
assert
.success() .success()
.stdout("File: foo <BINARY>\n") .stdout("File: foo <BINARY>\n")
.stderr(""); .stderr("");
@ -742,7 +606,7 @@ fn filename_stdin_binary() {
#[test] #[test]
fn filename_multiple_ok() { fn filename_multiple_ok() {
let assert = bat() bat()
.arg("--decorations=always") .arg("--decorations=always")
.arg("--style=header") .arg("--style=header")
.arg("-r=0:0") .arg("-r=0:0")
@ -750,12 +614,7 @@ fn filename_multiple_ok() {
.arg("--file-name=foo") .arg("--file-name=foo")
.arg("single-line.txt") .arg("single-line.txt")
.arg("--file-name=bar") .arg("--file-name=bar")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
let stderr = String::from_utf8_lossy(&assert.get_output().stderr);
println!("stdout={:#?}", stdout);
println!("stderr={:#?}", stderr);
assert
.success() .success()
.stdout("File: foo\n\nFile: bar\n") .stdout("File: foo\n\nFile: bar\n")
.stderr(""); .stderr("");
@ -776,17 +635,12 @@ fn filename_multiple_err() {
#[test] #[test]
fn header_padding() { fn header_padding() {
let assert = bat() bat()
.arg("--decorations=always") .arg("--decorations=always")
.arg("--style=header") .arg("--style=header")
.arg("test.txt") .arg("test.txt")
.arg("single-line.txt") .arg("single-line.txt")
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
let stderr = String::from_utf8_lossy(&assert.get_output().stderr);
println!("stdout={:#?}", stdout);
println!("stderr={:#?}", stderr);
assert
.stdout("File: test.txt\nhello world\n\nFile: single-line.txt\nSingle Line\n") .stdout("File: test.txt\nhello world\n\nFile: single-line.txt\nSingle Line\n")
.stderr(""); .stderr("");
} }
@ -810,12 +664,9 @@ fn file_with_invalid_utf8_filename() {
writeln!(file, "dummy content").expect("can write to file"); writeln!(file, "dummy content").expect("can write to file");
} }
let assert = bat() bat()
.arg(file_path.as_os_str()) .arg(file_path.as_os_str())
.assert(); .assert()
let stdout = String::from_utf8_lossy(&assert.get_output().stdout);
println!("stdout={:#?}", stdout);
assert
.success() .success()
.stdout("dummy content\n"); .stdout("dummy content\n");
} }