Skip to content

Commit 53cd4df

Browse files
authored
simplify the nu! tests for last and first commands (nushell#9608)
# Description in most of the tests for `last` and `first`, we do not need to - give `cwd` to `nu!` - use pipeline as the tests are all short pipes - use `r#" ... "#` as the pipes never contain quotes this PR removes all these points from the tests for the `last` and `first` commands.
1 parent 65a1633 commit 53cd4df

File tree

2 files changed

+18
-106
lines changed

2 files changed

+18
-106
lines changed
Lines changed: 9 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use nu_test_support::fs::Stub::EmptyFile;
2+
use nu_test_support::nu;
23
use nu_test_support::playground::Playground;
3-
use nu_test_support::{nu, pipeline};
44

55
#[test]
66
fn gets_first_rows_by_amount() {
@@ -12,14 +12,7 @@ fn gets_first_rows_by_amount() {
1212
EmptyFile("arepas.clu"),
1313
]);
1414

15-
let actual = nu!(
16-
cwd: dirs.test(), pipeline(
17-
r#"
18-
ls
19-
| first 3
20-
| length
21-
"#
22-
));
15+
let actual = nu!(cwd: dirs.test(), "ls | first 3 | length");
2316

2417
assert_eq!(actual.out, "3");
2518
})
@@ -36,13 +29,7 @@ fn gets_all_rows_if_amount_higher_than_all_rows() {
3629
]);
3730

3831
let actual = nu!(
39-
cwd: dirs.test(), pipeline(
40-
r#"
41-
ls
42-
| first 99
43-
| length
44-
"#
45-
));
32+
cwd: dirs.test(), "ls | first 99 | length");
4633

4734
assert_eq!(actual.out, "4");
4835
})
@@ -53,50 +40,29 @@ fn gets_first_row_when_no_amount_given() {
5340
Playground::setup("first_test_3", |dirs, sandbox| {
5441
sandbox.with_files(vec![EmptyFile("caballeros.txt"), EmptyFile("arepas.clu")]);
5542

56-
let actual = nu!(
57-
cwd: dirs.test(), pipeline(
58-
r#"
59-
ls
60-
| first
61-
| length
62-
"#
63-
));
43+
let actual = nu!(cwd: dirs.test(), "ls | first | length");
6444

6545
assert_eq!(actual.out, "1");
6646
})
6747
}
6848

6949
#[test]
7050
fn gets_first_row_as_list_when_amount_given() {
71-
let actual = nu!(pipeline(
72-
r#"
73-
[1, 2, 3]
74-
| first 1
75-
| describe
76-
"#
77-
));
51+
let actual = nu!("[1, 2, 3] | first 1 | describe");
7852

7953
assert_eq!(actual.out, "list<int> (stream)");
8054
}
8155

8256
#[test]
8357
fn gets_first_bytes() {
84-
let actual = nu!(pipeline(
85-
r#"
86-
(0x[aa bb cc] | first 2) == 0x[aa bb]
87-
"#
88-
));
58+
let actual = nu!("(0x[aa bb cc] | first 2) == 0x[aa bb]");
8959

9060
assert_eq!(actual.out, "true");
9161
}
9262

9363
#[test]
9464
fn gets_first_byte() {
95-
let actual = nu!(pipeline(
96-
r#"
97-
0x[aa bb cc] | first
98-
"#
99-
));
65+
let actual = nu!("0x[aa bb cc] | first");
10066

10167
assert_eq!(actual.out, "170");
10268
}
@@ -111,24 +77,14 @@ fn works_with_binary_list() {
11177

11278
#[test]
11379
fn errors_on_negative_rows() {
114-
let actual = nu!(pipeline(
115-
r#"
116-
[1, 2, 3]
117-
| first -10
118-
"#
119-
));
80+
let actual = nu!("[1, 2, 3] | first -10");
12081

12182
assert!(actual.err.contains("use a positive value"));
12283
}
12384

12485
#[test]
12586
fn errors_on_empty_list_when_no_rows_given() {
126-
let actual = nu!(pipeline(
127-
r#"
128-
[]
129-
| first
130-
"#
131-
));
87+
let actual = nu!("[] | first");
13288

13389
assert!(actual.err.contains("index too large"));
13490
}
Lines changed: 9 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use nu_test_support::fs::Stub::EmptyFile;
2+
use nu_test_support::nu;
23
use nu_test_support::playground::Playground;
3-
use nu_test_support::{nu, pipeline};
44

55
#[test]
66
fn gets_the_last_row() {
@@ -22,14 +22,7 @@ fn gets_last_rows_by_amount() {
2222
EmptyFile("arepas.clu"),
2323
]);
2424

25-
let actual = nu!(
26-
cwd: dirs.test(), pipeline(
27-
r#"
28-
ls
29-
| last 3
30-
| length
31-
"#
32-
));
25+
let actual = nu!(cwd: dirs.test(), "ls | last 3 | length");
3326

3427
assert_eq!(actual.out, "3");
3528
})
@@ -40,75 +33,43 @@ fn gets_last_row_when_no_amount_given() {
4033
Playground::setup("last_test_2", |dirs, sandbox| {
4134
sandbox.with_files(vec![EmptyFile("caballeros.txt"), EmptyFile("arepas.clu")]);
4235

43-
let actual = nu!(
44-
cwd: dirs.test(), pipeline(
45-
r#"
46-
ls
47-
| last
48-
| length
49-
"#
50-
));
36+
let actual = nu!(cwd: dirs.test(), "ls | last | length");
5137

5238
assert_eq!(actual.out, "1");
5339
})
5440
}
5541

5642
#[test]
5743
fn requests_more_rows_than_table_has() {
58-
let actual = nu!(
59-
cwd: ".", pipeline(
60-
r#"
61-
[date] | last 50 | length
62-
"#
63-
));
44+
let actual = nu!("[date] | last 50 | length");
6445

6546
assert_eq!(actual.out, "1");
6647
}
6748

6849
#[test]
6950
fn gets_last_row_as_list_when_amount_given() {
70-
let actual = nu!(
71-
cwd: ".", pipeline(
72-
r#"
73-
[1, 2, 3]
74-
| last 1
75-
| describe
76-
"#
77-
));
51+
let actual = nu!("[1, 2, 3] | last 1 | describe");
7852

7953
assert_eq!(actual.out, "list<int> (stream)");
8054
}
8155

8256
#[test]
8357
fn gets_last_bytes() {
84-
let actual = nu!(pipeline(
85-
r#"
86-
(0x[aa bb cc] | last 2) == 0x[bb cc]
87-
"#
88-
));
58+
let actual = nu!("(0x[aa bb cc] | last 2) == 0x[bb cc]");
8959

9060
assert_eq!(actual.out, "true");
9161
}
9262

9363
#[test]
9464
fn gets_last_byte() {
95-
let actual = nu!(pipeline(
96-
r#"
97-
0x[aa bb cc] | last
98-
"#
99-
));
65+
let actual = nu!("0x[aa bb cc] | last");
10066

10167
assert_eq!(actual.out, "204");
10268
}
10369

10470
#[test]
10571
fn last_errors_on_negative_index() {
106-
let actual = nu!(pipeline(
107-
"
108-
[1, 2, 3]
109-
| last -2
110-
"
111-
));
72+
let actual = nu!("[1, 2, 3] | last -2");
11273

11374
assert!(actual.err.contains("use a positive value"));
11475
}
@@ -122,12 +83,7 @@ fn fail_on_non_iterator() {
12283

12384
#[test]
12485
fn errors_on_empty_list_when_no_rows_given() {
125-
let actual = nu!(pipeline(
126-
r#"
127-
[]
128-
| last
129-
"#
130-
));
86+
let actual = nu!("[] | last");
13187

13288
assert!(actual.err.contains("index too large"));
13389
}

0 commit comments

Comments
 (0)