From 43d7c4f4ca47f06c259ec80c0fc7126222fa9fd3 Mon Sep 17 00:00:00 2001
From: Dan Davison <dandavison7@gmail.com>
Date: Sun, 21 Nov 2021 16:06:48 -0500
Subject: [PATCH] Update grep tests to use fake parent process command

---
 src/handlers/grep.rs | 561 ++++++++++++++++++++++++++-----------------
 1 file changed, 335 insertions(+), 226 deletions(-)

diff --git a/src/handlers/grep.rs b/src/handlers/grep.rs
index c11ad9c8f..25c41614d 100644
--- a/src/handlers/grep.rs
+++ b/src/handlers/grep.rs
@@ -423,64 +423,83 @@ pub fn _parse_grep_line<'b>(regex: &Regex, line: &'b str) -> Option<GrepLine<'b>
 #[cfg(test)]
 mod tests {
     use crate::handlers::grep::{parse_grep_line, GrepLine, LineType};
+    use crate::utils::process::tests::cfg;
 
     #[test]
     fn test_parse_grep_match() {
-        assert_eq!(
-            parse_grep_line("src/co-7-fig.rs:xxx"),
-            Some(GrepLine {
-                path: "src/co-7-fig.rs".into(),
-                line_number: None,
-                line_type: LineType::Match,
-                code: "xxx".into(),
-                submatches: None,
-            })
-        );
-        assert_eq!(
-            parse_grep_line("src/config.rs:use crate::minusplus::MinusPlus;"),
-            Some(GrepLine {
-                path: "src/config.rs".into(),
-                line_number: None,
-                line_type: LineType::Match,
-                code: "use crate::minusplus::MinusPlus;".into(),
-                submatches: None,
-            })
-        );
-        assert_eq!(
-            parse_grep_line(
-                "src/config.rs:    pub line_numbers_style_minusplus: MinusPlus<Style>,"
-            ),
-            Some(GrepLine {
-                path: "src/config.rs".into(),
-                line_number: None,
-                line_type: LineType::Match,
-                code: "    pub line_numbers_style_minusplus: MinusPlus<Style>,".into(),
-                submatches: None,
-            })
-        );
-        assert_eq!(
-            parse_grep_line("src/con-fig.rs:use crate::minusplus::MinusPlus;"),
-            Some(GrepLine {
-                path: "src/con-fig.rs".into(),
-                line_number: None,
-                line_type: LineType::Match,
-                code: "use crate::minusplus::MinusPlus;".into(),
-                submatches: None,
-            })
-        );
-        assert_eq!(
-            parse_grep_line(
-                "src/con-fig.rs:    pub line_numbers_style_minusplus: MinusPlus<Style>,"
-            ),
-            Some(GrepLine {
-                path: "src/con-fig.rs".into(),
-                line_number: None,
-                line_type: LineType::Match,
-                code: "    pub line_numbers_style_minusplus: MinusPlus<Style>,".into(),
-                submatches: None,
-            })
-        );
-        assert_eq!(
+        let fake_parent_grep_command = "git --doesnt-matter grep --nor-this nor_this -- nor_this";
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line("src/co-7-fig.rs:xxx"),
+                Some(GrepLine {
+                    path: "src/co-7-fig.rs".into(),
+                    line_number: None,
+                    line_type: LineType::Match,
+                    code: "xxx".into(),
+                    submatches: None,
+                })
+            );
+        }
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line("src/config.rs:use crate::minusplus::MinusPlus;"),
+                Some(GrepLine {
+                    path: "src/config.rs".into(),
+                    line_number: None,
+                    line_type: LineType::Match,
+                    code: "use crate::minusplus::MinusPlus;".into(),
+                    submatches: None,
+                })
+            );
+        }
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line(
+                    "src/config.rs:    pub line_numbers_style_minusplus: MinusPlus<Style>,"
+                ),
+                Some(GrepLine {
+                    path: "src/config.rs".into(),
+                    line_number: None,
+                    line_type: LineType::Match,
+                    code: "    pub line_numbers_style_minusplus: MinusPlus<Style>,".into(),
+                    submatches: None,
+                })
+            );
+        }
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line("src/con-fig.rs:use crate::minusplus::MinusPlus;"),
+                Some(GrepLine {
+                    path: "src/con-fig.rs".into(),
+                    line_number: None,
+                    line_type: LineType::Match,
+                    code: "use crate::minusplus::MinusPlus;".into(),
+                    submatches: None,
+                })
+            );
+        }
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line(
+                    "src/con-fig.rs:    pub line_numbers_style_minusplus: MinusPlus<Style>,"
+                ),
+                Some(GrepLine {
+                    path: "src/con-fig.rs".into(),
+                    line_number: None,
+                    line_type: LineType::Match,
+                    code: "    pub line_numbers_style_minusplus: MinusPlus<Style>,".into(),
+                    submatches: None,
+                })
+            );
+        }
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
             parse_grep_line(
                 "src/de lta.rs:pub fn delta<I>(lines: ByteLines<I>, writer: &mut dyn Write, config: &Config) -> std::io::Result<()>"
             ),
@@ -492,7 +511,10 @@ mod tests {
                 submatches: None,
             })
         );
-        assert_eq!(
+        }
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
             parse_grep_line(
                 "src/de lta.rs:    pub fn new(writer: &'a mut dyn Write, config: &'a Config) -> Self {"
             ),
@@ -504,65 +526,82 @@ mod tests {
                 submatches: None,
             })
         );
+        }
     }
 
     #[test]
     fn test_parse_grep_n_match() {
-        // git grep -n
-        assert_eq!(
-            parse_grep_line("src/co-7-fig.rs:7:xxx"),
-            Some(GrepLine {
-                path: "src/co-7-fig.rs".into(),
-                line_number: Some(7),
-                line_type: LineType::Match,
-                code: "xxx".into(),
-                submatches: None,
-            })
-        );
-        assert_eq!(
-            parse_grep_line("src/config.rs:21:use crate::minusplus::MinusPlus;"),
-            Some(GrepLine {
-                path: "src/config.rs".into(),
-                line_number: Some(21),
-                line_type: LineType::Match,
-                code: "use crate::minusplus::MinusPlus;".into(),
-                submatches: None,
-            })
-        );
-        assert_eq!(
-            parse_grep_line(
-                "src/config.rs:95:    pub line_numbers_style_minusplus: MinusPlus<Style>,"
-            ),
-            Some(GrepLine {
-                path: "src/config.rs".into(),
-                line_number: Some(95),
-                line_type: LineType::Match,
-                code: "    pub line_numbers_style_minusplus: MinusPlus<Style>,".into(),
-                submatches: None,
-            })
-        );
-        assert_eq!(
-            parse_grep_line("Makefile:10:test: unit-test end-to-end-test"),
-            Some(GrepLine {
-                path: "Makefile".into(),
-                line_number: Some(10),
-                line_type: LineType::Match,
-                code: "test: unit-test end-to-end-test".into(),
-                submatches: None,
-            })
-        );
-        assert_eq!(
-            parse_grep_line(
-                "Makefile:16:    ./tests/test_raw_output_matches_git_on_full_repo_history"
-            ),
-            Some(GrepLine {
-                path: "Makefile".into(),
-                line_number: Some(16),
-                line_type: LineType::Match,
-                code: "    ./tests/test_raw_output_matches_git_on_full_repo_history".into(),
-                submatches: None,
-            })
-        );
+        let fake_parent_grep_command =
+            "/usr/local/bin/git --doesnt-matter grep --nor-this nor_this -- nor_this";
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line("src/co-7-fig.rs:7:xxx"),
+                Some(GrepLine {
+                    path: "src/co-7-fig.rs".into(),
+                    line_number: Some(7),
+                    line_type: LineType::Match,
+                    code: "xxx".into(),
+                    submatches: None,
+                })
+            );
+        }
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line("src/config.rs:21:use crate::minusplus::MinusPlus;"),
+                Some(GrepLine {
+                    path: "src/config.rs".into(),
+                    line_number: Some(21),
+                    line_type: LineType::Match,
+                    code: "use crate::minusplus::MinusPlus;".into(),
+                    submatches: None,
+                })
+            );
+        }
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line(
+                    "src/config.rs:95:    pub line_numbers_style_minusplus: MinusPlus<Style>,"
+                ),
+                Some(GrepLine {
+                    path: "src/config.rs".into(),
+                    line_number: Some(95),
+                    line_type: LineType::Match,
+                    code: "    pub line_numbers_style_minusplus: MinusPlus<Style>,".into(),
+                    submatches: None,
+                })
+            );
+        }
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line("Makefile:10:test: unit-test end-to-end-test"),
+                Some(GrepLine {
+                    path: "Makefile".into(),
+                    line_number: Some(10),
+                    line_type: LineType::Match,
+                    code: "test: unit-test end-to-end-test".into(),
+                    submatches: None,
+                })
+            );
+        }
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line(
+                    "Makefile:16:    ./tests/test_raw_output_matches_git_on_full_repo_history"
+                ),
+                Some(GrepLine {
+                    path: "Makefile".into(),
+                    line_number: Some(16),
+                    line_type: LineType::Match,
+                    code: "    ./tests/test_raw_output_matches_git_on_full_repo_history".into(),
+                    submatches: None,
+                })
+            );
+        }
     }
 
     #[test]
@@ -570,153 +609,223 @@ mod tests {
     fn test_parse_grep_n_match_file_name_with_dashes_and_no_extension() {
         // git grep -n
         // This fails: we can't parse it currently.
-        assert_eq!(
-            parse_grep_line("etc/examples/119-within-line-edits:4:repo=$(mktemp -d)"),
-            Some(GrepLine {
-                path: "etc/examples/119-within-line-edits".into(),
-                line_number: Some(4),
-                line_type: LineType::Match,
-                code: "repo=$(mktemp -d)".into(),
-                submatches: None,
-            })
-        );
+        let fake_parent_grep_command =
+            "/usr/local/bin/git --doesnt-matter grep --nor-this nor_this -- nor_this";
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line("etc/examples/119-within-line-edits:4:repo=$(mktemp -d)"),
+                Some(GrepLine {
+                    path: "etc/examples/119-within-line-edits".into(),
+                    line_number: Some(4),
+                    line_type: LineType::Match,
+                    code: "repo=$(mktemp -d)".into(),
+                    submatches: None,
+                })
+            );
+        }
     }
 
     #[test]
     fn test_parse_grep_no_match() {
-        assert_eq!(
-            parse_grep_line("src/co-7-fig.rs-xxx"),
-            Some(GrepLine {
-                path: "src/co-7-fig.rs".into(),
-                line_number: None,
-                line_type: LineType::Context,
-                code: "xxx".into(),
-                submatches: None,
-            })
-        );
-        assert_eq!(
-            parse_grep_line("src/config.rs-    pub available_terminal_width: usize,"),
-            Some(GrepLine {
-                path: "src/config.rs".into(),
-                line_number: None,
-                line_type: LineType::Context,
-                code: "    pub available_terminal_width: usize,".into(),
-                submatches: None,
-            })
-        );
-        assert_eq!(
-            parse_grep_line("src/con-fig.rs-use crate::minusplus::MinusPlus;"),
-            Some(GrepLine {
-                path: "src/con-fig.rs".into(),
-                line_number: None,
-                line_type: LineType::Context,
-                code: "use crate::minusplus::MinusPlus;".into(),
-                submatches: None,
-            })
-        );
-        assert_eq!(
-            parse_grep_line("de-lta.rs-            if self.source == Source::Unknown {"),
-            Some(GrepLine {
-                path: "de-lta.rs".into(),
-                line_number: None,
-                line_type: LineType::Context,
-                code: "            if self.source == Source::Unknown {".into(),
-                submatches: None,
-            })
-        );
+        let fake_parent_grep_command =
+            "/usr/local/bin/git --doesnt-matter grep --nor-this nor_this -- nor_this";
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line("src/co-7-fig.rs-xxx"),
+                Some(GrepLine {
+                    path: "src/co-7-fig.rs".into(),
+                    line_number: None,
+                    line_type: LineType::Context,
+                    code: "xxx".into(),
+                    submatches: None,
+                })
+            );
+        }
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line("src/config.rs-    pub available_terminal_width: usize,"),
+                Some(GrepLine {
+                    path: "src/config.rs".into(),
+                    line_number: None,
+                    line_type: LineType::Context,
+                    code: "    pub available_terminal_width: usize,".into(),
+                    submatches: None,
+                })
+            );
+        }
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line("src/con-fig.rs-use crate::minusplus::MinusPlus;"),
+                Some(GrepLine {
+                    path: "src/con-fig.rs".into(),
+                    line_number: None,
+                    line_type: LineType::Context,
+                    code: "use crate::minusplus::MinusPlus;".into(),
+                    submatches: None,
+                })
+            );
+        }
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line("de-lta.rs-            if self.source == Source::Unknown {"),
+                Some(GrepLine {
+                    path: "de-lta.rs".into(),
+                    line_number: None,
+                    line_type: LineType::Context,
+                    code: "            if self.source == Source::Unknown {".into(),
+                    submatches: None,
+                })
+            );
+        }
     }
 
     #[test]
     fn test_parse_grep_n_no_match() {
         // git grep -n
-        assert_eq!(
-            parse_grep_line("src/co-7-fig.rs-7-xxx"),
-            Some(GrepLine {
-                path: "src/co-7-fig.rs".into(),
-                line_number: Some(7),
-                line_type: LineType::Context,
-                code: "xxx".into(),
-                submatches: None,
-            })
-        );
-        assert_eq!(
-            parse_grep_line("src/config.rs-58-    pub available_terminal_width: usize,"),
-            Some(GrepLine {
-                path: "src/config.rs".into(),
-                line_number: Some(58),
-                line_type: LineType::Context,
-                code: "    pub available_terminal_width: usize,".into(),
-                submatches: None,
-            })
-        );
+        let fake_parent_grep_command =
+            "/usr/local/bin/git --doesnt-matter grep --nor-this nor_this -- nor_this";
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line("src/co-7-fig.rs-7-xxx"),
+                Some(GrepLine {
+                    path: "src/co-7-fig.rs".into(),
+                    line_number: Some(7),
+                    line_type: LineType::Context,
+                    code: "xxx".into(),
+                    submatches: None,
+                })
+            );
+        }
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line("src/config.rs-58-    pub available_terminal_width: usize,"),
+                Some(GrepLine {
+                    path: "src/config.rs".into(),
+                    line_number: Some(58),
+                    line_type: LineType::Context,
+                    code: "    pub available_terminal_width: usize,".into(),
+                    submatches: None,
+                })
+            );
+        }
     }
 
     #[test]
     fn test_parse_grep_match_no_extension() {
-        assert_eq!(
-            parse_grep_line("Makefile:xxx"),
-            Some(GrepLine {
-                path: "Makefile".into(),
-                line_number: None,
-                line_type: LineType::Match,
-                code: "xxx".into(),
-                submatches: None,
-            })
-        );
+        let fake_parent_grep_command =
+            "/usr/local/bin/git --doesnt-matter grep --nor-this nor_this -- nor_this";
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line("Makefile:xxx"),
+                Some(GrepLine {
+                    path: "Makefile".into(),
+                    line_number: None,
+                    line_type: LineType::Match,
+                    code: "xxx".into(),
+                    submatches: None,
+                })
+            );
+        }
     }
 
     #[test]
     fn test_parse_grep_n_match_no_extension() {
         // git grep -n
-        assert_eq!(
-            parse_grep_line("Makefile:7:xxx"),
-            Some(GrepLine {
-                path: "Makefile".into(),
-                line_number: Some(7),
-                line_type: LineType::Match,
-                code: "xxx".into(),
-                submatches: None,
-            })
-        );
+        let fake_parent_grep_command =
+            "/usr/local/bin/grep --doesnt-matter --nor-this nor_this -- nor_this";
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line("Makefile:7:xxx"),
+                Some(GrepLine {
+                    path: "Makefile".into(),
+                    line_number: Some(7),
+                    line_type: LineType::Match,
+                    code: "xxx".into(),
+                    submatches: None,
+                })
+            );
+        }
     }
 
     #[test]
     #[allow(non_snake_case)]
     fn test_parse_grep_W_context_header() {
         // git grep -W
-        assert_eq!(
-            parse_grep_line("src/config.rs=pub struct Config {"), // match
-            Some(GrepLine {
-                path: "src/config.rs".into(),
-                line_number: None,
-                line_type: LineType::ContextHeader,
-                code: "pub struct Config {".into(),
-                submatches: None,
-            })
-        );
+        let fake_parent_grep_command =
+            "/usr/local/bin/git --doesnt-matter grep --nor-this nor_this -- nor_this";
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line("src/config.rs=pub struct Config {"), // match
+                Some(GrepLine {
+                    path: "src/config.rs".into(),
+                    line_number: None,
+                    line_type: LineType::ContextHeader,
+                    code: "pub struct Config {".into(),
+                    submatches: None,
+                })
+            );
+        }
     }
 
     #[test]
     #[allow(non_snake_case)]
     fn test_parse_grep_W_n_context_header() {
         // git grep -n -W
-        assert_eq!(
-            parse_grep_line("src/config.rs=57=pub struct Config {"),
-            Some(GrepLine {
-                path: "src/config.rs".into(),
-                line_number: Some(57),
-                line_type: LineType::ContextHeader,
-                code: "pub struct Config {".into(),
-                submatches: None,
-            })
-        );
+        let fake_parent_grep_command =
+            "/usr/local/bin/git --doesnt-matter grep --nor-this nor_this -- nor_this";
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            assert_eq!(
+                parse_grep_line("src/config.rs=57=pub struct Config {"),
+                Some(GrepLine {
+                    path: "src/config.rs".into(),
+                    line_number: Some(57),
+                    line_type: LineType::ContextHeader,
+                    code: "pub struct Config {".into(),
+                    submatches: None,
+                })
+            );
+        }
     }
 
     #[test]
-    fn test_parse_grep_negative_cases() {
-        assert_eq!(
-            parse_grep_line("|       expose it in delta's color output styled with grep:"),
-            None
-        );
+    fn test_parse_grep_not_grep_output() {
+        let fake_parent_grep_command =
+            "/usr/local/bin/git --doesnt-matter grep --nor-this nor_this -- nor_this";
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            let not_grep_output = "|       expose it in delta's color output styled with grep:";
+            assert_eq!(parse_grep_line(not_grep_output), None);
+        }
+    }
+
+    #[test]
+    fn test_parse_grep_parent_command_is_not_grep_1() {
+        let fake_parent_grep_command =
+            "/usr/local/bin/notgrep --doesnt-matter --nor-this nor_this -- nor_this";
+        {
+            let _args = cfg::WithArgs::new(&fake_parent_grep_command);
+            let apparently_grep_output = "src/co-7-fig.rs:xxx";
+            assert_eq!(parse_grep_line(apparently_grep_output), None);
+        }
+    }
+
+    #[test]
+    fn test_parse_grep_parent_command_is_not_grep_2() {
+        {
+            // No fake parent grep command
+            let apparently_grep_output = "src/co-7-fig.rs:xxx";
+            assert_eq!(parse_grep_line(apparently_grep_output), None);
+        }
     }
 }