git.iko.soy/bat
on master help sign in
Add simple integration tests
commit1891e194b5ee958450678b6ac739711ba57fae10 authorsharkdp <davidpeter@web.de> dateWed 10 Oct 2018, 22:56 (8 years ago) parentd2d01b9
8 files changed+215−43
compare with master
unifiedsplit
Cargo.lock+64 Cargo.toml+1 tests/examples/multiline.txt+4 tests/examples/sub_directory/dummy.txt tests/examples/test.txt+1 tests/integration_tests.rs+104 tests/snapshot_tests.rs+41 tests/tests.rs−43
Cargo.lock+64
@@ -22,6 +22,17 @@ dependencies = [
2222 "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
2323]
2424
25+[[package]]
26+name = "assert_cmd"
27+version = "0.10.1"
28+source = "registry+https://github.com/rust-lang/crates.io-index"
29+dependencies = [
30+ "escargot 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
31+ "predicates 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
32+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
33+ "predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
34+]
35+
2536[[package]]
2637name = "atty"
2738version = "0.2.11"
@@ -47,6 +58,7 @@ version = "0.7.1"
4758dependencies = [
4859 "ansi_colours 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
4960 "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
61+ "assert_cmd 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
5062 "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
5163 "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
5264 "console 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -148,6 +160,11 @@ dependencies = [
148160 "memchr 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
149161]
150162
163+[[package]]
164+name = "difference"
165+version = "2.0.0"
166+source = "registry+https://github.com/rust-lang/crates.io-index"
167+
151168[[package]]
152169name = "directories"
153170version = "1.0.2"
@@ -219,6 +236,15 @@ name = "error-chain"
219236version = "0.12.0"
220237source = "registry+https://github.com/rust-lang/crates.io-index"
221238
239+[[package]]
240+name = "escargot"
241+version = "0.3.1"
242+source = "registry+https://github.com/rust-lang/crates.io-index"
243+dependencies = [
244+ "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
245+ "serde_json 1.0.32 (registry+https://github.com/rust-lang/crates.io-index)",
246+]
247+
222248[[package]]
223249name = "flate2"
224250version = "1.0.3"
@@ -459,6 +485,29 @@ dependencies = [
459485 "xml-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
460486]
461487
488+[[package]]
489+name = "predicates"
490+version = "1.0.0"
491+source = "registry+https://github.com/rust-lang/crates.io-index"
492+dependencies = [
493+ "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
494+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
495+]
496+
497+[[package]]
498+name = "predicates-core"
499+version = "1.0.0"
500+source = "registry+https://github.com/rust-lang/crates.io-index"
501+
502+[[package]]
503+name = "predicates-tree"
504+version = "1.0.0"
505+source = "registry+https://github.com/rust-lang/crates.io-index"
506+dependencies = [
507+ "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
508+ "treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
509+]
510+
462511[[package]]
463512name = "proc-macro2"
464513version = "0.4.20"
@@ -604,6 +653,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
604653name = "serde"
605654version = "1.0.79"
606655source = "registry+https://github.com/rust-lang/crates.io-index"
656+dependencies = [
657+ "serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
658+]
607659
608660[[package]]
609661name = "serde_derive"
@@ -728,6 +780,11 @@ dependencies = [
728780 "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
729781]
730782
783+[[package]]
784+name = "treeline"
785+version = "0.1.0"
786+source = "registry+https://github.com/rust-lang/crates.io-index"
787+
731788[[package]]
732789name = "ucd-util"
733790version = "0.1.1"
@@ -874,6 +931,7 @@ dependencies = [
874931"checksum aho-corasick 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "68f56c7353e5a9547cbd76ed90f7bb5ffc3ba09d4ea9bd1d8c06c8b1142eeb5a"
875932"checksum ansi_colours 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d0f302a81afc6a7f4350c04f0ba7cfab529cc009bca3324b3fb5764e6add8b6"
876933"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
934+"checksum assert_cmd 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d5db841dcfb4f172f34ec968f71c4a88e69f5421fb33e0daac6bfe4372317526"
877935"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
878936"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
879937"checksum bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9f2fb9e29e72fd6bc12071533d5dc7664cb01480c59406f656d7ac25c7bd8ff7"
@@ -886,6 +944,7 @@ dependencies = [
886944"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
887945"checksum console 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd48adf136733979b49e15bc3b4c43cc0d3c85ece7bd08e6daa414c6fcb13e6"
888946"checksum content_inspector 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f15b971ded7c58a746a1c7441c358800337e08f869f75ddd825672984563fafc"
947+"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
889948"checksum directories 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "72d337a64190607d4fcca2cb78982c5dd57f4916e19696b48a575fa746b6cb0f"
890949"checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec"
891950"checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91"
@@ -895,6 +954,7 @@ dependencies = [
895954"checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18"
896955"checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569"
897956"checksum error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07e791d3be96241c77c43846b665ef1384606da2cd2a48730abe606a12906e02"
957+"checksum escargot 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "19db1f7e74438642a5018cdf263bb1325b2e792f02dd0a3ca6d6c0f0d7b1d5a5"
898958"checksum flate2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4af030962d89d62aa52cd9492083b1cd9b2d1a77764878102a6c0f86b4d5444d"
899959"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
900960"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
@@ -925,6 +985,9 @@ dependencies = [
925985"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
926986"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"
927987"checksum plist 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c7316832d9ac5da02786bdc89a3faf0ca07070212b388766e969078fd593edc"
988+"checksum predicates 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa984b7cd021a0bf5315bcce4c4ae61d2a535db2a8d288fc7578638690a7b7c3"
989+"checksum predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178"
990+"checksum predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124"
928991"checksum proc-macro2 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)" = "3d7b7eaaa90b4a90a932a9ea6666c95a389e424eff347f0f793979289429feee"
929992"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
930993"checksum quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dd636425967c33af890042c483632d33fa7a18f19ad1d7ea72e8998c6ef8dea5"
@@ -958,6 +1021,7 @@ dependencies = [
9581021"checksum termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625"
9591022"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
9601023"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
1024+"checksum treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41"
9611025"checksum ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d"
9621026"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
9631027"checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
Cargo.toml+1
@@ -47,6 +47,7 @@ features = []
4747
4848[dev-dependencies]
4949tempdir = "0.3"
50+assert_cmd = "0.10.1"
5051
5152[build-dependencies]
5253clap = "2.32"
tests/examples/multiline.txtnew file+4
@@ -0,0 +1,4 @@
1+line 1
2+line 2
3+line 3
4+line 4
tests/examples/sub_directory/dummy.txtnew file

No changes to the content.

tests/examples/test.txtnew file+1
@@ -0,0 +1 @@
1+hello world
tests/integration_tests.rsnew file+104
@@ -0,0 +1,104 @@
1+extern crate assert_cmd;
2+
3+use assert_cmd::prelude::*;
4+use std::process::Command;
5+
6+fn bat() -> Command {
7+ let mut cmd = Command::main_binary().unwrap();
8+ cmd.current_dir("tests/examples");
9+ cmd
10+}
11+
12+#[test]
13+fn basic() {
14+ bat()
15+ .arg("test.txt")
16+ .assert()
17+ .success()
18+ .stdout("hello world\n")
19+ .stderr("");
20+}
21+
22+#[test]
23+fn stdin() {
24+ bat()
25+ .with_stdin()
26+ .buffer("foo\nbar\n")
27+ .assert()
28+ .success()
29+ .stdout("foo\nbar\n");
30+}
31+
32+#[test]
33+fn concatenate() {
34+ bat()
35+ .arg("test.txt")
36+ .arg("test.txt")
37+ .assert()
38+ .success()
39+ .stdout("hello world\nhello world\n");
40+}
41+
42+#[test]
43+fn concatenate_stdin() {
44+ bat()
45+ .arg("test.txt")
46+ .arg("-")
47+ .arg("test.txt")
48+ .with_stdin()
49+ .buffer("stdin\n")
50+ .assert()
51+ .success()
52+ .stdout("hello world\nstdin\nhello world\n");
53+}
54+
55+#[test]
56+fn line_numbers() {
57+ bat()
58+ .arg("multiline.txt")
59+ .arg("--style=numbers")
60+ .arg("--decorations=always")
61+ .assert()
62+ .success()
63+ .stdout(" 1 line 1\n 2 line 2\n 3 line 3\n 4 line 4\n");
64+}
65+
66+#[test]
67+fn line_range_2_3() {
68+ bat()
69+ .arg("multiline.txt")
70+ .arg("--line-range=2:3")
71+ .assert()
72+ .success()
73+ .stdout("line 2\nline 3\n");
74+}
75+
76+#[test]
77+fn line_range_first_two() {
78+ bat()
79+ .arg("multiline.txt")
80+ .arg("--line-range=:2")
81+ .assert()
82+ .success()
83+ .stdout("line 1\nline 2\n");
84+}
85+
86+#[test]
87+fn line_range_last_3() {
88+ bat()
89+ .arg("multiline.txt")
90+ .arg("--line-range=2:")
91+ .assert()
92+ .success()
93+ .stdout("line 2\nline 3\nline 4\n");
94+}
95+
96+#[test]
97+fn fail_non_existing() {
98+ bat().arg("non-existing-file").assert().failure();
99+}
100+
101+#[test]
102+fn fail_directory() {
103+ bat().arg("sub_directory").assert().failure();
104+}
tests/snapshot_tests.rsnew file+41
@@ -0,0 +1,41 @@
1+mod tester;
2+
3+use tester::BatTester;
4+
5+macro_rules! snapshot_tests {
6+ ($($test_name: ident: $style: expr => [wrap: $wrap:expr, tabs: $tabs:expr],)*) => {
7+ $(
8+ #[test]
9+ fn $test_name() {
10+ let bat_tester = BatTester::new();
11+ bat_tester.test_snapshot(stringify!($test_name), $style, $tabs, $wrap);
12+ }
13+ )*
14+ };
15+}
16+
17+snapshot_tests! {
18+ changes: "changes" => [wrap: false, tabs: 8],
19+ grid: "grid" => [wrap: false, tabs: 8],
20+ header: "header" => [wrap: false, tabs: 8],
21+ numbers: "numbers" => [wrap: false, tabs: 8],
22+ changes_grid: "changes,grid" => [wrap: false, tabs: 8],
23+ changes_header: "changes,header" => [wrap: false, tabs: 8],
24+ changes_numbers: "changes,numbers" => [wrap: false, tabs: 8],
25+ grid_header: "grid,header" => [wrap: false, tabs: 8],
26+ grid_numbers: "grid,numbers" => [wrap: false, tabs: 8],
27+ header_numbers: "header,numbers" => [wrap: false, tabs: 8],
28+ changes_grid_header: "changes,grid,header" => [wrap: false, tabs: 8],
29+ changes_grid_numbers: "changes,grid,numbers" => [wrap: false, tabs: 8],
30+ changes_header_numbers: "changes,header,numbers" => [wrap: false, tabs: 8],
31+ grid_header_numbers: "grid,header,numbers" => [wrap: false, tabs: 8],
32+ changes_grid_header_numbers: "changes,grid,header,numbers" => [wrap: false, tabs: 8],
33+ full: "full" => [wrap: false, tabs: 8],
34+ plain: "plain" => [wrap: false, tabs: 0],
35+ tabs_passthrough_wrapped: "full" => [wrap: true, tabs: 0],
36+ tabs_4_wrapped: "full" => [wrap: true, tabs: 4],
37+ tabs_8_wrapped: "full" => [wrap: true, tabs: 8],
38+ tabs_passthrough: "full" => [wrap: false, tabs: 0],
39+ tabs_4: "full" => [wrap: false, tabs: 4],
40+ tabs_8: "full" => [wrap: false, tabs: 8],
41+}
tests/tests.rsdeleted−43
@@ -1,43 +0,0 @@
1−mod tester;
2−
3−mod snapshot {
4− use tester::BatTester;
5−
6− macro_rules! snapshot_tests {
7− ($($test_name: ident: $style: expr => [wrap: $wrap:expr, tabs: $tabs:expr],)*) => {
8− $(
9− #[test]
10− fn $test_name() {
11− let bat_tester = BatTester::new();
12− bat_tester.test_snapshot(stringify!($test_name), $style, $tabs, $wrap);
13− }
14− )*
15− };
16− }
17−
18− snapshot_tests! {
19− changes: "changes" => [wrap: false, tabs: 8],
20− grid: "grid" => [wrap: false, tabs: 8],
21− header: "header" => [wrap: false, tabs: 8],
22− numbers: "numbers" => [wrap: false, tabs: 8],
23− changes_grid: "changes,grid" => [wrap: false, tabs: 8],
24− changes_header: "changes,header" => [wrap: false, tabs: 8],
25− changes_numbers: "changes,numbers" => [wrap: false, tabs: 8],
26− grid_header: "grid,header" => [wrap: false, tabs: 8],
27− grid_numbers: "grid,numbers" => [wrap: false, tabs: 8],
28− header_numbers: "header,numbers" => [wrap: false, tabs: 8],
29− changes_grid_header: "changes,grid,header" => [wrap: false, tabs: 8],
30− changes_grid_numbers: "changes,grid,numbers" => [wrap: false, tabs: 8],
31− changes_header_numbers: "changes,header,numbers" => [wrap: false, tabs: 8],
32− grid_header_numbers: "grid,header,numbers" => [wrap: false, tabs: 8],
33− changes_grid_header_numbers: "changes,grid,header,numbers" => [wrap: false, tabs: 8],
34− full: "full" => [wrap: false, tabs: 8],
35− plain: "plain" => [wrap: false, tabs: 0],
36− tabs_passthrough_wrapped: "full" => [wrap: true, tabs: 0],
37− tabs_4_wrapped: "full" => [wrap: true, tabs: 4],
38− tabs_8_wrapped: "full" => [wrap: true, tabs: 8],
39− tabs_passthrough: "full" => [wrap: false, tabs: 0],
40− tabs_4: "full" => [wrap: false, tabs: 4],
41− tabs_8: "full" => [wrap: false, tabs: 8],
42− }
43−}