cksum: added tests for --raw with each algorithm, not working for crc, sysv, bsd

src/uu/cksum/src/cksum.rs

@@ -5,6 +5,7 @@
 
 // spell-checker:ignore (ToDO) fname, algo
 use clap::{crate_version, value_parser, Arg, ArgAction, Command};
+use hex::decode;
 use hex::encode;
 use std::error::Error;
 use std::ffi::OsStr;
@@ -151,12 +152,12 @@ fn cksum<'a, I>(mut options: Options, files: I) -> UResult<()>
 where
     I: Iterator<Item = &'a OsStr>,
 {
-    let files_vec: Vec<_> = files.collect();
-    if options.raw && files_vec.len() > 1 {
+    let files: Vec<_> = files.collect();
+    if options.raw && files.len() > 1 {
         return Err(Box::new(CkSumError::RawMultipleFiles));
     }
 
-    for filename in files_vec {
+    for filename in files {
         let filename = Path::new(filename);
         let stdin_buf;
         let file_buf;
@@ -175,8 +176,16 @@ where
             .map_err_context(|| "failed to read input".to_string())?;
 
         if options.raw {
-            let bytes_str = sum.parse::<u32>().unwrap().to_be_bytes();
-            stdout().write_all(&bytes_str)?;
+            match decode(sum.clone()) {
+                Ok(bytes) => {
+                    stdout().write_all(&bytes)?;
+                }
+                Err(_) => {
+                    //bsd, sysv and crc have output generated without encode()
+                    let bytes = sum.parse::<u32>().unwrap().to_be_bytes();
+                    stdout().write_all(&bytes)?;
+                }
+            }
             return Ok(());
         }
         // The BSD checksum output is 5 digit integer

tests/by-util/test_cksum.rs

@@ -289,14 +289,16 @@ fn test_length_is_zero() {
 
 #[test]
 fn test_raw_single_file() {
+    for algo in ALGOS {
         new_ucmd!()
             .arg("--raw")
             .arg("lorem_ipsum.txt")
+            .arg(format!("--algorithm={algo}"))
             .succeeds()
             .no_stderr()
-        .stdout_is_fixture_bytes("raw_single_file.expected");
+            .stdout_is_fixture_bytes(format!("raw/{algo}_single_file.expected"));
+    }
 }
-
 #[test]
 fn test_raw_multiple_files() {
     new_ucmd!()

tests/fixtures/cksum/raw/blake2b_single_file.expected

@@ -0,0 +1 @@
+<0E><><EFBFBD><EFBFBD><EFBFBD>`<60>x<EFBFBD><0B>
f<><1E>W<EFBFBD><57><EFBFBD>Et<45>B<><42>l<EFBFBD><6C>W^J<>0<EFBFBD>aX´<08><>8<EFBFBD><38><EFBFBD><EFBFBD><EFBFBD>5<15>B<EFBFBD><42>9m<11><>

tests/fixtures/cksum/raw/bsd_single_file.expected

@@ -0,0 +1 @@
+<1F>

tests/fixtures/cksum/raw/sha1_single_file.expected

@@ -0,0 +1 @@
+<EFBFBD>к<>؈:=<18>m毽(%,<2C><>

tests/fixtures/cksum/raw/sha256_single_file.expected

@@ -0,0 +1 @@
+÷Ä PPà0’P
gê^‘	<09>SkE‚þœC[Ù+?

tests/fixtures/cksum/raw/sha384_single_file.expected

@@ -0,0 +1,3 @@
+K荵
+

2吠鋳<19>ｼ<EFBFBD>ﾏｸｱﾄ/g胤€ｺ囹LZ{WZ3Sｩ
+守Hﾋ

tests/fixtures/cksum/raw/sha512_single_file.expected

@@ -0,0 +1 @@
+–Td«%VªÕŽ¼sØšÒ!åYyu)ì¯ÀôfÁ•ÏöÖâÆ– |T,ýBn^Oऊ¡VgºD	k!=Í<03>ú

tests/fixtures/cksum/raw/sm3_single_file.expected

@@ -0,0 +1 @@
+m)k€]þÒ(ß0<C39F>»›CyMÔíg@¡p§‚i›Â

tests/fixtures/cksum/raw/sysv_single_file.expected

@@ -0,0 +1 @@
+I