tests ~ refactor real{link,path} tests for easier diagnosis of failures

tests/test_readlink.rs

@@ -6,29 +6,31 @@ static GIBBERISH: &'static str = "supercalifragilisticexpialidocious";
 #[test]
 fn test_canonicalize() {
     let (at, mut ucmd) = at_and_ucmd!();
-    ucmd.arg("-f")
-        .arg(".")
-        .run()
-        .stdout_is(at.root_dir_resolved() + "\n");
+    let actual = ucmd.arg("-f").arg(".").run().stdout;
+    let expect = at.root_dir_resolved() + "\n";
+    println!("actual: {:?}", actual);
+    println!("expect: {:?}", expect);
+    assert_eq!(actual, expect);
 }
 
 #[test]
 fn test_canonicalize_existing() {
     let (at, mut ucmd) = at_and_ucmd!();
-    ucmd.arg("-e")
-        .arg(".")
-        .run()
-        .stdout_is(at.root_dir_resolved() + "\n");
+    let actual = ucmd.arg("-e").arg(".").run().stdout;
+    let expect = at.root_dir_resolved() + "\n";
+    println!("actual: {:?}", actual);
+    println!("expect: {:?}", expect);
+    assert_eq!(actual, expect);
 }
 
 #[test]
 fn test_canonicalize_missing() {
     let (at, mut ucmd) = at_and_ucmd!();
-    let expected = path_concat!(at.root_dir_resolved(), GIBBERISH);
-    ucmd.arg("-m")
-        .arg(GIBBERISH)
-        .run()
-        .stdout_is(expected + "\n");
+    let actual = ucmd.arg("-m").arg(GIBBERISH).run().stdout;
+    let expect = path_concat!(at.root_dir_resolved(), GIBBERISH) + "\n";
+    println!("actual: {:?}", actual);
+    println!("expect: {:?}", expect);
+    assert_eq!(actual, expect);
 }
 
 #[test]
@@ -36,21 +38,20 @@ fn test_long_redirection_to_current_dir() {
     let (at, mut ucmd) = at_and_ucmd!();
     // Create a 256-character path to current directory
     let dir = path_concat!(".", ..128);
-    ucmd.arg("-n")
-        .arg("-m")
-        .arg(dir)
-        .run()
-        .stdout_is(at.root_dir_resolved());
+    let actual = ucmd.arg("-n").arg("-m").arg(dir).run().stdout;
+    let expect = at.root_dir_resolved();
+    println!("actual: {:?}", actual);
+    println!("expect: {:?}", expect);
+    assert_eq!(actual, expect);
 }
 
 #[test]
 fn test_long_redirection_to_root() {
     // Create a 255-character path to root
     let dir = path_concat!("..", ..85);
-    new_ucmd!()
-        .arg("-n")
-        .arg("-m")
-        .arg(dir)
-        .run()
-        .stdout_is(get_root_path());
+    let actual = new_ucmd!().arg("-n").arg("-m").arg(dir).run().stdout;
+    let expect = get_root_path();
+    println!("actual: {:?}", actual);
+    println!("expect: {:?}", expect);
+    assert_eq!(actual, expect);
 }

tests/test_realpath.rs

@@ -4,7 +4,11 @@ use common::util::*;
 #[test]
 fn test_current_directory() {
     let (at, mut ucmd) = at_and_ucmd!();
-    ucmd.arg(".").run().stdout_is(at.root_dir_resolved() + "\n");
+    let actual = ucmd.arg(".").run().stdout;
+    let expect = at.root_dir_resolved() + "\n";
+    println!("actual: {:?}", actual);
+    println!("expect: {:?}", expect);
+    assert_eq!(actual, expect);
 }
 
 #[test]
@@ -12,12 +16,20 @@ fn test_long_redirection_to_current_dir() {
     let (at, mut ucmd) = at_and_ucmd!();
     // Create a 256-character path to current directory
     let dir = path_concat!(".", ..128);
-    ucmd.arg(dir).run().stdout_is(at.root_dir_resolved() + "\n");
+    let actual = ucmd.arg(dir).run().stdout;
+    let expect = at.root_dir_resolved() + "\n";
+    println!("actual: {:?}", actual);
+    println!("expect: {:?}", expect);
+    assert_eq!(actual, expect);
 }
 
 #[test]
 fn test_long_redirection_to_root() {
     // Create a 255-character path to root
     let dir = path_concat!("..", ..85);
-    new_ucmd!().arg(dir).run().stdout_is(get_root_path().to_owned() + "\n");
+    let actual = new_ucmd!().arg(dir).run().stdout;
+    let expect = get_root_path().to_owned() + "\n";
+    println!("actual: {:?}", actual);
+    println!("expect: {:?}", expect);
+    assert_eq!(actual, expect);
 }