Skip to content

refactor: Test helpers #141

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
zharinov merged 3 commits into from
Dec 20, 2025
Merged

refactor: Test helpers #141

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ad31cf
refactor: Query test helpers
zharinov Dec 20, 2025
46c7507
Update query_tests.rs
zharinov Dec 20, 2025
dcbcd4a
Merge branch 'master' into refactor/query-tests
zharinov Dec 20, 2025
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
93 changes: 19 additions & 74 deletions crates/plotnik-lib/src/query/query_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,124 +4,70 @@ use crate::query::query::{LinkedQuery, QueryAnalyzed, QueryBuilder};

impl<'q> QueryAnalyzed<'q> {
#[track_caller]
pub fn expect(src: &'q str) -> Self {
QueryBuilder::new(src).parse().unwrap().analyze()
}

#[track_caller]
pub fn expect_valid(src: &'q str) -> Self {
fn parse_and_validate(src: &'q str) -> Self {
let query = QueryBuilder::new(src).parse().unwrap().analyze();
if !query.is_valid() {
panic!(
"Expected valid query, got error:\n{}",
query.dump_diagnostics()
);
}

query
}

#[track_caller]
pub fn expect_valid_cst(src: &'q str) -> String {
let query = QueryBuilder::new(src).parse().unwrap().analyze();
if !query.is_valid() {
panic!(
"Expected valid query, got error:\n{}",
query.dump_diagnostics()
);
}
pub fn expect(src: &'q str) -> Self {
QueryBuilder::new(src).parse().unwrap().analyze()
}

#[track_caller]
pub fn expect_valid(src: &'q str) -> Self {
Self::parse_and_validate(src)
}

query.dump_cst()
#[track_caller]
pub fn expect_valid_cst(src: &'q str) -> String {
Self::parse_and_validate(src).dump_cst()
}

#[track_caller]
pub fn expect_valid_cst_full(src: &'q str) -> String {
let query = QueryBuilder::new(src).parse().unwrap().analyze();
if !query.is_valid() {
panic!(
"Expected valid query, got error:\n{}",
query.dump_diagnostics()
);
}

query.dump_cst_full()
Self::parse_and_validate(src).dump_cst_full()
}

#[track_caller]
pub fn expect_valid_ast(src: &'q str) -> String {
let query = QueryBuilder::new(src).parse().unwrap().analyze();
if !query.is_valid() {
panic!(
"Expected valid query, got error:\n{}",
query.dump_diagnostics()
);
}

query.dump_ast()
Self::parse_and_validate(src).dump_ast()
}

#[track_caller]
pub fn expect_valid_arities(src: &'q str) -> String {
let query = QueryBuilder::new(src).parse().unwrap().analyze();
if !query.is_valid() {
panic!(
"Expected valid query, got error:\n{}",
query.dump_diagnostics()
);
}

query.dump_with_arities()
Self::parse_and_validate(src).dump_with_arities()
}

#[track_caller]
pub fn expect_valid_symbols(src: &'q str) -> String {
let query = QueryBuilder::new(src).parse().unwrap().analyze();
if !query.is_valid() {
panic!(
"Expected valid query, got error:\n{}",
query.dump_diagnostics()
);
}

query.dump_symbols()
Self::parse_and_validate(src).dump_symbols()
}

#[track_caller]
pub fn expect_valid_linking(src: &'q str, lang: &Lang) -> LinkedQuery<'q> {
let query = QueryBuilder::new(src).parse().unwrap().analyze();
if !query.is_valid() {
panic!(
"Expected valid query, got error:\n{}",
query.dump_diagnostics()
);
}

let query = query.link(lang);
let query = Self::parse_and_validate(src).link(lang);
if !query.is_valid() {
panic!(
"Expected valid linking, got error:\n{}",
query.dump_diagnostics()
);
}

query
}

#[track_caller]
pub fn expect_invalid_linking(src: &'q str, lang: &Lang) -> String {
let query = QueryBuilder::new(src).parse().unwrap().analyze();
if !query.is_valid() {
panic!(
"Expected valid query, got error:\n{}",
query.dump_diagnostics()
);
}

let query = query.link(lang);
let query = Self::parse_and_validate(src).link(lang);
if query.is_valid() {
panic!("Expected failed linking, got valid",);
panic!("Expected failed linking, got valid");
}

query.dump_diagnostics()
}

Expand All @@ -131,7 +77,6 @@ impl<'q> QueryAnalyzed<'q> {
if query.is_valid() {
panic!("Expected invalid query, got valid:\n{}", query.dump_cst());
}

query.dump_diagnostics()
}
}