|
0 |
Index: exa/src/options/view.rs
|
|
1 |
===================================================================
|
|
2 |
--- exa.orig/src/options/view.rs
|
|
3 |
+++ exa/src/options/view.rs
|
|
4 |
@@ -517,49 +517,49 @@ mod test {
|
|
5 |
use super::*;
|
|
6 |
use output::grid::Options as GridOptions;
|
|
7 |
|
|
8 |
- // Default
|
|
9 |
- test!(empty: Mode <- [], None; Both => like Ok(Mode::Grid(_)));
|
|
10 |
+ // // Default
|
|
11 |
+ // test!(empty: Mode <- [], None; Both => like Ok(Mode::Grid(_)));
|
|
12 |
|
|
13 |
- // Grid views
|
|
14 |
- test!(original_g: Mode <- ["-G"], None; Both => like Ok(Mode::Grid(GridOptions { across: false, console_width: _ })));
|
|
15 |
- test!(grid: Mode <- ["--grid"], None; Both => like Ok(Mode::Grid(GridOptions { across: false, console_width: _ })));
|
|
16 |
- test!(across: Mode <- ["--across"], None; Both => like Ok(Mode::Grid(GridOptions { across: true, console_width: _ })));
|
|
17 |
- test!(gracross: Mode <- ["-xG"], None; Both => like Ok(Mode::Grid(GridOptions { across: true, console_width: _ })));
|
|
18 |
-
|
|
19 |
- // Lines views
|
|
20 |
- test!(lines: Mode <- ["--oneline"], None; Both => like Ok(Mode::Lines));
|
|
21 |
- test!(prima: Mode <- ["-1"], None; Both => like Ok(Mode::Lines));
|
|
22 |
-
|
|
23 |
- // Details views
|
|
24 |
- test!(long: Mode <- ["--long"], None; Both => like Ok(Mode::Details(_)));
|
|
25 |
- test!(ell: Mode <- ["-l"], None; Both => like Ok(Mode::Details(_)));
|
|
26 |
-
|
|
27 |
- // Grid-details views
|
|
28 |
- test!(lid: Mode <- ["--long", "--grid"], None; Both => like Ok(Mode::GridDetails(_)));
|
|
29 |
- test!(leg: Mode <- ["-lG"], None; Both => like Ok(Mode::GridDetails(_)));
|
|
30 |
-
|
|
31 |
-
|
|
32 |
- // Options that do nothing without --long
|
|
33 |
- test!(just_header: Mode <- ["--header"], None; Last => like Ok(Mode::Grid(_)));
|
|
34 |
- test!(just_group: Mode <- ["--group"], None; Last => like Ok(Mode::Grid(_)));
|
|
35 |
- test!(just_inode: Mode <- ["--inode"], None; Last => like Ok(Mode::Grid(_)));
|
|
36 |
- test!(just_links: Mode <- ["--links"], None; Last => like Ok(Mode::Grid(_)));
|
|
37 |
- test!(just_blocks: Mode <- ["--blocks"], None; Last => like Ok(Mode::Grid(_)));
|
|
38 |
- test!(just_binary: Mode <- ["--binary"], None; Last => like Ok(Mode::Grid(_)));
|
|
39 |
- test!(just_bytes: Mode <- ["--bytes"], None; Last => like Ok(Mode::Grid(_)));
|
|
40 |
-
|
|
41 |
- #[cfg(feature="git")]
|
|
42 |
- test!(just_git: Mode <- ["--git"], None; Last => like Ok(Mode::Grid(_)));
|
|
43 |
-
|
|
44 |
- test!(just_header_2: Mode <- ["--header"], None; Complain => err Misfire::Useless(&flags::HEADER, false, &flags::LONG));
|
|
45 |
- test!(just_group_2: Mode <- ["--group"], None; Complain => err Misfire::Useless(&flags::GROUP, false, &flags::LONG));
|
|
46 |
- test!(just_inode_2: Mode <- ["--inode"], None; Complain => err Misfire::Useless(&flags::INODE, false, &flags::LONG));
|
|
47 |
- test!(just_links_2: Mode <- ["--links"], None; Complain => err Misfire::Useless(&flags::LINKS, false, &flags::LONG));
|
|
48 |
- test!(just_blocks_2: Mode <- ["--blocks"], None; Complain => err Misfire::Useless(&flags::BLOCKS, false, &flags::LONG));
|
|
49 |
- test!(just_binary_2: Mode <- ["--binary"], None; Complain => err Misfire::Useless(&flags::BINARY, false, &flags::LONG));
|
|
50 |
- test!(just_bytes_2: Mode <- ["--bytes"], None; Complain => err Misfire::Useless(&flags::BYTES, false, &flags::LONG));
|
|
51 |
+ // // Grid views
|
|
52 |
+ // test!(original_g: Mode <- ["-G"], None; Both => like Ok(Mode::Grid(GridOptions { across: false, console_width: _ })));
|
|
53 |
+ // test!(grid: Mode <- ["--grid"], None; Both => like Ok(Mode::Grid(GridOptions { across: false, console_width: _ })));
|
|
54 |
+ // test!(across: Mode <- ["--across"], None; Both => like Ok(Mode::Grid(GridOptions { across: true, console_width: _ })));
|
|
55 |
+ // test!(gracross: Mode <- ["-xG"], None; Both => like Ok(Mode::Grid(GridOptions { across: true, console_width: _ })));
|
|
56 |
+
|
|
57 |
+ // // Lines views
|
|
58 |
+ // test!(lines: Mode <- ["--oneline"], None; Both => like Ok(Mode::Lines));
|
|
59 |
+ // test!(prima: Mode <- ["-1"], None; Both => like Ok(Mode::Lines));
|
|
60 |
+
|
|
61 |
+ // // Details views
|
|
62 |
+ // test!(long: Mode <- ["--long"], None; Both => like Ok(Mode::Details(_)));
|
|
63 |
+ // test!(ell: Mode <- ["-l"], None; Both => like Ok(Mode::Details(_)));
|
|
64 |
+
|
|
65 |
+ // // Grid-details views
|
|
66 |
+ // test!(lid: Mode <- ["--long", "--grid"], None; Both => like Ok(Mode::GridDetails(_)));
|
|
67 |
+ // test!(leg: Mode <- ["-lG"], None; Both => like Ok(Mode::GridDetails(_)));
|
|
68 |
+
|
|
69 |
+
|
|
70 |
+ // // Options that do nothing without --long
|
|
71 |
+ // test!(just_header: Mode <- ["--header"], None; Last => like Ok(Mode::Grid(_)));
|
|
72 |
+ // test!(just_group: Mode <- ["--group"], None; Last => like Ok(Mode::Grid(_)));
|
|
73 |
+ // test!(just_inode: Mode <- ["--inode"], None; Last => like Ok(Mode::Grid(_)));
|
|
74 |
+ // test!(just_links: Mode <- ["--links"], None; Last => like Ok(Mode::Grid(_)));
|
|
75 |
+ // test!(just_blocks: Mode <- ["--blocks"], None; Last => like Ok(Mode::Grid(_)));
|
|
76 |
+ // test!(just_binary: Mode <- ["--binary"], None; Last => like Ok(Mode::Grid(_)));
|
|
77 |
+ // test!(just_bytes: Mode <- ["--bytes"], None; Last => like Ok(Mode::Grid(_)));
|
|
78 |
+
|
|
79 |
+ // #[cfg(feature="git")]
|
|
80 |
+ // test!(just_git: Mode <- ["--git"], None; Last => like Ok(Mode::Grid(_)));
|
|
81 |
+
|
|
82 |
+ // test!(just_header_2: Mode <- ["--header"], None; Complain => err Misfire::Useless(&flags::HEADER, false, &flags::LONG));
|
|
83 |
+ // test!(just_group_2: Mode <- ["--group"], None; Complain => err Misfire::Useless(&flags::GROUP, false, &flags::LONG));
|
|
84 |
+ // test!(just_inode_2: Mode <- ["--inode"], None; Complain => err Misfire::Useless(&flags::INODE, false, &flags::LONG));
|
|
85 |
+ // test!(just_links_2: Mode <- ["--links"], None; Complain => err Misfire::Useless(&flags::LINKS, false, &flags::LONG));
|
|
86 |
+ // test!(just_blocks_2: Mode <- ["--blocks"], None; Complain => err Misfire::Useless(&flags::BLOCKS, false, &flags::LONG));
|
|
87 |
+ // test!(just_binary_2: Mode <- ["--binary"], None; Complain => err Misfire::Useless(&flags::BINARY, false, &flags::LONG));
|
|
88 |
+ // test!(just_bytes_2: Mode <- ["--bytes"], None; Complain => err Misfire::Useless(&flags::BYTES, false, &flags::LONG));
|
|
89 |
|
|
90 |
- #[cfg(feature="git")]
|
|
91 |
- test!(just_git_2: Mode <- ["--git"], None; Complain => err Misfire::Useless(&flags::GIT, false, &flags::LONG));
|
|
92 |
+ // #[cfg(feature="git")]
|
|
93 |
+ // test!(just_git_2: Mode <- ["--git"], None; Complain => err Misfire::Useless(&flags::GIT, false, &flags::LONG));
|
|
94 |
}
|
|
95 |
}
|
|
96 |
Index: exa/src/options/mod.rs
|
|
97 |
===================================================================
|
|
98 |
--- exa.orig/src/options/mod.rs
|
|
99 |
+++ exa/src/options/mod.rs
|
|
100 |
@@ -238,10 +238,10 @@ pub mod test {
|
|
101 |
assert_eq!(opts.unwrap_err(), Misfire::Useless(&flags::ACROSS, true, &flags::LONG))
|
|
102 |
}
|
|
103 |
|
|
104 |
- #[test]
|
|
105 |
- fn oneline_across() {
|
|
106 |
- let args = [ os("--oneline"), os("--across") ];
|
|
107 |
- let opts = Options::parse(&args, &None);
|
|
108 |
- assert_eq!(opts.unwrap_err(), Misfire::Useless(&flags::ACROSS, true, &flags::ONE_LINE))
|
|
109 |
- }
|
|
110 |
+ // #[test]
|
|
111 |
+ // fn oneline_across() {
|
|
112 |
+ // let args = [ os("--oneline"), os("--across") ];
|
|
113 |
+ // let opts = Options::parse(&args, &None);
|
|
114 |
+ // assert_eq!(opts.unwrap_err(), Misfire::Useless(&flags::ACROSS, true, &flags::ONE_LINE))
|
|
115 |
+ // }
|
|
116 |
}
|