Data-driven diagnostics tests
This commit is contained in:
parent
7b2ce1a54f
commit
af6984f6a6
@ -244,3 +244,25 @@ impl AstDiagnostic for MismatchedArgCount {
|
|||||||
ast::CallExpr::cast(node).unwrap()
|
ast::CallExpr::cast(node).unwrap()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
fn check_diagnostics(ra_fixture: &str) {
|
||||||
|
use ra_db::{fixture::WithFixture, FileId};
|
||||||
|
use ra_syntax::TextRange;
|
||||||
|
use rustc_hash::FxHashMap;
|
||||||
|
|
||||||
|
use crate::test_db::TestDB;
|
||||||
|
|
||||||
|
let db = TestDB::with_files(ra_fixture);
|
||||||
|
let annotations = db.extract_annotations();
|
||||||
|
|
||||||
|
let mut actual: FxHashMap<FileId, Vec<(TextRange, String)>> = FxHashMap::default();
|
||||||
|
db.diag(|d| {
|
||||||
|
// FXIME: macros...
|
||||||
|
let file_id = d.source().file_id.original_file(&db);
|
||||||
|
let range = d.syntax_node(&db).text_range();
|
||||||
|
actual.entry(file_id).or_default().push((range, d.message().to_owned()));
|
||||||
|
});
|
||||||
|
|
||||||
|
assert_eq!(annotations, actual);
|
||||||
|
}
|
||||||
|
@ -376,146 +376,117 @@ pub fn record_pattern_missing_fields(
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use expect::{expect, Expect};
|
use crate::diagnostics::check_diagnostics;
|
||||||
use ra_db::fixture::WithFixture;
|
|
||||||
|
|
||||||
use crate::{diagnostics::MismatchedArgCount, test_db::TestDB};
|
|
||||||
|
|
||||||
fn check_diagnostic(ra_fixture: &str, expect: Expect) {
|
|
||||||
let msg = TestDB::with_single_file(ra_fixture).0.diagnostic::<MismatchedArgCount>().0;
|
|
||||||
expect.assert_eq(&msg);
|
|
||||||
}
|
|
||||||
|
|
||||||
fn check_no_diagnostic(ra_fixture: &str) {
|
|
||||||
let (s, diagnostic_count) =
|
|
||||||
TestDB::with_single_file(ra_fixture).0.diagnostic::<MismatchedArgCount>();
|
|
||||||
|
|
||||||
assert_eq!(0, diagnostic_count, "expected no diagnostic, found one: {}", s);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn simple_free_fn_zero() {
|
fn simple_free_fn_zero() {
|
||||||
check_diagnostic(
|
check_diagnostics(
|
||||||
r"
|
r#"
|
||||||
fn zero() {}
|
fn zero() {}
|
||||||
fn f() { zero(1); }
|
fn f() { zero(1); }
|
||||||
",
|
//^^^^^^^ Expected 0 arguments, found 1
|
||||||
expect![["\"zero(1)\": Expected 0 arguments, found 1\n"]],
|
"#,
|
||||||
);
|
);
|
||||||
|
|
||||||
check_no_diagnostic(
|
check_diagnostics(
|
||||||
r"
|
r#"
|
||||||
fn zero() {}
|
fn zero() {}
|
||||||
fn f() { zero(); }
|
fn f() { zero(); }
|
||||||
",
|
"#,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn simple_free_fn_one() {
|
fn simple_free_fn_one() {
|
||||||
check_diagnostic(
|
check_diagnostics(
|
||||||
r"
|
r#"
|
||||||
fn one(arg: u8) {}
|
fn one(arg: u8) {}
|
||||||
fn f() { one(); }
|
fn f() { one(); }
|
||||||
",
|
//^^^^^ Expected 1 argument, found 0
|
||||||
expect![["\"one()\": Expected 1 argument, found 0\n"]],
|
"#,
|
||||||
);
|
);
|
||||||
|
|
||||||
check_no_diagnostic(
|
check_diagnostics(
|
||||||
r"
|
r#"
|
||||||
fn one(arg: u8) {}
|
fn one(arg: u8) {}
|
||||||
fn f() { one(1); }
|
fn f() { one(1); }
|
||||||
",
|
"#,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn method_as_fn() {
|
fn method_as_fn() {
|
||||||
check_diagnostic(
|
check_diagnostics(
|
||||||
r"
|
r#"
|
||||||
struct S;
|
struct S;
|
||||||
impl S {
|
impl S { fn method(&self) {} }
|
||||||
fn method(&self) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn f() {
|
fn f() {
|
||||||
S::method();
|
S::method();
|
||||||
}
|
} //^^^^^^^^^^^ Expected 1 argument, found 0
|
||||||
",
|
"#,
|
||||||
expect![["\"S::method()\": Expected 1 argument, found 0\n"]],
|
|
||||||
);
|
);
|
||||||
|
|
||||||
check_no_diagnostic(
|
check_diagnostics(
|
||||||
r"
|
r#"
|
||||||
struct S;
|
struct S;
|
||||||
impl S {
|
impl S { fn method(&self) {} }
|
||||||
fn method(&self) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn f() {
|
fn f() {
|
||||||
S::method(&S);
|
S::method(&S);
|
||||||
S.method();
|
S.method();
|
||||||
}
|
}
|
||||||
",
|
"#,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn method_with_arg() {
|
fn method_with_arg() {
|
||||||
check_diagnostic(
|
check_diagnostics(
|
||||||
r"
|
r#"
|
||||||
struct S;
|
struct S;
|
||||||
impl S {
|
impl S { fn method(&self, arg: u8) {} }
|
||||||
fn method(&self, arg: u8) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn f() {
|
fn f() {
|
||||||
S.method();
|
S.method();
|
||||||
}
|
} //^^^^^^^^^^ Expected 1 argument, found 0
|
||||||
",
|
"#,
|
||||||
expect![["\"S.method()\": Expected 1 argument, found 0\n"]],
|
|
||||||
);
|
);
|
||||||
|
|
||||||
check_no_diagnostic(
|
check_diagnostics(
|
||||||
r"
|
r#"
|
||||||
struct S;
|
struct S;
|
||||||
impl S {
|
impl S { fn method(&self, arg: u8) {} }
|
||||||
fn method(&self, arg: u8) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn f() {
|
fn f() {
|
||||||
S::method(&S, 0);
|
S::method(&S, 0);
|
||||||
S.method(1);
|
S.method(1);
|
||||||
}
|
}
|
||||||
",
|
"#,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn tuple_struct() {
|
fn tuple_struct() {
|
||||||
check_diagnostic(
|
check_diagnostics(
|
||||||
r"
|
r#"
|
||||||
struct Tup(u8, u16);
|
struct Tup(u8, u16);
|
||||||
fn f() {
|
fn f() {
|
||||||
Tup(0);
|
Tup(0);
|
||||||
}
|
} //^^^^^^ Expected 2 arguments, found 1
|
||||||
",
|
"#,
|
||||||
expect![["\"Tup(0)\": Expected 2 arguments, found 1\n"]],
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn enum_variant() {
|
fn enum_variant() {
|
||||||
check_diagnostic(
|
check_diagnostics(
|
||||||
r"
|
r#"
|
||||||
enum En {
|
enum En { Variant(u8, u16), }
|
||||||
Variant(u8, u16),
|
|
||||||
}
|
|
||||||
fn f() {
|
fn f() {
|
||||||
En::Variant(0);
|
En::Variant(0);
|
||||||
}
|
} //^^^^^^^^^^^^^^ Expected 2 arguments, found 1
|
||||||
",
|
"#,
|
||||||
expect![["\"En::Variant(0)\": Expected 2 arguments, found 1\n"]],
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -94,7 +94,7 @@ impl TestDB {
|
|||||||
panic!("Can't find module for file")
|
panic!("Can't find module for file")
|
||||||
}
|
}
|
||||||
|
|
||||||
fn diag<F: FnMut(&dyn Diagnostic)>(&self, mut cb: F) {
|
pub(crate) fn diag<F: FnMut(&dyn Diagnostic)>(&self, mut cb: F) {
|
||||||
let crate_graph = self.crate_graph();
|
let crate_graph = self.crate_graph();
|
||||||
for krate in crate_graph.iter() {
|
for krate in crate_graph.iter() {
|
||||||
let crate_def_map = self.crate_def_map(krate);
|
let crate_def_map = self.crate_def_map(krate);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user