From efd2b778c8780271aa6f97d9434d0cad60b66d5c Mon Sep 17 00:00:00 2001 From: SUGIYAMA Yoshio Date: Tue, 23 Jan 2024 11:00:08 +0900 Subject: [PATCH] test: Update tests Signed-off-by: SUGIYAMA Yoshio --- test/case/basic.vader | 14 +++++++------- test/case/custom_interval.vader | 8 ++++---- test/case/multiple-colors.vader | 8 ++++---- test/case/number.vader | 12 ++++++------ test/case/relative_number.vader | 20 ++++++++++---------- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/test/case/basic.vader b/test/case/basic.vader index e60b61b..3bb6338 100644 --- a/test/case/basic.vader +++ b/test/case/basic.vader @@ -8,23 +8,23 @@ Execute (Check fibonacci sequence.): AssertEqual [1, 2, 3, 5, 8, 13, 21], line_number_interval#fibonacci() Execute (Check highlight with default color.): - AssertEqual "\nLineNr xxx guifg=NvimDarkGrey4", execute('highlight LineNr') + AssertEqual "\nLineNr xxx guifg=NvimDarkGrey4", substitute(execute('highlight LineNr'), "ctermfg=11 guifg=Yellow", "guifg=NvimDarkGrey4", "") LineNumberIntervalEnable AssertEqual "\nLineNr xxx ctermfg=0 guifg=Black", execute('highlight LineNr') AssertEqual "\nDimLineNr xxx cleared", execute('highlight DimLineNr') - AssertEqual "\nHighlightedLineNr xxx guifg=NvimDarkGrey4", execute('highlight HighlightedLineNr') + AssertEqual "\nHighlightedLineNr xxx guifg=NvimDarkGrey4", substitute(execute('highlight HighlightedLineNr'), "ctermfg=11 guifg=Yellow", "guifg=NvimDarkGrey4", "") LineNumberIntervalDisable - AssertEqual "\nLineNr xxx guifg=NvimDarkGrey4", execute('highlight LineNr') + AssertEqual "\nLineNr xxx guifg=NvimDarkGrey4", substitute(execute('highlight LineNr'), "ctermfg=11 guifg=Yellow", "guifg=NvimDarkGrey4", "") Execute (Check highlight with configured color.): highlight HighlightedLineNr guifg=White ctermfg=7 highlight DimLineNr guifg=Magenta ctermfg=5 - AssertEqual "\nLineNr xxx guifg=NvimDarkGrey4", execute('highlight LineNr') + AssertEqual "\nLineNr xxx guifg=NvimDarkGrey4", substitute(execute('highlight LineNr'), "ctermfg=11 guifg=Yellow", "guifg=NvimDarkGrey4", "") LineNumberIntervalEnable @@ -34,7 +34,7 @@ Execute (Check highlight with configured color.): LineNumberIntervalDisable - AssertEqual "\nLineNr xxx guifg=NvimDarkGrey4", execute('highlight LineNr') + AssertEqual "\nLineNr xxx guifg=NvimDarkGrey4", substitute(execute('highlight LineNr'), "ctermfg=11 guifg=Yellow", "guifg=NvimDarkGrey4", "") Execute (Check autocmd.): AssertThrows autocmd LineNumberInterval @@ -65,7 +65,7 @@ Execute (Check sign group.): AssertEqual "\n--- Signs ---\n", execute('sign place group=LineNumberGroup') Execute (Check toggle.): - AssertEqual "\nLineNr xxx guifg=NvimDarkGrey4", execute('highlight LineNr') + AssertEqual "\nLineNr xxx guifg=NvimDarkGrey4", substitute(execute('highlight LineNr'), "ctermfg=11 guifg=Yellow", "guifg=NvimDarkGrey4", "") LineNumberIntervalToggle @@ -73,4 +73,4 @@ Execute (Check toggle.): LineNumberIntervalToggle - AssertEqual "\nLineNr xxx guifg=NvimDarkGrey4", execute('highlight LineNr') + AssertEqual "\nLineNr xxx guifg=NvimDarkGrey4", substitute(execute('highlight LineNr'), "ctermfg=11 guifg=Yellow", "guifg=NvimDarkGrey4", "") diff --git a/test/case/custom_interval.vader b/test/case/custom_interval.vader index 6192089..3b63972 100644 --- a/test/case/custom_interval.vader +++ b/test/case/custom_interval.vader @@ -26,12 +26,12 @@ Execute (Check use_custom with default interval.): AssertEqual [1, 2, 3, 5, 8, 13, 21], g:line_number_interval#custom_interval - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=2 id=1 group=LineNumberGroup name=LineNumberInterval priority=10\n line=3 id=2 group=LineNumberGroup name=LineNumberInterval priority=10\n line=4 id=3 group=LineNumberGroup name=LineNumberInterval priority=10\n line=6 id=4 group=LineNumberGroup name=LineNumberInterval priority=10\n line=9 id=5 group=LineNumberGroup name=LineNumberInterval priority=10\n line=14 id=6 group=LineNumberGroup name=LineNumberInterval priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=2 group=LineNumberGroup name=LineNumberInterval priority=10\n line=3 group=LineNumberGroup name=LineNumberInterval priority=10\n line=4 group=LineNumberGroup name=LineNumberInterval priority=10\n line=6 group=LineNumberGroup name=LineNumberInterval priority=10\n line=9 group=LineNumberGroup name=LineNumberInterval priority=10\n line=14 group=LineNumberGroup name=LineNumberInterval priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") 14 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=1 id=12 group=LineNumberGroup name=LineNumberInterval priority=10\n line=6 id=11 group=LineNumberGroup name=LineNumberInterval priority=10\n line=9 id=10 group=LineNumberGroup name=LineNumberInterval priority=10\n line=11 id=9 group=LineNumberGroup name=LineNumberInterval priority=10\n line=12 id=8 group=LineNumberGroup name=LineNumberInterval priority=10\n line=13 id=7 group=LineNumberGroup name=LineNumberInterval priority=10\n line=15 id=13 group=LineNumberGroup name=LineNumberInterval priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=1 group=LineNumberGroup name=LineNumberInterval priority=10\n line=6 group=LineNumberGroup name=LineNumberInterval priority=10\n line=9 group=LineNumberGroup name=LineNumberInterval priority=10\n line=11 group=LineNumberGroup name=LineNumberInterval priority=10\n line=12 group=LineNumberGroup name=LineNumberInterval priority=10\n line=13 group=LineNumberGroup name=LineNumberInterval priority=10\n line=15 group=LineNumberGroup name=LineNumberInterval priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") Execute (Check use_custom with custom interval.): let g:line_number_interval#use_custom = 1 @@ -44,9 +44,9 @@ Execute (Check use_custom with custom interval.): 2 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=5 id=16 group=LineNumberGroup name=LineNumberInterval priority=10\n line=11 id=17 group=LineNumberGroup name=LineNumberInterval priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=5 group=LineNumberGroup name=LineNumberInterval priority=10\n line=11 group=LineNumberGroup name=LineNumberInterval priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") 11 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=2 id=19 group=LineNumberGroup name=LineNumberInterval priority=10\n line=8 id=18 group=LineNumberGroup name=LineNumberInterval priority=10\n line=14 id=20 group=LineNumberGroup name=LineNumberInterval priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=2 group=LineNumberGroup name=LineNumberInterval priority=10\n line=8 group=LineNumberGroup name=LineNumberInterval priority=10\n line=14 group=LineNumberGroup name=LineNumberInterval priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") diff --git a/test/case/multiple-colors.vader b/test/case/multiple-colors.vader index 3674706..b2ec89a 100644 --- a/test/case/multiple-colors.vader +++ b/test/case/multiple-colors.vader @@ -30,12 +30,12 @@ Execute (Check multiple colors with relative number.): 2 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=5 id=23 group=LineNumberGroup name=LineNumberInterval1 priority=10\n line=11 id=24 group=LineNumberGroup name=LineNumberInterval priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=5 group=LineNumberGroup name=LineNumberInterval1 priority=10\n line=11 group=LineNumberGroup name=LineNumberInterval priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") 11 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=2 id=26 group=LineNumberGroup name=LineNumberInterval priority=10\n line=8 id=25 group=LineNumberGroup name=LineNumberInterval1 priority=10\n line=14 id=27 group=LineNumberGroup name=LineNumberInterval1 priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=2 group=LineNumberGroup name=LineNumberInterval priority=10\n line=8 group=LineNumberGroup name=LineNumberInterval1 priority=10\n line=14 group=LineNumberGroup name=LineNumberInterval1 priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") Execute (Check multiple colors with set number.): let g:line_number_interval#use_custom = 1 @@ -50,9 +50,9 @@ Execute (Check multiple colors with set number.): 2 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=5 id=31 group=LineNumberGroup name=LineNumberInterval1 priority=10\n line=10 id=30 group=LineNumberGroup name=LineNumberInterval priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=5 group=LineNumberGroup name=LineNumberInterval1 priority=10\n line=10 group=LineNumberGroup name=LineNumberInterval priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") 11 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=8 id=33 group=LineNumberGroup name=LineNumberInterval1 priority=10\n line=10 id=32 group=LineNumberGroup name=LineNumberInterval priority=10\n line=14 id=34 group=LineNumberGroup name=LineNumberInterval1 priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=8 group=LineNumberGroup name=LineNumberInterval1 priority=10\n line=10 group=LineNumberGroup name=LineNumberInterval priority=10\n line=14 group=LineNumberGroup name=LineNumberInterval1 priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") diff --git a/test/case/number.vader b/test/case/number.vader index 4afe25e..27e68b9 100644 --- a/test/case/number.vader +++ b/test/case/number.vader @@ -25,16 +25,16 @@ Execute (Check set number.): 2 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=10 id=36 group=LineNumberGroup name=LineNumberInterval priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=10 group=LineNumberGroup name=LineNumberInterval priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") 13 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=10 id=37 group=LineNumberGroup name=LineNumberInterval priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=10 group=LineNumberGroup name=LineNumberInterval priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") LineNumberIntervalDisable - AssertEqual "\n--- Signs ---\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "") Execute (Check set number with fold.): set number @@ -46,7 +46,7 @@ Execute (Check set number with fold.): 4 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=10 id=39 group=LineNumberGroup name=LineNumberInterval priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=10 group=LineNumberGroup name=LineNumberInterval priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") Execute (Check set number on fold.): set number @@ -58,7 +58,7 @@ Execute (Check set number on fold.): 4 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=10 id=41 group=LineNumberGroup name=LineNumberInterval priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=10 group=LineNumberGroup name=LineNumberInterval priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") Execute (Check set number with configured interval.): let g:line_number_interval = 7 @@ -70,4 +70,4 @@ Execute (Check set number with configured interval.): 3 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=7 id=44 group=LineNumberGroup name=LineNumberInterval priority=10\n line=14 id=45 group=LineNumberGroup name=LineNumberInterval priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=7 group=LineNumberGroup name=LineNumberInterval priority=10\n line=14 group=LineNumberGroup name=LineNumberInterval priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") diff --git a/test/case/relative_number.vader b/test/case/relative_number.vader index 0b8b8d7..b73fe22 100644 --- a/test/case/relative_number.vader +++ b/test/case/relative_number.vader @@ -22,12 +22,12 @@ Execute (Check set relativenumber.): LineNumberIntervalEnable - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=11 id=46 group=LineNumberGroup name=LineNumberInterval priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=11 group=LineNumberGroup name=LineNumberInterval priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") 13 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=3 id=47 group=LineNumberGroup name=LineNumberInterval priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=3 group=LineNumberGroup name=LineNumberInterval priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") Execute (Check set relativenumber with fold.): set relativenumber @@ -39,12 +39,12 @@ Execute (Check set relativenumber with fold.): 1 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=14 id=49 group=LineNumberGroup name=LineNumberInterval priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=14 group=LineNumberGroup name=LineNumberInterval priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") 15 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=2 id=50 group=LineNumberGroup name=LineNumberInterval priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=2 group=LineNumberGroup name=LineNumberInterval priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") Execute (Check set relativenumber on fold (forward).): set relativenumber @@ -58,12 +58,12 @@ Execute (Check set relativenumber on fold (forward).): 2 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=14 id=52 group=LineNumberGroup name=LineNumberInterval priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=14 group=LineNumberGroup name=LineNumberInterval priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") 14 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") Execute (Check set relativenumber on fold (backward).): set relativenumber @@ -77,12 +77,12 @@ Execute (Check set relativenumber on fold (backward).): 12 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=2 id=54 group=LineNumberGroup name=LineNumberInterval priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=2 group=LineNumberGroup name=LineNumberInterval priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") 2 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") Execute (Check set relativenumber with configured interval.): let g:line_number_interval = 7 @@ -94,9 +94,9 @@ Execute (Check set relativenumber with configured interval.): 3 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=10 id=57 group=LineNumberGroup name=LineNumberInterval priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=10 group=LineNumberGroup name=LineNumberInterval priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g") 13 doautocmd CursorMoved - AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=6 id=58 group=LineNumberGroup name=LineNumberInterval priority=10\n", execute('sign place group=LineNumberGroup') + AssertEqual "\n--- Signs ---\nSigns for [Vader-workbench]:\n line=6 group=LineNumberGroup name=LineNumberInterval priority=10\n", substitute(execute('sign place group=LineNumberGroup'), "id=\\d\\+", "", "g")