From f22d724fc61d19bed97da81113a585638ea39d2b Mon Sep 17 00:00:00 2001
From: Nathan Ross <nross.se@gmail.com>
Date: Sun, 17 Jul 2016 02:44:16 -0400
Subject: [PATCH] base64: refactor tests to be more terse

---
 tests/test_base64.rs | 61 +++++++++++++++++---------------------------
 1 file changed, 23 insertions(+), 38 deletions(-)

diff --git a/tests/test_base64.rs b/tests/test_base64.rs
index ff3527eff..50579438d 100644
--- a/tests/test_base64.rs
+++ b/tests/test_base64.rs
@@ -6,11 +6,9 @@ static UTIL_NAME: &'static str = "base64";
 fn test_encode() {
     let (_, mut ucmd) = testing(UTIL_NAME);
     let input = "hello, world!";
-    let result = ucmd.run_piped_stdin(input.as_bytes());
-
-    assert_empty_stderr!(result);
-    assert!(result.success);
-    assert_eq!(result.stdout, "aGVsbG8sIHdvcmxkIQ==\n");
+    ucmd.run_piped_stdin(input.as_bytes())
+        .success()
+        .stdout_only("aGVsbG8sIHdvcmxkIQ==\n");
 }
 
 #[test]
@@ -18,11 +16,9 @@ fn test_decode() {
     for decode_param in vec!["-d", "--decode"] {
         let (_, mut ucmd) = testing(UTIL_NAME);
         let input = "aGVsbG8sIHdvcmxkIQ==";
-        let result = ucmd.arg(decode_param).run_piped_stdin(input.as_bytes());
-
-        assert_empty_stderr!(result);
-        assert!(result.success);
-        assert_eq!(result.stdout, "hello, world!");
+        ucmd.arg(decode_param).run_piped_stdin(input.as_bytes())
+            .success()
+            .stdout_only("hello, world!");
     }
 }
 
@@ -30,11 +26,9 @@ fn test_decode() {
 fn test_garbage() {
     let (_, mut ucmd) = testing(UTIL_NAME);
     let input = "aGVsbG8sIHdvcmxkIQ==\0";
-    let result = ucmd.arg("-d").run_piped_stdin(input.as_bytes());
-
-    assert!(!result.success);
-    assert_eq!(result.stderr,
-               "base64: error: invalid character (Invalid character '0' at position 20)\n");
+    ucmd.arg("-d").run_piped_stdin(input.as_bytes())
+        .failure()
+        .stderr_only("base64: error: invalid character (Invalid character '0' at position 20)\n");
 }
 
 #[test]
@@ -42,10 +36,9 @@ fn test_ignore_garbage() {
     for ignore_garbage_param in vec!["-i", "--ignore-garbage"] {
         let (_, mut ucmd) = testing(UTIL_NAME);
         let input = "aGVsbG8sIHdvcmxkIQ==\0";
-        let result = ucmd.arg("-d").arg(ignore_garbage_param).run_piped_stdin(input.as_bytes());
-        assert_empty_stderr!(result);
-        assert!(result.success);
-        assert_eq!(result.stdout, "hello, world!");
+        ucmd.arg("-d").arg(ignore_garbage_param).run_piped_stdin(input.as_bytes())
+            .success()
+            .stdout_only("hello, world!");
     }
 }
 
@@ -54,12 +47,9 @@ fn test_wrap() {
     for wrap_param in vec!["-w", "--wrap"] {
         let (_, mut ucmd) = testing(UTIL_NAME);
         let input = "The quick brown fox jumps over the lazy dog.";
-        let result = ucmd.arg(wrap_param).arg("20").run_piped_stdin(input.as_bytes());
-
-        assert_empty_stderr!(result);
-        assert!(result.success);
-        assert_eq!(result.stdout,
-                   "VGhlIHF1aWNrIGJyb3du\nIGZveCBqdW1wcyBvdmVy\nIHRoZSBsYXp5IGRvZy4=\n");
+        ucmd.arg(wrap_param).arg("20").run_piped_stdin(input.as_bytes())
+            .success()
+            .stdout_only("VGhlIHF1aWNrIGJyb3du\nIGZveCBqdW1wcyBvdmVy\nIHRoZSBsYXp5IGRvZy4=\n");
     }
 }
 
@@ -67,13 +57,11 @@ fn test_wrap() {
 fn test_wrap_no_arg() {
     for wrap_param in vec!["-w", "--wrap"] {
         let (_, mut ucmd) = testing(UTIL_NAME);
-        let result = ucmd.arg(wrap_param).run();
-
-        assert!(!result.success);
-        assert!(result.stdout.len() == 0);
-        assert_eq!(result.stderr.trim_right(),
-                   format!("base64: error: Argument to option '{}' missing.",
-                           if wrap_param == "-w" { "w" } else { "wrap" }));
+        ucmd.arg(wrap_param).run()
+            .failure()
+            .stderr_only(
+                format!("base64: error: Argument to option '{}' missing.",
+                        if wrap_param == "-w" { "w" } else { "wrap" }));
     }
 }
 
@@ -81,11 +69,8 @@ fn test_wrap_no_arg() {
 fn test_wrap_bad_arg() {
     for wrap_param in vec!["-w", "--wrap"] {
         let (_, mut ucmd) = testing(UTIL_NAME);
-        let result = ucmd.arg(wrap_param).arg("b").run();
-
-        assert!(!result.success);
-        assert!(result.stdout.len() == 0);
-        assert_eq!(result.stderr.trim_right(),
-                   "base64: error: Argument to option 'wrap' improperly formatted: invalid digit found in string");
+        ucmd.arg(wrap_param).arg("b").run()
+            .failure()
+            .stderr_only("base64: error: Argument to option 'wrap' improperly formatted: invalid digit found in string");
     }
 }