HigherOrderCO/Bend
1
1
Fork 0
mirror of https://github.com/HigherOrderCO/Bend.git synced 2024-11-04 01:20:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

[sc-508] Improve standard test pipeline, apply fmt and clippy suggestions to test

Browse Source
This commit is contained in:
Nicolas Abril 2024-03-12 20:59:30 +01:00
parent ae5b0b642d
commit 3ff0a6047e
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
justfile
View File

@ -4,20 +4,23 @@
export CARGO_TERM_COLOR := "always"
all: rustup-show test clippy fmt sort audit
all: rustup-show check fmt clippy test sort audit
rustup-show:
rustup show
test:
cargo insta test --workspace
clippy:
cargo clippy
check:
cargo check --all-targets
fmt:
cargo fmt --all -- --check
clippy:
cargo clippy --all-targets
test:
cargo insta test --workspace
sort:
cargo sort --check --workspace

17
tests/golden_tests.rs
View File

@ -17,7 +17,6 @@ use std::{
io::Read,
path::{Path, PathBuf},
str::FromStr,
sync::{Arc, RwLock},
};
use stdext::function_name;
use walkdir::WalkDir;
@ -36,10 +35,9 @@ fn do_parse_net(code: &str) -> Result<hvmc::ast::Net, String> {
const TESTS_PATH: &str = "/tests/golden_tests/";
fn run_single_golden_test(
path: &Path,
run: &[&dyn Fn(&str, &Path) -> Result<String, Diagnostics>],
) -> Result<(), String> {
type RunFn = dyn Fn(&str, &Path) -> Result<String, Diagnostics>;
fn run_single_golden_test(path: &Path, run: &[&RunFn]) -> Result<(), String> {
let code = std::fs::read_to_string(path).map_err(|e| e.to_string())?;
let file_name = path.to_str().and_then(|path| path.rsplit_once(TESTS_PATH)).unwrap().1;
@ -68,14 +66,11 @@ fn run_single_golden_test(
Ok(())
}
fn run_golden_test_dir(test_name: &str, run: &dyn Fn(&str, &Path) -> Result<String, Diagnostics>) {
fn run_golden_test_dir(test_name: &str, run: &RunFn) {
run_golden_test_dir_multiple(test_name, &[run])
}
fn run_golden_test_dir_multiple(
test_name: &str,
run: &[&dyn Fn(&str, &Path) -> Result<String, Diagnostics>],
) {
fn run_golden_test_dir_multiple(test_name: &str, run: &[&RunFn]) {
let root = PathBuf::from(format!(
"{}{TESTS_PATH}{}",
env!("CARGO_MANIFEST_DIR"),
@ -293,7 +288,7 @@ fn desugar_file() {
fn hangs() {
let expected_normalization_time = 5;
run_golden_test_dir(function_name!(), &|code, path| {
run_golden_test_dir(function_name!(), &move |code, path| {
let diagnostics_cfg = DiagnosticsConfig::new(Severity::Warning, true);
let book = do_parse_book(code, path)?;