From 02ceb0ba8c0f82cefaaa531aec06c12dc0400525 Mon Sep 17 00:00:00 2001
From: liv <liv@fastmail.com>
Date: Fri, 15 Feb 2019 12:06:05 +0100
Subject: [PATCH] fix test command execution

seems like i forgot that you actually need to run executables created
with `rustc --test`! this also reworks the "test1" exercise a bit

closes #108
---
 exercises/test1.rs | 17 +++++++++--------
 src/verify.rs      | 31 ++++++++++++++++++++++++-------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/exercises/test1.rs b/exercises/test1.rs
index f52513dd..a4778187 100644
--- a/exercises/test1.rs
+++ b/exercises/test1.rs
@@ -5,16 +5,17 @@
 
 // Mary is buying apples. One apple usually costs 2 dollars, but if you buy
 // more than 40 at once, each apple only costs 1! Write a function that calculates
-// the price of an order of apples given the order amount.
+// the price of an order of apples given the order amount. No hints this time!
 
-fn main() {
+// Put your function here!
+// fn ..... {
+
+// Don't modify this function!
+#[test]
+fn verify_test() {
     let price1 = calculateprice(55);
     let price2 = calculateprice(40);
 
-    // Don't modify this!
-    if price1 == 55 && price2 == 80 {
-        println!("Good job!");
-    } else {
-        panic!("Uh oh! Wrong price!");
-    }
+    assert_eq!(price1, 55);
+    assert_eq!(price2, 80);
 }
diff --git a/src/verify.rs b/src/verify.rs
index eb609ab3..f0c749a9 100644
--- a/src/verify.rs
+++ b/src/verify.rs
@@ -14,7 +14,7 @@ pub fn verify() -> Result<(), ()> {
     compile_only("exercises/functions/functions3.rs")?;
     compile_only("exercises/functions/functions4.rs")?;
     compile_only("exercises/functions/functions5.rs")?;
-    compile_only("exercises/test1.rs")?;
+    test("exercises/test1.rs")?;
     compile_only("exercises/primitive_types/primitive_types1.rs")?;
     compile_only("exercises/primitive_types/primitive_types2.rs")?;
     compile_only("exercises/primitive_types/primitive_types3.rs")?;
@@ -87,19 +87,36 @@ pub fn test(filename: &str) -> Result<(), ()> {
         .args(&["--test", filename, "-o", "temp", "--color", "always"])
         .output()
         .expect("fail");
-    bar.finish_and_clear();
     if testcmd.status.success() {
-        let formatstr = format!("{} Successfully tested {}!", Emoji("✅", "✓"), filename);
-        println!("{}", style(formatstr).green());
-        clean();
-        Ok(())
+        bar.set_message(format!("Running {}...", filename).as_str());
+        let runcmd = Command::new("./temp").output().expect("fail");
+        bar.finish_and_clear();
+
+        if runcmd.status.success() {
+            let formatstr = format!("{} Successfully tested {}!", Emoji("✅", "✓"), filename);
+            println!("{}", style(formatstr).green());
+            clean();
+            Ok(())
+        } else {
+            let formatstr = format!(
+                "{} Testing of {} failed! Please try again. Here's the output:",
+                Emoji("⚠️ ", "!"),
+                filename
+            );
+            println!("{}", style(formatstr).red());
+            println!("{}", String::from_utf8_lossy(&runcmd.stdout));
+            clean();
+            Err(())
+        }
     } else {
+        bar.finish_and_clear();
         let formatstr = format!(
-            "{} Testing of {} failed! Please try again.",
+            "{} Compiling of {} failed! Please try again. Here's the output:",
             Emoji("⚠️ ", "!"),
             filename
         );
         println!("{}", style(formatstr).red());
+        println!("{}", String::from_utf8_lossy(&testcmd.stderr));
         clean();
         Err(())
     }