From d116a95b43243f10c33c5ca4e18b565c57d2be23 Mon Sep 17 00:00:00 2001 From: Thomas Bruyelle Date: Mon, 5 Aug 2024 23:44:00 +0200 Subject: [PATCH] test: use cmp over cmpenv when possible (because it allows to update the scripts) --- .../testdata/document_completion_error_out_of_range.txtar | 2 +- cmd/gnols/testdata/document_completion_func_args.txtar | 2 +- cmd/gnols/testdata/document_completion_func_args2.txtar | 2 +- cmd/gnols/testdata/document_completion_func_args3.txtar | 2 +- cmd/gnols/testdata/document_completion_func_args3b.txtar | 2 +- cmd/gnols/testdata/document_completion_func_args3c.txtar | 2 +- cmd/gnols/testdata/document_completion_func_args6.txtar | 2 +- cmd/gnols/testdata/document_completion_func_ret.txtar | 2 +- .../testdata/document_completion_local_inline_struct.txtar | 2 +- cmd/gnols/testdata/document_completion_local_struct.txtar | 2 +- .../document_completion_local_struct_different_block.txtar | 2 +- .../document_completion_local_struct_global_var.txtar | 2 +- .../document_completion_local_struct_one_selector.txtar | 2 +- .../document_completion_local_struct_three_selectors.txtar | 2 +- ...ument_completion_local_struct_three_selectors_inline.txtar | 2 +- .../document_completion_local_struct_two_selectors.txtar | 2 +- cmd/gnols/testdata/document_completion_stdlib_bufio.txtar | 2 +- cmd/gnols/testdata/document_completion_stdlib_strconv.txtar | 2 +- cmd/gnols/testdata/document_completion_subpackage.txtar | 2 +- .../document_completion_subpackage_multiple_selectors.txtar | 2 +- cmd/gnols/testdata/document_definition.txtar | 1 - cmd/gnols/testdata/document_formatting.txtar | 4 ++-- cmd/gnols/testdata/document_formatting_imports.txtar | 4 ++-- 23 files changed, 24 insertions(+), 25 deletions(-) diff --git a/cmd/gnols/testdata/document_completion_error_out_of_range.txtar b/cmd/gnols/testdata/document_completion_error_out_of_range.txtar index 58fb12b..9e40eea 100644 --- a/cmd/gnols/testdata/document_completion_error_out_of_range.txtar +++ b/cmd/gnols/testdata/document_completion_error_out_of_range.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion.json -cmpenv output/completion.json expected/completion.json +cmp output/completion.json expected/completion.json -- x.gno -- package foo -- input/initialize.json -- diff --git a/cmd/gnols/testdata/document_completion_func_args.txtar b/cmd/gnols/testdata/document_completion_func_args.txtar index cc82315..1b61ddb 100644 --- a/cmd/gnols/testdata/document_completion_func_args.txtar +++ b/cmd/gnols/testdata/document_completion_func_args.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion_x.json -cmpenv output/completion_x.json expected/completion_x.json +cmp output/completion_x.json expected/completion_x.json -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_completion_func_args2.txtar b/cmd/gnols/testdata/document_completion_func_args2.txtar index dca5b10..04abac0 100644 --- a/cmd/gnols/testdata/document_completion_func_args2.txtar +++ b/cmd/gnols/testdata/document_completion_func_args2.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion_x.json -cmpenv output/completion_x.json expected/completion_x.json +cmp output/completion_x.json expected/completion_x.json -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_completion_func_args3.txtar b/cmd/gnols/testdata/document_completion_func_args3.txtar index 7172e7d..af96de0 100644 --- a/cmd/gnols/testdata/document_completion_func_args3.txtar +++ b/cmd/gnols/testdata/document_completion_func_args3.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion_x.json -cmpenv output/completion_x.json expected/completion_x.json +cmp output/completion_x.json expected/completion_x.json -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_completion_func_args3b.txtar b/cmd/gnols/testdata/document_completion_func_args3b.txtar index 40fdfca..6f84316 100644 --- a/cmd/gnols/testdata/document_completion_func_args3b.txtar +++ b/cmd/gnols/testdata/document_completion_func_args3b.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion_x.json -cmpenv output/completion_x.json expected/completion_x.json +cmp output/completion_x.json expected/completion_x.json -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_completion_func_args3c.txtar b/cmd/gnols/testdata/document_completion_func_args3c.txtar index dba9cb4..b5fdf74 100644 --- a/cmd/gnols/testdata/document_completion_func_args3c.txtar +++ b/cmd/gnols/testdata/document_completion_func_args3c.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion_x.json -cmpenv output/completion_x.json expected/completion_x.json +cmp output/completion_x.json expected/completion_x.json -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_completion_func_args6.txtar b/cmd/gnols/testdata/document_completion_func_args6.txtar index b3753ec..27e937f 100644 --- a/cmd/gnols/testdata/document_completion_func_args6.txtar +++ b/cmd/gnols/testdata/document_completion_func_args6.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion_x.json -cmpenv output/completion_x.json expected/completion_x.json +cmp output/completion_x.json expected/completion_x.json -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_completion_func_ret.txtar b/cmd/gnols/testdata/document_completion_func_ret.txtar index 7a6aa15..21764f6 100644 --- a/cmd/gnols/testdata/document_completion_func_ret.txtar +++ b/cmd/gnols/testdata/document_completion_func_ret.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion_x.json -cmpenv output/completion_x.json expected/completion_x.json +cmp output/completion_x.json expected/completion_x.json -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_completion_local_inline_struct.txtar b/cmd/gnols/testdata/document_completion_local_inline_struct.txtar index c69a1cd..8033777 100644 --- a/cmd/gnols/testdata/document_completion_local_inline_struct.txtar +++ b/cmd/gnols/testdata/document_completion_local_inline_struct.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion_x.json -cmpenv output/completion_x.json expected/completion_x.json +cmp output/completion_x.json expected/completion_x.json -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_completion_local_struct.txtar b/cmd/gnols/testdata/document_completion_local_struct.txtar index f1e96e8..3368c2d 100644 --- a/cmd/gnols/testdata/document_completion_local_struct.txtar +++ b/cmd/gnols/testdata/document_completion_local_struct.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion_x.json -cmpenv output/completion_x.json expected/completion_x.json +cmp output/completion_x.json expected/completion_x.json -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_completion_local_struct_different_block.txtar b/cmd/gnols/testdata/document_completion_local_struct_different_block.txtar index 4e35466..111fb17 100644 --- a/cmd/gnols/testdata/document_completion_local_struct_different_block.txtar +++ b/cmd/gnols/testdata/document_completion_local_struct_different_block.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion_x.json -cmpenv output/completion_x.json expected/completion_x.json +cmp output/completion_x.json expected/completion_x.json -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_completion_local_struct_global_var.txtar b/cmd/gnols/testdata/document_completion_local_struct_global_var.txtar index c4734a4..69bfe80 100644 --- a/cmd/gnols/testdata/document_completion_local_struct_global_var.txtar +++ b/cmd/gnols/testdata/document_completion_local_struct_global_var.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion_x.json -cmpenv output/completion_x.json expected/completion_x.json +cmp output/completion_x.json expected/completion_x.json -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_completion_local_struct_one_selector.txtar b/cmd/gnols/testdata/document_completion_local_struct_one_selector.txtar index 6631bf1..cf2f211 100644 --- a/cmd/gnols/testdata/document_completion_local_struct_one_selector.txtar +++ b/cmd/gnols/testdata/document_completion_local_struct_one_selector.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion_x.json -cmpenv output/completion_x.json expected/completion_x.json +cmp output/completion_x.json expected/completion_x.json -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_completion_local_struct_three_selectors.txtar b/cmd/gnols/testdata/document_completion_local_struct_three_selectors.txtar index 1bdacdc..9da0bfd 100644 --- a/cmd/gnols/testdata/document_completion_local_struct_three_selectors.txtar +++ b/cmd/gnols/testdata/document_completion_local_struct_three_selectors.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion_x.json -cmpenv output/completion_x.json expected/completion_x.json +cmp output/completion_x.json expected/completion_x.json -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_completion_local_struct_three_selectors_inline.txtar b/cmd/gnols/testdata/document_completion_local_struct_three_selectors_inline.txtar index de58c18..a023111 100644 --- a/cmd/gnols/testdata/document_completion_local_struct_three_selectors_inline.txtar +++ b/cmd/gnols/testdata/document_completion_local_struct_three_selectors_inline.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion_x.json -cmpenv output/completion_x.json expected/completion_x.json +cmp output/completion_x.json expected/completion_x.json -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_completion_local_struct_two_selectors.txtar b/cmd/gnols/testdata/document_completion_local_struct_two_selectors.txtar index c472337..16bd4f0 100644 --- a/cmd/gnols/testdata/document_completion_local_struct_two_selectors.txtar +++ b/cmd/gnols/testdata/document_completion_local_struct_two_selectors.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion_x.json -cmpenv output/completion_x.json expected/completion_x.json +cmp output/completion_x.json expected/completion_x.json -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_completion_stdlib_bufio.txtar b/cmd/gnols/testdata/document_completion_stdlib_bufio.txtar index 2e29a59..1f7756a 100644 --- a/cmd/gnols/testdata/document_completion_stdlib_bufio.txtar +++ b/cmd/gnols/testdata/document_completion_stdlib_bufio.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion.json -cmpenv output/completion.json expected/completion.json +cmp output/completion.json expected/completion.json -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_completion_stdlib_strconv.txtar b/cmd/gnols/testdata/document_completion_stdlib_strconv.txtar index 9f6f28d..95a95a2 100644 --- a/cmd/gnols/testdata/document_completion_stdlib_strconv.txtar +++ b/cmd/gnols/testdata/document_completion_stdlib_strconv.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion.json -cmpenv output/completion.json expected/completion.json +cmp output/completion.json expected/completion.json -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_completion_subpackage.txtar b/cmd/gnols/testdata/document_completion_subpackage.txtar index 633a2e1..0e3b9d7 100644 --- a/cmd/gnols/testdata/document_completion_subpackage.txtar +++ b/cmd/gnols/testdata/document_completion_subpackage.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion.json -cmpenv output/completion.json expected/completion.json +cmp output/completion.json expected/completion.json -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_completion_subpackage_multiple_selectors.txtar b/cmd/gnols/testdata/document_completion_subpackage_multiple_selectors.txtar index d38afd4..ad82e47 100644 --- a/cmd/gnols/testdata/document_completion_subpackage_multiple_selectors.txtar +++ b/cmd/gnols/testdata/document_completion_subpackage_multiple_selectors.txtar @@ -5,7 +5,7 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/completion input/completion.json -cmpenv output/completion.json expected/completion.json +cmp output/completion.json expected/completion.json -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_definition.txtar b/cmd/gnols/testdata/document_definition.txtar index 6b372dc..bb66fc9 100644 --- a/cmd/gnols/testdata/document_definition.txtar +++ b/cmd/gnols/testdata/document_definition.txtar @@ -11,7 +11,6 @@ cmpenv output/definition_x_3_5.json expected/definition_x_3_5.json # definition in an other file lsp textDocument/definition input/definition_x_4_2.json cmpenv output/definition_x_4_2.json expected/definition_x_4_2.json - -- x.gno -- package foo diff --git a/cmd/gnols/testdata/document_formatting.txtar b/cmd/gnols/testdata/document_formatting.txtar index e2bb2c2..4183b45 100644 --- a/cmd/gnols/testdata/document_formatting.txtar +++ b/cmd/gnols/testdata/document_formatting.txtar @@ -5,11 +5,11 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/formatting input/formatting.json -cmpenv output/formatting.json expected/formatting.json +cmp output/formatting.json expected/formatting.json -- x.gno -- package foo -func Hello(){} +func Hello() {} -- input/initialize.json -- { "rootUri": "file://$WORK" diff --git a/cmd/gnols/testdata/document_formatting_imports.txtar b/cmd/gnols/testdata/document_formatting_imports.txtar index 4adb32c..3e96368 100644 --- a/cmd/gnols/testdata/document_formatting_imports.txtar +++ b/cmd/gnols/testdata/document_formatting_imports.txtar @@ -5,11 +5,11 @@ lsp workspace/didChangeConfiguration input/didChangeConfiguration.json lsp textDocument/didOpen input/didOpen_x.json lsp textDocument/formatting input/formatting.json -cmpenv output/formatting.json expected/formatting.json +cmp output/formatting.json expected/formatting.json -- x.gno -- package foo -func Hello(){ +func Hello() { ufmt.Sprintf() } -- input/initialize.json --