mirror of
https://github.com/RGBCube/uutils-coreutils
synced 2025-07-28 03:27:44 +00:00
split: better handle numeric and hex suffixes, short and long, with and without values (#5198)
* split: better handle numeric and hex suffixes, short and long, with and without values Fixes #5171 * refactoring with overrides_with_all() in args definitions * fixed comments * updated help on suffixes to match GNU * comments * refactor to remove value_parser() * split: refactor suffix processing + updated tests * split: minor formatting
This commit is contained in:
Yury Zhytkou
GitHub
parent
e4ea64af5c
commit
1eae064e5c
2 changed files with 263 additions and 32 deletions
|
|
@ -2,7 +2,7 @@
|
|||
//
|
||||
// For the full copyright and license information, please view the LICENSE
|
||||
// file that was distributed with this source code.
|
||||
// spell-checker:ignore xzaaa sixhundredfiftyonebytes ninetyonebytes threebytes asciilowercase fghij klmno pqrst uvwxyz fivelines twohundredfortyonebytes onehundredlines nbbbb
|
||||
// spell-checker:ignore xzaaa sixhundredfiftyonebytes ninetyonebytes threebytes asciilowercase fghij klmno pqrst uvwxyz fivelines twohundredfortyonebytes onehundredlines nbbbb dxen
|
||||
|
||||
use crate::common::util::{AtPath, TestScenario};
|
||||
use rand::{thread_rng, Rng, SeedableRng};
|
||||
|
|
@ -715,7 +715,7 @@ fn test_multiple_of_input_chunk() {
|
|||
#[test]
|
||||
fn test_numeric_suffix() {
|
||||
let (at, mut ucmd) = at_and_ucmd!();
|
||||
ucmd.args(&["-n", "4", "--numeric-suffixes", "9", "threebytes.txt"])
|
||||
ucmd.args(&["-n", "4", "--numeric-suffixes=9", "threebytes.txt"])
|
||||
.succeeds()
|
||||
.no_stdout()
|
||||
.no_stderr();
|
||||
|
|
@ -728,7 +728,7 @@ fn test_numeric_suffix() {
|
|||
#[test]
|
||||
fn test_hex_suffix() {
|
||||
let (at, mut ucmd) = at_and_ucmd!();
|
||||
ucmd.args(&["-n", "4", "--hex-suffixes", "9", "threebytes.txt"])
|
||||
ucmd.args(&["-n", "4", "--hex-suffixes=9", "threebytes.txt"])
|
||||
.succeeds()
|
||||
.no_stdout()
|
||||
.no_stderr();
|
||||
|
|
@ -738,6 +738,190 @@ fn test_hex_suffix() {
|
|||
assert_eq!(at.read("x0c"), "");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_numeric_suffix_no_equal() {
|
||||
new_ucmd!()
|
||||
.args(&["-n", "4", "--numeric-suffixes", "9", "threebytes.txt"])
|
||||
.fails()
|
||||
.stderr_contains("split: cannot open '9' for reading: No such file or directory");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_hex_suffix_no_equal() {
|
||||
new_ucmd!()
|
||||
.args(&["-n", "4", "--hex-suffixes", "9", "threebytes.txt"])
|
||||
.fails()
|
||||
.stderr_contains("split: cannot open '9' for reading: No such file or directory");
|
||||
}
|
||||
|
||||
/// Test for short numeric suffix not having any value
|
||||
#[test]
|
||||
fn test_short_numeric_suffix_no_value() {
|
||||
let (at, mut ucmd) = at_and_ucmd!();
|
||||
ucmd.args(&["-l", "9", "-d", "onehundredlines.txt"])
|
||||
.succeeds()
|
||||
.no_stdout()
|
||||
.no_stderr();
|
||||
assert_eq!(at.read("x00"), "00\n01\n02\n03\n04\n05\n06\n07\n08\n");
|
||||
assert_eq!(at.read("x01"), "09\n10\n11\n12\n13\n14\n15\n16\n17\n");
|
||||
assert_eq!(at.read("x02"), "18\n19\n20\n21\n22\n23\n24\n25\n26\n");
|
||||
assert_eq!(at.read("x03"), "27\n28\n29\n30\n31\n32\n33\n34\n35\n");
|
||||
assert_eq!(at.read("x04"), "36\n37\n38\n39\n40\n41\n42\n43\n44\n");
|
||||
assert_eq!(at.read("x05"), "45\n46\n47\n48\n49\n50\n51\n52\n53\n");
|
||||
assert_eq!(at.read("x06"), "54\n55\n56\n57\n58\n59\n60\n61\n62\n");
|
||||
assert_eq!(at.read("x07"), "63\n64\n65\n66\n67\n68\n69\n70\n71\n");
|
||||
assert_eq!(at.read("x08"), "72\n73\n74\n75\n76\n77\n78\n79\n80\n");
|
||||
assert_eq!(at.read("x09"), "81\n82\n83\n84\n85\n86\n87\n88\n89\n");
|
||||
assert_eq!(at.read("x10"), "90\n91\n92\n93\n94\n95\n96\n97\n98\n");
|
||||
assert_eq!(at.read("x11"), "99\n");
|
||||
}
|
||||
|
||||
/// Test for long numeric suffix not having any value
|
||||
#[test]
|
||||
fn test_numeric_suffix_no_value() {
|
||||
let (at, mut ucmd) = at_and_ucmd!();
|
||||
ucmd.args(&["-l", "9", "--numeric-suffixes", "onehundredlines.txt"])
|
||||
.succeeds()
|
||||
.no_stdout()
|
||||
.no_stderr();
|
||||
assert_eq!(at.read("x00"), "00\n01\n02\n03\n04\n05\n06\n07\n08\n");
|
||||
assert_eq!(at.read("x01"), "09\n10\n11\n12\n13\n14\n15\n16\n17\n");
|
||||
assert_eq!(at.read("x02"), "18\n19\n20\n21\n22\n23\n24\n25\n26\n");
|
||||
assert_eq!(at.read("x03"), "27\n28\n29\n30\n31\n32\n33\n34\n35\n");
|
||||
assert_eq!(at.read("x04"), "36\n37\n38\n39\n40\n41\n42\n43\n44\n");
|
||||
assert_eq!(at.read("x05"), "45\n46\n47\n48\n49\n50\n51\n52\n53\n");
|
||||
assert_eq!(at.read("x06"), "54\n55\n56\n57\n58\n59\n60\n61\n62\n");
|
||||
assert_eq!(at.read("x07"), "63\n64\n65\n66\n67\n68\n69\n70\n71\n");
|
||||
assert_eq!(at.read("x08"), "72\n73\n74\n75\n76\n77\n78\n79\n80\n");
|
||||
assert_eq!(at.read("x09"), "81\n82\n83\n84\n85\n86\n87\n88\n89\n");
|
||||
assert_eq!(at.read("x10"), "90\n91\n92\n93\n94\n95\n96\n97\n98\n");
|
||||
assert_eq!(at.read("x11"), "99\n");
|
||||
}
|
||||
|
||||
/// Test for short hex suffix not having any value
|
||||
#[test]
|
||||
fn test_short_hex_suffix_no_value() {
|
||||
let (at, mut ucmd) = at_and_ucmd!();
|
||||
ucmd.args(&["-l", "9", "-x", "onehundredlines.txt"])
|
||||
.succeeds()
|
||||
.no_stdout()
|
||||
.no_stderr();
|
||||
assert_eq!(at.read("x00"), "00\n01\n02\n03\n04\n05\n06\n07\n08\n");
|
||||
assert_eq!(at.read("x01"), "09\n10\n11\n12\n13\n14\n15\n16\n17\n");
|
||||
assert_eq!(at.read("x02"), "18\n19\n20\n21\n22\n23\n24\n25\n26\n");
|
||||
assert_eq!(at.read("x03"), "27\n28\n29\n30\n31\n32\n33\n34\n35\n");
|
||||
assert_eq!(at.read("x04"), "36\n37\n38\n39\n40\n41\n42\n43\n44\n");
|
||||
assert_eq!(at.read("x05"), "45\n46\n47\n48\n49\n50\n51\n52\n53\n");
|
||||
assert_eq!(at.read("x06"), "54\n55\n56\n57\n58\n59\n60\n61\n62\n");
|
||||
assert_eq!(at.read("x07"), "63\n64\n65\n66\n67\n68\n69\n70\n71\n");
|
||||
assert_eq!(at.read("x08"), "72\n73\n74\n75\n76\n77\n78\n79\n80\n");
|
||||
assert_eq!(at.read("x09"), "81\n82\n83\n84\n85\n86\n87\n88\n89\n");
|
||||
assert_eq!(at.read("x0a"), "90\n91\n92\n93\n94\n95\n96\n97\n98\n");
|
||||
assert_eq!(at.read("x0b"), "99\n");
|
||||
}
|
||||
|
||||
/// Test for long hex suffix not having any value
|
||||
#[test]
|
||||
fn test_hex_suffix_no_value() {
|
||||
let (at, mut ucmd) = at_and_ucmd!();
|
||||
ucmd.args(&["-l", "9", "--hex-suffixes", "onehundredlines.txt"])
|
||||
.succeeds()
|
||||
.no_stdout()
|
||||
.no_stderr();
|
||||
assert_eq!(at.read("x00"), "00\n01\n02\n03\n04\n05\n06\n07\n08\n");
|
||||
assert_eq!(at.read("x01"), "09\n10\n11\n12\n13\n14\n15\n16\n17\n");
|
||||
assert_eq!(at.read("x02"), "18\n19\n20\n21\n22\n23\n24\n25\n26\n");
|
||||
assert_eq!(at.read("x03"), "27\n28\n29\n30\n31\n32\n33\n34\n35\n");
|
||||
assert_eq!(at.read("x04"), "36\n37\n38\n39\n40\n41\n42\n43\n44\n");
|
||||
assert_eq!(at.read("x05"), "45\n46\n47\n48\n49\n50\n51\n52\n53\n");
|
||||
assert_eq!(at.read("x06"), "54\n55\n56\n57\n58\n59\n60\n61\n62\n");
|
||||
assert_eq!(at.read("x07"), "63\n64\n65\n66\n67\n68\n69\n70\n71\n");
|
||||
assert_eq!(at.read("x08"), "72\n73\n74\n75\n76\n77\n78\n79\n80\n");
|
||||
assert_eq!(at.read("x09"), "81\n82\n83\n84\n85\n86\n87\n88\n89\n");
|
||||
assert_eq!(at.read("x0a"), "90\n91\n92\n93\n94\n95\n96\n97\n98\n");
|
||||
assert_eq!(at.read("x0b"), "99\n");
|
||||
}
|
||||
|
||||
/// Test for short numeric suffix having value provided after space - should fail
|
||||
#[test]
|
||||
fn test_short_numeric_suffix_with_value_spaced() {
|
||||
new_ucmd!()
|
||||
.args(&["-n", "4", "-d", "9", "threebytes.txt"])
|
||||
.fails()
|
||||
.stderr_contains("split: cannot open '9' for reading: No such file or directory");
|
||||
}
|
||||
|
||||
/// Test for short numeric suffix having value provided after space - should fail
|
||||
#[test]
|
||||
fn test_short_hex_suffix_with_value_spaced() {
|
||||
new_ucmd!()
|
||||
.args(&["-n", "4", "-x", "9", "threebytes.txt"])
|
||||
.fails()
|
||||
.stderr_contains("split: cannot open '9' for reading: No such file or directory");
|
||||
}
|
||||
|
||||
/// Test for some combined short options
|
||||
#[test]
|
||||
fn test_short_combination() {
|
||||
let (at, mut ucmd) = at_and_ucmd!();
|
||||
ucmd.args(&["-dxen", "4", "threebytes.txt"])
|
||||
.succeeds()
|
||||
.no_stdout()
|
||||
.no_stderr();
|
||||
assert_eq!(at.read("x00"), "a");
|
||||
assert_eq!(at.read("x01"), "b");
|
||||
assert_eq!(at.read("x02"), "c");
|
||||
assert_eq!(at.file_exists("x03"), false);
|
||||
}
|
||||
|
||||
/// Test for the last effective suffix, ignoring all others - numeric long last
|
||||
/// Any combination of short and long (as well as duplicates) should be allowed
|
||||
#[test]
|
||||
fn test_effective_suffix_numeric_last() {
|
||||
let (at, mut ucmd) = at_and_ucmd!();
|
||||
ucmd.args(&[
|
||||
"-n",
|
||||
"4",
|
||||
"--numeric-suffixes=7",
|
||||
"--hex-suffixes=4",
|
||||
"-d",
|
||||
"-x",
|
||||
"--numeric-suffixes=9",
|
||||
"threebytes.txt",
|
||||
])
|
||||
.succeeds()
|
||||
.no_stdout()
|
||||
.no_stderr();
|
||||
assert_eq!(at.read("x09"), "a");
|
||||
assert_eq!(at.read("x10"), "b");
|
||||
assert_eq!(at.read("x11"), "c");
|
||||
assert_eq!(at.read("x12"), "");
|
||||
}
|
||||
|
||||
/// Test for the last effective suffix, ignoring all others - hex long last
|
||||
/// Any combination of short and long (as well as duplicates) should be allowed
|
||||
#[test]
|
||||
fn test_effective_suffix_hex_last() {
|
||||
let (at, mut ucmd) = at_and_ucmd!();
|
||||
ucmd.args(&[
|
||||
"-n",
|
||||
"4",
|
||||
"--hex-suffixes=7",
|
||||
"--numeric-suffixes=4",
|
||||
"-x",
|
||||
"-d",
|
||||
"--hex-suffixes=9",
|
||||
"threebytes.txt",
|
||||
])
|
||||
.succeeds()
|
||||
.no_stdout()
|
||||
.no_stderr();
|
||||
assert_eq!(at.read("x09"), "a");
|
||||
assert_eq!(at.read("x0a"), "b");
|
||||
assert_eq!(at.read("x0b"), "c");
|
||||
assert_eq!(at.read("x0c"), "");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_round_robin() {
|
||||
let (at, mut ucmd) = at_and_ucmd!();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue