Use check_count! instead of multiple check! in separate scopes

Changes are based on the review feedback by Veykril.
This commit is contained in:
Jonas Bushart 2022-04-03 18:34:06 +00:00 committed by GitHub
parent 0cc079f3e9
commit 156f9074e1

View file

@ -302,9 +302,9 @@ fn main() {}",
#[test] #[test]
fn insert_empty_file() { fn insert_empty_file() {
{ cov_mark::check_count!(insert_empty_file, 2);
// Default configuration // Default configuration
cov_mark::check!(insert_empty_file);
// empty files will get two trailing newlines // empty files will get two trailing newlines
// this is due to the test case insert_no_imports above // this is due to the test case insert_no_imports above
check_crate( check_crate(
@ -314,10 +314,8 @@ fn insert_empty_file() {
", ",
); );
}
{
// "not group" configuration // "not group" configuration
cov_mark::check!(insert_empty_file);
check_with_config( check_with_config(
"use external_crate2::bar::A", "use external_crate2::bar::A",
r"", r"",
@ -333,13 +331,12 @@ fn insert_empty_file() {
}, },
); );
} }
}
#[test] #[test]
fn insert_empty_module() { fn insert_empty_module() {
{ cov_mark::check_count!(insert_empty_module, 2);
// Default configuration // Default configuration
cov_mark::check!(insert_empty_module);
check( check(
"foo::bar", "foo::bar",
r" r"
@ -352,10 +349,8 @@ mod x {
", ",
ImportGranularity::Item, ImportGranularity::Item,
); );
}
{
// "not group" configuration // "not group" configuration
cov_mark::check!(insert_empty_module);
check_with_config( check_with_config(
"foo::bar", "foo::bar",
r"mod x {$0}", r"mod x {$0}",
@ -371,13 +366,12 @@ mod x {
}, },
); );
} }
}
#[test] #[test]
fn insert_after_inner_attr() { fn insert_after_inner_attr() {
{ cov_mark::check_count!(insert_empty_inner_attr, 2);
// Default configuration // Default configuration
cov_mark::check!(insert_empty_inner_attr);
check_crate( check_crate(
"foo::bar", "foo::bar",
r"#![allow(unused_imports)]", r"#![allow(unused_imports)]",
@ -385,10 +379,8 @@ fn insert_after_inner_attr() {
use foo::bar;", use foo::bar;",
); );
}
{
// "not group" configuration // "not group" configuration
cov_mark::check!(insert_empty_inner_attr);
check_with_config( check_with_config(
"foo::bar", "foo::bar",
r"#![allow(unused_imports)]", r"#![allow(unused_imports)]",
@ -404,7 +396,6 @@ use foo::bar;",
}, },
); );
} }
}
#[test] #[test]
fn insert_after_inner_attr2() { fn insert_after_inner_attr2() {