Clean up: move tests, change variable name

1 files changed, 3 insertions, 98 deletions

diff --git a/src/main.rs b/src/main.rs
index 7a29808b..acf4e7bd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -48,15 +48,15 @@ fn main() -> std::io::Result<()> {
         process::exit(0);
     }
 
-    let paint_config = cli::process_command_line_arguments(&assets, &opt);
+    let config = cli::process_command_line_arguments(&assets, &opt);
 
     let mut output_type =
-        OutputType::from_mode(PagingMode::QuitIfOneScreen, Some(paint_config.pager)).unwrap();
+        OutputType::from_mode(PagingMode::QuitIfOneScreen, Some(config.pager)).unwrap();
     let mut writer = output_type.handle().unwrap();
 
     match delta(
         io::stdin().lock().lines().map(|l| l.unwrap()),
-        &paint_config,
+        &config,
         &assets,
         &mut writer,
     ) {
@@ -138,98 +138,3 @@ pub fn list_themes() -> std::io::Result<()> {
     }
     Ok(())
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    use console::strip_ansi_codes;
-
-    #[test]
-    fn test_added_file() {
-        let input = "\
-commit d28dc1ac57e53432567ec5bf19ad49ff90f0f7a5
-Author: Dan Davison <dandavison7@gmail.com>
-Date:   Thu Jul 11 10:41:11 2019 -0400
-
-    .
-
-diff --git a/a.py b/a.py
-new file mode 100644
-index 0000000..8c55b7d
---- /dev/null
-+++ b/a.py
-@@ -0,0 +1,3 @@
-+# hello
-+class X:
-+    pass";
-
-        let expected_output = "\
-commit d28dc1ac57e53432567ec5bf19ad49ff90f0f7a5
-Author: Dan Davison <dandavison7@gmail.com>
-Date:   Thu Jul 11 10:41:11 2019 -0400
-
-    .
-
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-added: a.py
-━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-────────────────────────────────────────────────────────────────────────────────
-
-────────────────────────────────────────────────────────────────────────────────
- # hello
- class X:
-     pass
-";
-
-        let mut opt = cli::Opt::from_args();
-        opt.width = Some("variable".to_string());
-        let assets = HighlightingAssets::new();
-        let paint_config = cli::process_command_line_arguments(&assets, &opt);
-        let mut writer: Vec<u8> = Vec::new();
-        delta(
-            input.split("\n").map(String::from),
-            &paint_config,
-            &assets,
-            &mut writer,
-        )
-        .unwrap();
-        let output = strip_ansi_codes(&String::from_utf8(writer).unwrap()).to_string();
-        assert!(output.contains("\nadded: a.py\n"));
-        if false {
-            // TODO: hline width
-            assert_eq!(output, expected_output);
-        }
-    }
-
-    #[test]
-    fn test_renamed_file() {
-        let input = "\
-commit 1281650789680f1009dfff2497d5ccfbe7b96526
-Author: Dan Davison <dandavison7@gmail.com>
-Date:   Wed Jul 17 20:40:23 2019 -0400
-
-    rename
-
-diff --git a/a.py b/b.py
-similarity index 100%
-rename from a.py
-rename to b.py
-";
-
-        let mut opt = cli::Opt::from_args();
-        opt.width = Some("variable".to_string());
-        let assets = HighlightingAssets::new();
-        let paint_config = cli::process_command_line_arguments(&assets, &opt);
-        let mut writer: Vec<u8> = Vec::new();
-        delta(
-            input.split("\n").map(String::from),
-            &paint_config,
-            &assets,
-            &mut writer,
-        )
-        .unwrap();
-        let output = strip_ansi_codes(&String::from_utf8(writer).unwrap()).to_string();
-        assert!(output.contains("\nrenamed: a.py ⟶   b.py\n"));
-    }
-}