andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 17:36:19 +04:00
Code Issues Projects Releases Wiki Activity

make TestCase::From more generic

Browse Source
This commit is contained in:
Skyler Hawthorne 2022-10-22 22:18:32 -04:00 committed by Michael Davis
parent 8c5ec95ac0
commit 5b07ce76fc
3 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
helix-term/tests/test/auto_indent.rs
View File

@ -11,14 +11,13 @@ async fn auto_indent_c() -> anyhow::Result<()> {
helpers::test_syntax_conf(None), helpers::test_syntax_conf(None),
// switches to append mode? // switches to append mode?
( (
helpers::platform_line("void foo() {#[|}]#").as_ref(), helpers::platform_line("void foo() {#[|}]#"),
"i<ret><esc>", "i<ret><esc>",
helpers::platform_line(indoc! {"\ helpers::platform_line(indoc! {"\
void foo() { void foo() {
#[|\n]#\ #[|\n]#\
} }
"}) "}),
.as_ref(),
), ),
) )
.await?; .await?;

9
helix-term/tests/test/helpers.rs
View File

@ -22,8 +22,13 @@ pub struct TestCase {
pub out_selection: Selection, pub out_selection: Selection,
} }
impl<S: Into<String>> From<(S, S, S)> for TestCase { impl<S, R, V> From<(S, R, V)> for TestCase
fn from((input, keys, output): (S, S, S)) -> Self { where
S: Into<String>,
R: Into<String>,
V: Into<String>,
{
fn from((input, keys, output): (S, R, V)) -> Self {
let (in_text, in_selection) = test::print(&input.into()); let (in_text, in_selection) = test::print(&input.into());
let (out_text, out_selection) = test::print(&output.into()); let (out_text, out_selection) = test::print(&output.into());

28
helix-term/tests/test/movement.rs
View File

@ -395,7 +395,7 @@ async fn cursor_position_append_eof() -> anyhow::Result<()> {
test(( test((
"#[foo|]#", "#[foo|]#",
"abar<esc>", "abar<esc>",
helpers::platform_line("#[foobar|]#\n").as_ref(), helpers::platform_line("#[foobar|]#\n"),
)) ))
.await?; .await?;
@ -403,7 +403,7 @@ async fn cursor_position_append_eof() -> anyhow::Result<()> {
test(( test((
"#[|foo]#", "#[|foo]#",
"abar<esc>", "abar<esc>",
helpers::platform_line("#[foobar|]#\n").as_ref(), helpers::platform_line("#[foobar|]#\n"),
)) ))
.await?; .await?;
@ -425,16 +425,14 @@ async fn select_mode_tree_sitter_next_function_is_union_of_objects() -> anyhow::
fn inc(x: usize) -> usize { x + 1 } fn inc(x: usize) -> usize { x + 1 }
/// Decrements /// Decrements
fn dec(x: usize) -> usize { x - 1 } fn dec(x: usize) -> usize { x - 1 }
"}) "}),
.as_ref(),
"]fv]f", "]fv]f",
helpers::platform_line(indoc! {"\ helpers::platform_line(indoc! {"\
/// Increments /// Increments
#[fn inc(x: usize) -> usize { x + 1 } #[fn inc(x: usize) -> usize { x + 1 }
/// Decrements /// Decrements
fn dec(x: usize) -> usize { x - 1 }|]# fn dec(x: usize) -> usize { x - 1 }|]#
"}) "}),
.as_ref(),
), ),
) )
.await?; .await?;
@ -457,16 +455,14 @@ async fn select_mode_tree_sitter_prev_function_unselects_object() -> anyhow::Res
#[fn inc(x: usize) -> usize { x + 1 } #[fn inc(x: usize) -> usize { x + 1 }
/// Decrements /// Decrements
fn dec(x: usize) -> usize { x - 1 }|]# fn dec(x: usize) -> usize { x - 1 }|]#
"}) "}),
.as_ref(),
"v[f", "v[f",
helpers::platform_line(indoc! {"\ helpers::platform_line(indoc! {"\
/// Increments /// Increments
#[fn inc(x: usize) -> usize { x + 1 }|]# #[fn inc(x: usize) -> usize { x + 1 }|]#
/// Decrements /// Decrements
fn dec(x: usize) -> usize { x - 1 } fn dec(x: usize) -> usize { x - 1 }
"}) "}),
.as_ref(),
), ),
) )
.await?; .await?;
@ -492,8 +488,7 @@ fn inc(x: usize) -> usize { x + 1 }
fn dec(x: usize) -> usize { x - 1 } fn dec(x: usize) -> usize { x - 1 }
/// Identity /// Identity
#[fn ident(x: usize) -> usize { x }|]# #[fn ident(x: usize) -> usize { x }|]#
"}) "}),
.as_ref(),
"v[f", "v[f",
helpers::platform_line(indoc! {"\ helpers::platform_line(indoc! {"\
/// Increments /// Increments
@ -502,8 +497,7 @@ fn inc(x: usize) -> usize { x + 1 }
#[|fn dec(x: usize) -> usize { x - 1 } #[|fn dec(x: usize) -> usize { x - 1 }
/// Identity /// Identity
]#fn ident(x: usize) -> usize { x } ]#fn ident(x: usize) -> usize { x }
"}) "}),
.as_ref(),
), ),
) )
.await?; .await?;
@ -523,8 +517,7 @@ fn inc(x: usize) -> usize { x + 1 }
fn dec(x: usize) -> usize { x - 1 } fn dec(x: usize) -> usize { x - 1 }
/// Identity /// Identity
#[fn ident(x: usize) -> usize { x }|]# #[fn ident(x: usize) -> usize { x }|]#
"}) "}),
.as_ref(),
"v[f[f", "v[f[f",
helpers::platform_line(indoc! {"\ helpers::platform_line(indoc! {"\
/// Increments /// Increments
@ -533,8 +526,7 @@ fn dec(x: usize) -> usize { x - 1 }
fn dec(x: usize) -> usize { x - 1 } fn dec(x: usize) -> usize { x - 1 }
/// Identity /// Identity
]#fn ident(x: usize) -> usize { x } ]#fn ident(x: usize) -> usize { x }
"}) "}),
.as_ref(),
), ),
) )
.await?; .await?;