Skip to content

Commit 8ca6c98

Browse files
committed
update tests to use the usage error message prefix.
1 parent e74b543 commit 8ca6c98

File tree

4 files changed

+19
-16
lines changed

4 files changed

+19
-16
lines changed

tests/test_apply.rs

+10-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fn apply_ops_unknown_operation() {
1414
.arg("data.csv");
1515

1616
let got: String = wrk.output_stderr(&mut cmd);
17-
assert_eq!(&*got, "usage: Unknown 'obfuscate' operation\n")
17+
assert_eq!(&*got, "usage error: Unknown 'obfuscate' operation\n")
1818
}
1919

2020
#[test]
@@ -133,7 +133,7 @@ fn apply_ops_upper_rename_invalid() {
133133
let got: String = wrk.output_stderr(&mut cmd);
134134
assert_eq!(
135135
got,
136-
"usage: Number of new columns does not match input column selection.\n"
136+
"usage error: Number of new columns does not match input column selection.\n"
137137
);
138138
}
139139

@@ -909,7 +909,8 @@ fn apply_ops_replace_validation_error() {
909909
let got = wrk.output_stderr(&mut cmd);
910910
assert_eq!(
911911
got,
912-
"usage: --comparand (-C) and --replacement (-R) are required for replace operation.\n"
912+
"usage error: --comparand (-C) and --replacement (-R) are required for replace \
913+
operation.\n"
913914
);
914915
wrk.assert_err(&mut cmd);
915916
}
@@ -972,7 +973,7 @@ fn apply_ops_regex_replace_validation_error() {
972973
let got = wrk.output_stderr(&mut cmd);
973974
assert_eq!(
974975
got,
975-
"usage: --comparand (-C) and --replacement (-R) are required for regex_replace \
976+
"usage error: --comparand (-C) and --replacement (-R) are required for regex_replace \
976977
operation.\n"
977978
);
978979
wrk.assert_err(&mut cmd);
@@ -1092,8 +1093,9 @@ fn apply_ops_chain_validation_error() {
10921093
let got = wrk.output_stderr(&mut cmd);
10931094
assert_eq!(
10941095
got,
1095-
"usage: you can only use censor(0), copy(0), eudex(0), regex_replace(0), replace(0), \
1096-
sentiment(0), similarity(2), strip(0), and whatlang(0) ONCE per operation series.\n"
1096+
"usage error: you can only use censor(0), copy(0), eudex(0), regex_replace(0), \
1097+
replace(0), sentiment(0), similarity(2), strip(0), and whatlang(0) ONCE per operation \
1098+
series.\n"
10971099
);
10981100
wrk.assert_err(&mut cmd);
10991101
}
@@ -1116,7 +1118,8 @@ fn apply_ops_chain_validation_error_missing_comparand() {
11161118
let got = wrk.output_stderr(&mut cmd);
11171119
assert_eq!(
11181120
got,
1119-
"usage: --comparand (-C) and --new_column (-c) is required for similarity operations.\n"
1121+
"usage error: --comparand (-C) and --new_column (-c) is required for similarity \
1122+
operations.\n"
11201123
);
11211124
wrk.assert_err(&mut cmd);
11221125
}

tests/test_excel.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ fn excel_invalid_sheet_index() {
323323
cmd.arg("--sheet").arg("100").arg(xls_file);
324324

325325
let got = wrk.output_stderr(&mut cmd);
326-
let expected = "usage: sheet index 100 is greater than number of sheets 8\n".to_string();
326+
let expected = "usage error: sheet index 100 is greater than number of sheets 8\n".to_string();
327327
assert_eq!(got, expected);
328328
wrk.assert_err(&mut cmd);
329329
}

tests/test_fetch.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ fn fetch_jql_jqlfile_error() {
335335
.arg("data.csv");
336336

337337
let got: String = wrk.output_stderr(&mut cmd);
338-
assert!(got.starts_with("usage: Invalid arguments."));
338+
assert!(got.starts_with("usage error: Invalid arguments."));
339339

340340
wrk.assert_err(&mut cmd);
341341
}
@@ -455,7 +455,7 @@ fn fetch_custom_invalid_header_error() {
455455
.arg("data.csv");
456456

457457
let got: String = wrk.output_stderr(&mut cmd);
458-
assert!(got.starts_with("usage: Invalid header name"));
458+
assert!(got.starts_with("usage error: Invalid header name"));
459459

460460
wrk.assert_err(&mut cmd);
461461
}
@@ -475,7 +475,7 @@ fn fetch_custom_invalid_user_agent_error() {
475475
.arg("data.csv");
476476

477477
let got: String = wrk.output_stderr(&mut cmd);
478-
assert!(got.starts_with("usage: Invalid user-agent"));
478+
assert!(got.starts_with("usage error: Invalid user-agent"));
479479

480480
wrk.assert_err(&mut cmd);
481481
}
@@ -534,7 +534,7 @@ fn fetch_custom_invalid_value_error() {
534534
.arg("data.csv");
535535

536536
let got: String = wrk.output_stderr(&mut cmd);
537-
assert!(got.starts_with("usage: Invalid header value"));
537+
assert!(got.starts_with("usage error: Invalid header value"));
538538

539539
wrk.assert_err(&mut cmd);
540540
}
@@ -559,7 +559,7 @@ fn fetchpost_custom_invalid_header_error() {
559559
.arg("data.csv");
560560

561561
let got: String = wrk.output_stderr(&mut cmd);
562-
assert!(got.starts_with("usage: Invalid header name"));
562+
assert!(got.starts_with("usage error: Invalid header name"));
563563

564564
wrk.assert_err(&mut cmd);
565565
}
@@ -584,7 +584,7 @@ fn fetchpost_custom_invalid_value_error() {
584584
.arg("data.csv");
585585

586586
let got: String = wrk.output_stderr(&mut cmd);
587-
assert!(got.starts_with("usage: Invalid header value"));
587+
assert!(got.starts_with("usage error: Invalid header value"));
588588

589589
wrk.assert_err(&mut cmd);
590590
}
@@ -610,7 +610,7 @@ fn fetchpost_custom_invalid_user_agent_error() {
610610
.arg("data.csv");
611611

612612
let got: String = wrk.output_stderr(&mut cmd);
613-
assert!(got.starts_with("usage: Invalid user-agent"));
613+
assert!(got.starts_with("usage error: Invalid user-agent"));
614614

615615
wrk.assert_err(&mut cmd);
616616
}

tests/test_table.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ fn invalid_delimiter_len() {
8888
let got: String = wrk.output_stderr(&mut cmd);
8989
assert_eq!(
9090
&*got,
91-
"usage: Could not convert '||' to a single ASCII character.\n"
91+
"usage error: Could not convert '||' to a single ASCII character.\n"
9292
)
9393
}
9494

0 commit comments

Comments
 (0)