unexpand: should allow multiple files #5852 and unexpand: show error message if a directory is specified #5845

[biplab5464]

fix in this PR

• allow multiple files
• show error if it is directory and continue
• show error if file doesn't exist and continue

[github-actions]

GNU testsuite comparison:

Skipping an intermittent issue tests/tail/inotify-dir-recreate (passes in this run but fails in the 'main' branch)

[biplab5464]

do i have to write the test cases also for the above fix ?

[cakebaker]

Yes, please :)

[biplab5464]

#[test]
fn test_multiple_files() {
    let (at, mut ucmd) = at_and_ucmd!();

    at.touch("file");
    at.touch("file1");

    ucmd.args(&["file1", "file1"])
        .succeeds()
        .stdout_contains("contents");
}

how to add content to the files
like

echo "contents" > file

[cakebaker]

You can use at.write("file", "content") instead of at.touch().

[biplab5464]

why this test is failing Style/spelling (ubuntu-latest, feat_os_unix)

[cakebaker]

It fails because "contenta" isn't a valid English word. I think you are missing a \n after "content" in your test_multiple_files() function:

.stdout_is("content\na        b");

[biplab5464]

running 1 test
write(default): /tmp/.tmpbmFGWl/file
write(default): /tmp/.tmpbmFGWl/file1
run: /home/biplab/project/coreutils/target/debug/coreutils unexpand file file1
thread 'test_unexpand::test_multiple_files' panicked at tests/by-util/test_unexpand.rs:259:10:
assertion failed: `(left == right)`

Diff < left / right > :
<contenta        b
>content
>a        b

the test is failing if \n is added the stdout is printing "contenta b" this only

[cakebaker]

Yes, you also have to adapt your implementation ;-)

Best to look at what GNU unexpand does:

$ echo "content" > file
$ echo "a   b" > file2
$ unexpand file file2
content
a   b

Here you can see, that GNU unexpand outputs "a b" on a new line.

Hope this helps.

[biplab5464]

biplab@BIPLAB:~/project/coreutils/src/uu/unexpand/src$ cargo run -- file file1
    Finished dev [unoptimized + debuginfo] target(s) in 0.27s
     Running `/home/biplab/project/coreutils/target/debug/unexpand file file1`
content
a        b
biplab@BIPLAB:~/project/coreutils/src/uu/unexpand/src$ unexpand file file1
content
a        b
biplab@BIPLAB:~/project/coreutils/src/uu/unexpand/src$ 

here the output is same to GNU i mean in the above it is printing on new line

in the test cases i don't why it is not adding \n for a new line

[cakebaker]

You are right, the implementation works fine :) I don't know yet why there is no \n in the test...

[biplab5464]

what should be next step
should i add extra space before "a b"
like " a b"
Style/spelling (ubuntu-latest, feat_os_unix)

this test case will not fail after that
or
it is alright

[cakebaker]

Ok, I figured out I was wrong and your test is correct. Sorry about that.

To make the Style/Spelling test pass, you can add

// spell-checker:ignore contenta

below the license info in test_unexpand.rs.

[cakebaker]

The at causes an "unused variable"-warning. Instead of at_and_ucmd!() you can simply use new_cmd!() in this case:

Suggested change

	let (at, mut ucmd) = at_and_ucmd!();
	ucmd.arg("asdf.txt")
	new_cmd!()
	.arg("asdf.txt")

[cakebaker]

USimpleError automatically adds the utils name so you don't have to add it manually:

Suggested change

	message: format!("unexpand: {}: Is a directory", filename.display()),
	message: format!("{}: Is a directory", filename.display()),

[biplab5464]

Thanks you for the suggestion

[biplab5464]

is my PR ready for merge ?

[cakebaker]

And merged, thanks for your PR :)

[biplab5464]

Thank you for your cooperation
i learned a lot again

[cakebaker]

Great to hear, you are welcome :)