test: mv shared functions to utils; split compare to own test file

Author: zjp-CN

tests/compare.rs

@@ -0,0 +1,56 @@
+use distributed_verification::SerFunction;
+use std::fs::{copy, remove_file};
+
+mod utils;
+use utils::{assert_eq, cmd, expect_file};
+
+fn get(text: &str, start: &str) -> SerFunction {
+    let json = &text[text.find("[\n").unwrap()..];
+    let v: Vec<SerFunction> = serde_json::from_str(json).unwrap();
+    v.into_iter().find(|f| f.func.starts_with(start)).unwrap()
+}
+
+#[test]
+fn compare_proof() {
+    let file = "tests/compare/proof.rs";
+
+    copy("tests/compare/proof1.rs", file).unwrap();
+    let text1 = &cmd(&["tests/compare/proof.rs"]);
+    expect_file!["./snapshots/proof1.json"].assert_eq(text1);
+
+    // Add another proof won't affact the previous one.
+    copy("tests/compare/proof2.rs", file).unwrap();
+    let text2 = &cmd(&["tests/compare/proof.rs"]);
+    expect_file!["./snapshots/proof2.json"].assert_eq(text2);
+
+    remove_file(file).unwrap();
+
+    let f = "pub fn f()";
+    // For the same proof (w.r.t same path and body),
+    // the hash value must be the same.
+    assert_eq!(get(text1, f).hash, get(text2, f).hash);
+}
+
+#[test]
+fn compare_contract() {
+    let file = "tests/compare/contract.rs";
+
+    copy("tests/compare/contract1.rs", file).unwrap();
+    let text1 = &cmd(&["tests/compare/contract.rs"]);
+    expect_file!["./snapshots/contract1.json"].assert_eq(text1);
+
+    copy("tests/compare/contract2.rs", file).unwrap();
+    let text2 = &cmd(&["tests/compare/contract.rs"]);
+    expect_file!["./snapshots/contract2.json"].assert_eq(text2);
+
+    remove_file(file).unwrap();
+
+    let f = "pub fn f()";
+    let f1 = get(text1, f);
+    let f2 = get(text2, f);
+    let callees1 = f1.callee_sorted_by_file_func();
+    let callees2 = f2.callee_sorted_by_file_func();
+
+    assert_eq!(callees1, callees2);
+    assert_eq!(f1.hash, f2.hash);
+}

tests/snapshots.rs

@@ -1,21 +1,5 @@
-use assert_cmd::Command;
-use distributed_verification::SerFunction;
-use expect_test::expect_file;
-use pretty_assertions::assert_eq;
-use std::fs::{copy, remove_file};
-
-fn cmd(args: &[&str]) -> String {
-    let mut command = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
-    command.env("RUST_LOG", "off").args(args);
-    let output = command.output().unwrap();
-    assert!(
-        output.status.success(),
-        "Failed to test standard_proof.rs:\n{}",
-        std::str::from_utf8(&output.stderr).unwrap()
-    );
-
-    String::from_utf8(output.stdout).unwrap()
-}
+mod utils;
+use utils::*;
 
 #[test]
 fn standard_proofs() {
@@ -28,54 +12,3 @@ fn standard_proofs_with_contracts() {
     let json = cmd(&["tests/standard_proofs_with_contracts.rs"]);
     expect_file!["./snapshots/standard_proofs_with_contracts.json"].assert_eq(&json);
 }
-
-fn get(text: &str, start: &str) -> SerFunction {
-    let json = &text[text.find("[\n").unwrap()..];
-    let v: Vec<SerFunction> = serde_json::from_str(json).unwrap();
-    v.into_iter().find(|f| f.func.starts_with(start)).unwrap()
-}
-
-#[test]
-fn compare_proof() {
-    let file = "tests/compare/proof.rs";
-
-    copy("tests/compare/proof1.rs", file).unwrap();
-    let text1 = &cmd(&["tests/compare/proof.rs"]);
-    expect_file!["./snapshots/proof1.json"].assert_eq(text1);
-
-    // Add another proof won't affact the previous one.
-    copy("tests/compare/proof2.rs", file).unwrap();
-    let text2 = &cmd(&["tests/compare/proof.rs"]);
-    expect_file!["./snapshots/proof2.json"].assert_eq(text2);
-
-    remove_file(file).unwrap();
-
-    let f = "pub fn f()";
-    // For the same proof (w.r.t same path and body),
-    // the hash value must be the same.
-    assert_eq!(get(text1, f).hash, get(text2, f).hash);
-}
-
-#[test]
-fn compare_contract() {
-    let file = "tests/compare/contract.rs";
-
-    copy("tests/compare/contract1.rs", file).unwrap();
-    let text1 = &cmd(&["tests/compare/contract.rs"]);
-    expect_file!["./snapshots/contract1.json"].assert_eq(text1);
-
-    copy("tests/compare/contract2.rs", file).unwrap();
-    let text2 = &cmd(&["tests/compare/contract.rs"]);
-    expect_file!["./snapshots/contract2.json"].assert_eq(text2);
-
-    remove_file(file).unwrap();
-
-    let f = "pub fn f()";
-    let f1 = get(text1, f);
-    let f2 = get(text2, f);
-    let callees1 = f1.callee_sorted_by_file_func();
-    let callees2 = f2.callee_sorted_by_file_func();
-
-    assert_eq!(callees1, callees2);
-    assert_eq!(f1.hash, f2.hash);
-}

tests/utils.rs

@@ -0,0 +1,18 @@
+use assert_cmd::Command;
+
+pub use expect_test::expect_file;
+#[allow(unused_imports)] // seems a bug in clippy
+pub use pretty_assertions::assert_eq;
+
+pub fn cmd(args: &[&str]) -> String {
+    let mut command = Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
+    command.env("RUST_LOG", "off").args(args);
+    let output = command.output().unwrap();
+    assert!(
+        output.status.success(),
+        "Failed to test standard_proof.rs:\n{}",
+        std::str::from_utf8(&output.stderr).unwrap()
+    );
+
+    String::from_utf8(output.stdout).unwrap()
+}