Skip to content

Allow tests to be updated automatically #744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 13, 2022
Merged

Allow tests to be updated automatically #744

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c70735d
Add `expect_test` as a dev dependency
ecstatic-morse Dec 22, 2021
3a9e568
Allow `TestGoal` to hold `Expect` in addition to a string
ecstatic-morse Dec 22, 2021
1c4b1be
Use `expect!` in tests
ecstatic-morse Dec 22, 2021
73ce746
Make comparison between solvers first-class
ecstatic-morse Dec 22, 2021
a9b0371
Split `yields` tests whose results differ between solvers
ecstatic-morse Dec 23, 2021
7301c6a
Omit empty lists from `ConstrainedSubsts`
ecstatic-morse Dec 24, 2021
f0579eb
Omit trailing semicolon from trivial `Unique` solution
ecstatic-morse Dec 24, 2021
1627b6e
Bless tests
ecstatic-morse Dec 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion tests/logging_db/util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,16 @@ macro_rules! logging_db_output_sufficient {

pub fn logging_db_output_sufficient(
program_text: &str,
goals: Vec<(&str, SolverChoice, TestGoal)>,
goals: Vec<(&str, Vec<SolverChoice>, TestGoal)>,
) {
println!("program {}", program_text);
assert!(program_text.starts_with("{"));
assert!(program_text.ends_with("}"));

let goals = goals
.iter()
.flat_map(|(a, bs, c)| bs.into_iter().map(move |b| (a, b, c)));

let output_text = {
let db = ChalkDatabase::with(
&program_text[1..program_text.len() - 1],
Expand All @@ -41,6 +45,7 @@ pub fn logging_db_output_sufficient(

let program = db.program_ir().unwrap();
let wrapped = LoggingRustIrDatabase::<_, Program, _>::new(program.clone());

chalk_integration::tls::set_current_program(&program, || {
for (goal_text, solver_choice, expected) in goals.clone() {
let mut solver = solver_choice.into_solver();
Expand Down
102 changes: 88 additions & 14 deletions tests/test/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#![allow(non_snake_case)]

use expect_test::{Expect, expect};
use std::sync::Arc;

use chalk_integration::program::Program;
use expect_test::{expect, Expect};

use crate::test_util::assert_same;
use chalk_integration::db::ChalkDatabase;
Expand Down Expand Up @@ -91,8 +94,7 @@ macro_rules! parse_test_data {
parse_test_data!(@program[$program]
@parsed_goals[
$($parsed_goals)*
(stringify!($goal), SolverChoice::slg_default(), TestGoal::Aggregated($expected))
(stringify!($goal), SolverChoice::recursive_default(), TestGoal::Aggregated($expected))
(stringify!($goal), vec![SolverChoice::slg_default(), SolverChoice::recursive_default()], TestGoal::Aggregated($expected))
]
@unparsed_goals[$($unparsed_goals)*])
};
Expand All @@ -107,7 +109,7 @@ macro_rules! parse_test_data {
parse_test_data!(@program[$program]
@parsed_goals[
$($parsed_goals)*
(stringify!($goal), SolverChoice::slg_default(), TestGoal::All(vec![$($expected),*]))
(stringify!($goal), vec![SolverChoice::slg_default()], TestGoal::All(vec![$($expected),*]))
]
@unparsed_goals[$($unparsed_goals)*])
};
Expand All @@ -121,7 +123,7 @@ macro_rules! parse_test_data {
parse_test_data!(@program[$program]
@parsed_goals[
$($parsed_goals)*
(stringify!($goal), SolverChoice::default(), TestGoal::First(vec![$($expected),*]))
(stringify!($goal), vec![SolverChoice::default()], TestGoal::First(vec![$($expected),*]))
]
@unparsed_goals[$($unparsed_goals)*])
};
Expand All @@ -140,7 +142,7 @@ macro_rules! parse_test_data {
parse_test_data!(@program[$program]
@parsed_goals[
$($parsed_goals)*
(stringify!($goal), $C, TestGoal::Aggregated($expected))
(stringify!($goal), vec![$C], TestGoal::Aggregated($expected))
]
@unparsed_goals[goal $($unparsed_goals)*])
};
Expand All @@ -154,7 +156,7 @@ macro_rules! parse_test_data {
parse_test_data!(@program[$program]
@parsed_goals[
$($parsed_goals)*
(stringify!($goal), $C, TestGoal::Aggregated($expected))
(stringify!($goal), vec![$C], TestGoal::Aggregated($expected))
]
@unparsed_goals[goal $goal yields $($unparsed_tail)*])
};
Expand All @@ -166,7 +168,7 @@ macro_rules! parse_test_data {
parse_test_data!(@program[$program]
@parsed_goals[
$($parsed_goals)*
(stringify!($goal), $C, TestGoal::Aggregated($expected))
(stringify!($goal), vec![$C], TestGoal::Aggregated($expected))
]
@unparsed_goals[])
};
Expand All @@ -185,7 +187,7 @@ macro_rules! parse_test_data {
parse_test_data!(@program[$program]
@parsed_goals[
$($parsed_goals)*
(stringify!($goal), $C, TestGoal::All(vec![$($expected),*]))
(stringify!($goal), vec![$C], TestGoal::All(vec![$($expected),*]))
]
@unparsed_goals[goal $($unparsed_goals)*])
};
Expand All @@ -197,7 +199,7 @@ macro_rules! parse_test_data {
parse_test_data!(@program[$program]
@parsed_goals[
$($parsed_goals)*
(stringify!($goal), $C, TestGoal::All(vec![$($expected),*]))
(stringify!($goal), vec![$C], TestGoal::All(vec![$($expected),*]))
]
@unparsed_goals[])
};
Expand All @@ -216,7 +218,7 @@ macro_rules! parse_test_data {
parse_test_data!(@program[$program]
@parsed_goals[
$($parsed_goals)*
(stringify!($goal), $C, TestGoal::First(vec![$($expected),*]))
(stringify!($goal), vec![$C], TestGoal::First(vec![$($expected),*]))
]
@unparsed_goals[goal $($unparsed_goals)*])
};
Expand All @@ -228,13 +230,17 @@ macro_rules! parse_test_data {
parse_test_data!(@program[$program]
@parsed_goals[
$($parsed_goals)*
(stringify!($goal), $C, TestGoal::First(vec![$($expected),*]))
(stringify!($goal), vec![$C], TestGoal::First(vec![$($expected),*]))
]
@unparsed_goals[])
};
}

fn solve_goal(program_text: &str, goals: Vec<(&str, SolverChoice, TestGoal)>, coherence: bool) {
fn solve_goal(
program_text: &str,
goals: Vec<(&str, Vec<SolverChoice>, TestGoal)>,
coherence: bool,
) {
with_tracing_logs(|| {
println!("program {}", program_text);
assert!(program_text.starts_with("{"));
Expand All @@ -251,7 +257,28 @@ fn solve_goal(program_text: &str, goals: Vec<(&str, SolverChoice, TestGoal)>, co
db.program_ir().unwrap()
};

for (goal_text, solver_choice, expected) in goals {
for (goal_text, solver_choices, expected) in goals {
let solver_choices = &*solver_choices;
let solver_choice = match solver_choices {
[] => panic!("No solvers?"),
[x] => *x,
_ => {
let expected = match expected {
TestGoal::Aggregated(x) => x,
_ => todo!("solver comparison only supported for `Aggregated` goals"),
};

solve_aggregated(
&mut db,
program.clone(),
goal_text,
solver_choices,
expected,
);
continue;
}
};

match (&solver_choice, &expected) {
(SolverChoice::Recursive { .. }, TestGoal::All(_))
| (SolverChoice::Recursive { .. }, TestGoal::First(_)) => {
Expand Down Expand Up @@ -333,6 +360,53 @@ fn solve_goal(program_text: &str, goals: Vec<(&str, SolverChoice, TestGoal)>, co
})
}

fn solve_aggregated(
db: &mut ChalkDatabase,
program: Arc<Program>,
goal_text: &str,
choices: &[SolverChoice],
expected: Expect,
) {
let mut solutions = vec![];

for solver_choice in choices.iter().copied() {
if db.solver_choice() != solver_choice {
db.set_solver_choice(solver_choice);
}

chalk_integration::tls::set_current_program(&program, || {
println!("----------------------------------------------------------------------");
println!("goal {}", goal_text);
assert!(goal_text.starts_with("{"));
assert!(goal_text.ends_with("}"));
let goal = lower_goal(
&*chalk_parse::parse_goal(&goal_text[1..goal_text.len() - 1]).unwrap(),
&*program,
)
.unwrap();

println!("using solver: {:?}", solver_choice);
let peeled_goal = goal.into_peeled_goal(db.interner());
let result = db.solve(&peeled_goal);
solutions.push(format_solution(result, db.interner()));
});
}

let (head, tail) = solutions
.split_first()
.expect("Test requires at least one solver");
for (i, other) in tail.iter().enumerate() {
println!(
"\ncomparing solvers:\n\tleft: {:?}\n\tright: {:?}\n",
&choices[0],
&choices[i + 1]
);
assert_same(head, other);
Copy link
Contributor Author

@ecstatic-morse ecstatic-morse Dec 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

assert_same strips whitespace, uses prefix matching, and has a different diff output than Expect::assert_eq, so the error that occurs when two solvers don't match looks quite different from the one that occurs when the expected output is wrong. Expect::assert_eq does not work without something to bless, though it could be made to with rust-analyzer/expect-test#22. If this is merged, I expect that uses of assert_same will slowly be removed in favor of Expect, so I don't think we need to resolve this right now. Others may disagree, however.

}

expected.assert_eq(head);
}

mod arrays;
mod auto_traits;
mod closures;
Expand Down