From df618d60ea743660d67cda1022b9a4c75fce246b Mon Sep 17 00:00:00 2001
From: Nathan Ross <nross.se@gmail.com>
Date: Sun, 17 Jul 2016 12:56:11 -0400
Subject: [PATCH] tests: base64 minor refactor for dryness

---
 tests/test_base64.rs | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/tests/test_base64.rs b/tests/test_base64.rs
index 50579438d..d0b013990 100644
--- a/tests/test_base64.rs
+++ b/tests/test_base64.rs
@@ -6,8 +6,8 @@ static UTIL_NAME: &'static str = "base64";
 fn test_encode() {
     let (_, mut ucmd) = testing(UTIL_NAME);
     let input = "hello, world!";
-    ucmd.run_piped_stdin(input.as_bytes())
-        .success()
+    ucmd.pipe_in(input)
+        .succeeds()
         .stdout_only("aGVsbG8sIHdvcmxkIQ==\n");
 }
 
@@ -16,8 +16,9 @@ fn test_decode() {
     for decode_param in vec!["-d", "--decode"] {
         let (_, mut ucmd) = testing(UTIL_NAME);
         let input = "aGVsbG8sIHdvcmxkIQ==";
-        ucmd.arg(decode_param).run_piped_stdin(input.as_bytes())
-            .success()
+        ucmd.arg(decode_param)
+            .pipe_in(input)
+            .succeeds()
             .stdout_only("hello, world!");
     }
 }
@@ -26,8 +27,9 @@ fn test_decode() {
 fn test_garbage() {
     let (_, mut ucmd) = testing(UTIL_NAME);
     let input = "aGVsbG8sIHdvcmxkIQ==\0";
-    ucmd.arg("-d").run_piped_stdin(input.as_bytes())
-        .failure()
+    ucmd.arg("-d")
+        .pipe_in(input)
+        .fails()
         .stderr_only("base64: error: invalid character (Invalid character '0' at position 20)\n");
 }
 
@@ -36,8 +38,9 @@ fn test_ignore_garbage() {
     for ignore_garbage_param in vec!["-i", "--ignore-garbage"] {
         let (_, mut ucmd) = testing(UTIL_NAME);
         let input = "aGVsbG8sIHdvcmxkIQ==\0";
-        ucmd.arg("-d").arg(ignore_garbage_param).run_piped_stdin(input.as_bytes())
-            .success()
+        ucmd.arg("-d").arg(ignore_garbage_param)
+            .pipe_in(input)
+            .succeeds()
             .stdout_only("hello, world!");
     }
 }
@@ -47,8 +50,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.";
-        ucmd.arg(wrap_param).arg("20").run_piped_stdin(input.as_bytes())
-            .success()
+        ucmd.arg(wrap_param).arg("20")
+            .pipe_in(input)
+            .succeeds()
             .stdout_only("VGhlIHF1aWNrIGJyb3du\nIGZveCBqdW1wcyBvdmVy\nIHRoZSBsYXp5IGRvZy4=\n");
     }
 }
@@ -57,8 +61,8 @@ fn test_wrap() {
 fn test_wrap_no_arg() {
     for wrap_param in vec!["-w", "--wrap"] {
         let (_, mut ucmd) = testing(UTIL_NAME);
-        ucmd.arg(wrap_param).run()
-            .failure()
+        ucmd.arg(wrap_param)
+            .fails()
             .stderr_only(
                 format!("base64: error: Argument to option '{}' missing.",
                         if wrap_param == "-w" { "w" } else { "wrap" }));
@@ -69,8 +73,8 @@ fn test_wrap_no_arg() {
 fn test_wrap_bad_arg() {
     for wrap_param in vec!["-w", "--wrap"] {
         let (_, mut ucmd) = testing(UTIL_NAME);
-        ucmd.arg(wrap_param).arg("b").run()
-            .failure()
+        ucmd.arg(wrap_param).arg("b")
+            .fails()
             .stderr_only("base64: error: Argument to option 'wrap' improperly formatted: invalid digit found in string");
     }
 }