Fix up tests

Use predicates for better matching on stdout. Also use include_str
instead of having to update the load file output by hand.

Author: ian-h-chamberlain

tests/cli_test.rs

@@ -1,41 +1,9 @@
-use std::{fs, process::Command};
+use std::process::Command;
 
 use assert_cmd::prelude::*;
-use assert_fs::NamedTempFile;
-use indoc::indoc;
 use predicates::prelude::*;
 
-static EXPECTED_OUT: &str = indoc!(
-    "
-    MOV.I $0, $1
-    DAT.F $1, $2
-    MOV.I $1, $0
-    JMP.B $16, #0
-    JMP.B $1, #0
-    ADD.AB #1, @2
-    SUB.F $3, $4
-    MUL.F $5, $6
-    DIV.F $7, $8
-    MOD.F $9, $10
-    JMZ.B $0, #0
-    JMN.B $0, #0
-    DJN.B $0, #0
-    CMP.B $0, #0
-    SEQ.B $0, #0
-    SNE.B $0, #0
-    SLT.B $0, #0
-    SPL.B $0, #0
-    NOP.B $0, #0
-    MOV.A $1, $2
-    MOV.B $1, $2
-    MOV.AB $1, $2
-    MOV.BA $1, $2
-    MOV.F $1, $2
-    MOV.X $1, $2
-    MOV.I $1, $2
-    JMP.B $-7, #0
-    "
-);
+static EXPECTED_OUT: &str = include_str!("data/test_loadfile.red");
 
 #[test]
 fn help() {
@@ -73,12 +41,12 @@ fn dump_stdout() {
         .arg("-")
         .assert()
         .success()
-        .stdout(predicate::str::contains(EXPECTED_OUT));
+        .stdout(predicate::str::similar(EXPECTED_OUT));
 }
 
 #[test]
 fn dump_file() {
-    let out_file = NamedTempFile::new("out.red").expect("Failed to create tempfile");
+    let out_file = assert_fs::NamedTempFile::new("out.red").expect("Failed to create tempfile");
 
     Command::cargo_bin(assert_cmd::crate_name!())
         .unwrap()
@@ -90,6 +58,8 @@ fn dump_file() {
         .assert()
         .success();
 
-    let file_contents = fs::read_to_string(out_file.path()).expect("Failed to read output file");
-    assert_eq!(file_contents, EXPECTED_OUT);
+    assert!(predicate::str::similar(EXPECTED_OUT)
+        .from_utf8()
+        .from_file_path()
+        .eval(out_file.path()));
 }

tests/dump_test.rs

@@ -15,7 +15,7 @@ fn run_test(input: &str, expected_output: &str) {
     eprintln!("Loaded core:");
     dbg!(&parsed_core);
 
-    assert_eq!(format!("{}", parsed_core), expected_output);
+    assert_eq!(parsed_core.to_string(), expected_output);
 }
 
 #[test]