Use tesutils in tests

Author: ian-h-chamberlain

Cargo.lock

@@ -13,5 +13,6 @@ structopt = "0.3.5"
 
 [dev-dependencies]
 assert_cmd = "0.11.1"
-predicates = "1.0.2"
 assert_fs = "0.13.1"
+predicates = "1.0.2"
+testutils = { path = "testutils" }

Cargo.toml

@@ -58,8 +58,10 @@ fn dump_file() {
         .assert()
         .success();
 
-    assert!(predicate::str::similar(EXPECTED_OUT)
-        .from_utf8()
-        .from_file_path()
-        .eval(out_file.path()));
+    testutils::assert_that!(
+        out_file.path(),
+        predicate::str::similar(EXPECTED_OUT)
+            .from_utf8()
+            .from_file_path(),
+    );
 }

tests/cli_test.rs

@@ -1,21 +1,18 @@
 extern crate corewa_rs;
 
-fn run_test(input: &str, expected_output: &str) {
-    eprintln!("Parsing warrior:");
-    eprintln!("{}", input);
-
+fn run_test(input: &str, expected_output: &'static str) {
     let mut parsed_core = corewa_rs::parse(input).unwrap_or_else(|e| panic!("Parse error:\n{}", e));
+
+    // TODO: dump and check output of pre-resolved core
     parsed_core
         .result
         .resolve()
         .unwrap_or_else(|e| panic!("{}", e));
 
-    // TODO: dump and check output of pre-resolved core
-
-    eprintln!("Loaded core:");
-    dbg!(&parsed_core);
-
-    assert_eq!(parsed_core.to_string(), expected_output);
+    testutils::assert_that!(
+        &parsed_core.to_string(),
+        predicates::str::similar(expected_output),
+    );
 }
 
 #[test]