Merge pull request #164 from rustcoreutils/hacking

Moar test work

Author: jgarzik

Diff for: README.md

@@ -69,8 +69,9 @@ Because it is a FAQ, the major differences between this project and uutils are:
  - [x] dirname
  - [x] expand
  - [x] expr
- - [x] file
  - [x] false
+ - [x] file
+ - [x] fold
  - [x] head
  - [x] ls
  - [x] mv
@@ -104,7 +105,6 @@ Because it is a FAQ, the major differences between this project and uutils are:
  - [x] chown
  - [x] date
  - [x] env
- - [x] fold
  - [x] ipcrm (IPC)
  - [x] link
  - [x] ln

Diff for: file/tests/dd-tests.rs

@@ -7,6 +7,7 @@ use plib::{run_test_u8, TestPlanU8};
 fn get_test_file_path(filename: &str) -> PathBuf {
     let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     path.push("tests");
+    path.push("dd");
     path.push(filename);
     path
 }

Diff for: file/tests/dd.ascii renamed to file/tests/dd/dd.ascii

@@ -6,10 +6,6 @@
 // file in the root directory of this project.
 // SPDX-License-Identifier: MIT
 //
-// TODO:
-// - integration tests
-// - verify break-with-spaces correctness
-//
 
 extern crate clap;
 extern crate plib;

Diff for: file/tests/dd.block renamed to file/tests/dd/dd.block

@@ -22,7 +22,7 @@ fn expand_test_noargs(test_data: &str, expected_output: &str) {
 }
 
 #[test]
-fn test_expand_basic() {
+fn expand_basic() {
     expand_test_noargs("", "");
     expand_test_noargs("a\tb\tc\n", "a       b       c\n");
 }

Diff for: file/tests/dd.ebcdic renamed to file/tests/dd/dd.ebcdic

@@ -0,0 +1,77 @@
+//
+// Copyright (c) 2024 Hemi Labs, Inc.
+//
+// This file is part of the posixutils-rs project covered under
+// the MIT License.  For the full license text, please see the LICENSE
+// file in the root directory of this project.
+// SPDX-License-Identifier: MIT
+//
+
+use plib::testing::{run_test, TestPlan};
+use std::fs::File;
+use std::io::Read;
+use std::path::PathBuf;
+
+fn get_test_file_path(filename: &str) -> PathBuf {
+    let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    path.push("tests/fold");
+    path.push(filename);
+    path
+}
+
+fn run_fold_test(args: Vec<&str>, input_filename: &str, expected_output_filename: &str) {
+    let input_file_path = get_test_file_path(input_filename);
+    let input_data = match File::open(input_file_path) {
+        Ok(mut file) => {
+            let mut data = String::new();
+            file.read_to_string(&mut data).unwrap();
+            data
+        }
+        Err(e) => {
+            panic!("Error opening file: {}", e);
+        }
+    };
+
+    let expected_output_file_path = get_test_file_path(expected_output_filename);
+
+    let mut expected_output = String::new();
+    File::open(expected_output_file_path)
+        .unwrap()
+        .read_to_string(&mut expected_output)
+        .unwrap();
+
+    let args: Vec<String> = args.iter().map(|s| s.to_string()).collect();
+    run_test(TestPlan {
+        cmd: String::from("fold"),
+        args,
+        expected_out: expected_output,
+        expected_err: String::new(),
+        expected_exit_code: 0,
+        stdin_data: input_data,
+    });
+}
+
+#[test]
+fn fold_default_behavior() {
+    run_fold_test(vec![], "input1.txt", "output_default.txt");
+}
+
+#[test]
+fn fold_custom_width() {
+    run_fold_test(vec!["-w", "40"], "input1.txt", "output_width40.txt");
+}
+
+#[test]
+fn fold_bytes_mode() {
+    run_fold_test(vec!["-b"], "input1.txt", "output_bytes.txt");
+}
+
+#[test]
+fn fold_spaces_mode() {
+    run_fold_test(vec!["-s"], "input2.txt", "output_spaces.txt");
+}
+
+#[test]
+fn fold_bytes_and_spaces_mode() {
+    run_fold_test(vec!["-b", "-s"], "input2.txt", "output_bytes_spaces.txt");
+}

Diff for: file/tests/dd.ibm renamed to file/tests/dd/dd.ibm

@@ -0,0 +1 @@
+This is a test file with several lines of varying lengths.

Diff for: file/tests/dd.lcase renamed to file/tests/dd/dd.lcase

@@ -0,0 +1 @@
+Another example of a file with different line lengths and characters.

Diff for: file/tests/dd.swab renamed to file/tests/dd/dd.swab

@@ -0,0 +1 @@
+This is a test file with several lines of varying lengths.

Diff for: file/tests/dd.sync renamed to file/tests/dd/dd.sync

@@ -0,0 +1 @@
+Another example of a file with different line lengths and characters.

Diff for: file/tests/dd.ucase renamed to file/tests/dd/dd.ucase

@@ -0,0 +1 @@
+This is a test file with several lines of varying lengths.

Diff for: file/tests/dd.unblock renamed to file/tests/dd/dd.unblock

@@ -0,0 +1 @@
+Another example of a file with different line lengths and characters.

Diff for: file/tests/dd_test_input.txt renamed to file/tests/dd/dd_test_input.txt

@@ -0,0 +1,2 @@
+This is a test file with several lines o
+f varying lengths.

Diff for: text/src/fold.rs

@@ -0,0 +1,84 @@
+//
+// Copyright (c) 2024 Jeff Garzik
+// Copyright (c) 2024 Hemi Labs, Inc.
+//
+// This file is part of the posixutils-rs project covered under
+// the MIT License.  For the full license text, please see the LICENSE
+// file in the root directory of this project.
+// SPDX-License-Identifier: MIT
+//
+
+use plib::testing::{run_test, TestPlan};
+use std::fs::File;
+use std::io::Read;
+use std::path::PathBuf;
+
+fn get_test_file_path(filename: &str) -> PathBuf {
+    let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    path.push("tests/paste");
+    path.push(filename);
+    path
+}
+
+fn run_paste_test(args: Vec<&str>, expected_output_filename: &str) {
+    let expected_output_file_path = get_test_file_path(expected_output_filename);
+
+    let mut expected_output = String::new();
+    File::open(expected_output_file_path)
+        .unwrap()
+        .read_to_string(&mut expected_output)
+        .unwrap();
+
+    let args: Vec<String> = args.iter().map(|s| s.to_string()).collect();
+    run_test(TestPlan {
+        cmd: String::from("paste"),
+        args,
+        expected_out: expected_output,
+        expected_err: String::new(),
+        stdin_data: String::new(),
+        expected_exit_code: 0,
+    });
+}
+
+#[test]
+fn paste_default_behavior() {
+    run_paste_test(
+        vec!["tests/paste/input1.txt", "tests/paste/input2.txt"],
+        "output_default.txt",
+    );
+}
+
+#[test]
+fn paste_serial_mode() {
+    run_paste_test(
+        vec!["-s", "tests/paste/input1.txt", "tests/paste/input2.txt"],
+        "output_serial.txt",
+    );
+}
+
+#[test]
+fn paste_custom_delimiter() {
+    run_paste_test(
+        vec![
+            "-d",
+            ",",
+            "tests/paste/input1.txt",
+            "tests/paste/input2.txt",
+        ],
+        "output_custom_delim.txt",
+    );
+}
+
+#[test]
+fn paste_serial_custom_delimiter() {
+    run_paste_test(
+        vec![
+            "-s",
+            "-d",
+            ",",
+            "tests/paste/input1.txt",
+            "tests/paste/input2.txt",
+        ],
+        "output_serial_custom_delim.txt",
+    );
+}

Diff for: text/tests/expand-tests.rs

@@ -0,0 +1,3 @@
+apple
+banana
+carrot

Diff for: text/tests/fold-tests.rs

@@ -0,0 +1,3 @@
+1
+2
+3

Diff for: text/tests/fold/input1.txt

@@ -0,0 +1,3 @@
+one
+two
+three

Diff for: text/tests/fold/input2.txt

@@ -0,0 +1,3 @@
+apple,1
+banana,2
+carrot,3

Diff for: text/tests/fold/output_bytes.txt

@@ -0,0 +1,3 @@
+apple	1
+banana	2
+carrot	3

Diff for: text/tests/fold/output_bytes_spaces.txt

@@ -0,0 +1,2 @@
+apple	banana	carrot
+1	2	3

Diff for: text/tests/fold/output_default.txt

@@ -0,0 +1,2 @@
+apple,banana,carrot
+1,2,3

Diff for: text/tests/fold/output_spaces.txt

@@ -60,7 +60,7 @@ fn pr_read_test_file(
 }
 
 #[test]
-fn test_pr_single_column() {
+fn pr_single_column() {
     let input = "tests/pr/lorem_ipsum.txt";
     let output = pr_read_test_file(
         "tests/pr/lorem_ipsum_output_single_column.txt",
@@ -72,14 +72,14 @@ fn test_pr_single_column() {
 }
 
 #[test]
-fn test_pr_multi_column() {
+fn pr_multi_column() {
     let input = "tests/pr/lorem_ipsum.txt";
     let output = pr_read_test_file("tests/pr/lorem_ipsum_output_9_cols.txt", input, None, None);
     pr_test(&["-9", &input], "", &output);
 }
 
 #[test]
-fn test_pr_multi_column_across() {
+fn pr_multi_column_across() {
     let input = "tests/pr/lorem_ipsum.txt";
     let output = pr_read_test_file(
         "tests/pr/lorem_ipsum_output_2_cols_across.txt",
@@ -91,7 +91,7 @@ fn test_pr_multi_column_across() {
 }
 
 #[test]
-fn test_pr_multi_column_merge() {
+fn pr_multi_column_merge() {
     // This test requires the current timestamp.
     //
     // It's possible to inject the current timestamp to the expected output
@@ -135,7 +135,7 @@ fn test_pr_multi_column_merge() {
 }
 
 #[test]
-fn test_pr_page_skip() {
+fn pr_page_skip() {
     let input = "tests/pr/numbers.txt";
     let output = pr_read_test_file(
         "tests/pr/numbers_output_9_cols_page15.txt",
@@ -147,7 +147,7 @@ fn test_pr_page_skip() {
 }
 
 #[test]
-fn test_pr_header_replacement() {
+fn pr_header_replacement() {
     let header = "custom";
     let input = "tests/pr/lorem_ipsum.txt";
     let output = pr_read_test_file(
@@ -160,36 +160,36 @@ fn test_pr_header_replacement() {
 }
 
 #[test]
-fn test_pr_limit_lines() {
+fn pr_limit_lines() {
     let input = "tests/pr/numbers.txt";
     let output = pr_read_test_file("tests/pr/numbers_output_l20.txt", input, None, None);
     pr_test(&["+1:1", "-l20", &input], "", &output);
 }
 
 #[test]
-fn test_pr_limit_lines_trim() {
+fn pr_limit_lines_trim() {
     // Lines <= 10 behave like -t is used
     let input = "tests/pr/numbers.txt";
     let output = pr_read_test_file("tests/pr/numbers_output_l10.txt", input, None, None);
     pr_test(&["+1:1", "-l10", &input], "", &output);
 }
 
 #[test]
-fn test_pr_omit_header() {
+fn pr_omit_header() {
     let input = "tests/pr/numbers.txt";
     let output = pr_read_test_file("tests/pr/numbers_output_omit_header.txt", input, None, None);
     pr_test(&["+1:1", "-l20", "-t", &input], "", &output);
 }
 
 #[test]
-fn test_pr_offset() {
+fn pr_offset() {
     let input = "tests/pr/numbers.txt";
     let output = pr_read_test_file("tests/pr/numbers_output_offset.txt", input, None, None);
     pr_test(&["+1:1", "-o7", &input], "", &output);
 }
 
 #[test]
-fn test_pr_width() {
+fn pr_width() {
     let input = "tests/pr/long_line.txt";
     let output = pr_read_test_file("tests/pr/long_line_output_w72.txt", input, None, None);
     pr_test(&["-2", "-t", "-w72", &input], "", &output);
@@ -203,7 +203,7 @@ fn test_pr_width() {
 }
 
 #[test]
-fn test_pr_number_line() {
+fn pr_number_line() {
     let input = "tests/pr/lorem_ipsum.txt";
     let output = pr_read_test_file(
         "tests/pr/lorem_ipsum_output_number_line.txt",
@@ -215,7 +215,7 @@ fn test_pr_number_line() {
 }
 
 #[test]
-fn test_pr_expand_and_replace() {
+fn pr_expand_and_replace() {
     let input = "tests/pr/spaces_and_tabs.txt";
     let output = pr_read_test_file(
         "tests/pr/spaces_and_tabs_expand_and_replace.txt",