From c546f47cc0c003053fb157b0ca2cced46b5429bc Mon Sep 17 00:00:00 2001 From: w0rp Date: Mon, 24 Oct 2016 20:21:32 +0100 Subject: Merge everything into the one global map. --- test/test_alelint_autocmd.vader | 3 +++ test/test_cleanup.vader | 6 ------ test/test_cursor_warnings.vader | 38 +++++++++++++++++---------------- test/test_get_loclist.vader | 31 +++++++++++++++++++++++++++ test/test_linting_sets_signs.vader | 1 - test/test_linting_updates_loclist.vader | 28 ++++++++++++++++++++---- test/test_statusline.vader | 31 ++++++++++++++------------- 7 files changed, 94 insertions(+), 44 deletions(-) create mode 100644 test/test_get_loclist.vader (limited to 'test') diff --git a/test/test_alelint_autocmd.vader b/test/test_alelint_autocmd.vader index 86772b61..22fe1935 100644 --- a/test/test_alelint_autocmd.vader +++ b/test/test_alelint_autocmd.vader @@ -7,11 +7,14 @@ Before: After: augroup! VaderTest + let g:ale_buffer_info = {} Given vim (Some vimscript): set nocompatible + Execute (Lint it): call ale#Lint() call ale#engine#WaitForJobs(2000) + Then (Autocommands should have run): AssertEqual g:success, 1 diff --git a/test/test_cleanup.vader b/test/test_cleanup.vader index a700d6b5..ec2b38aa 100644 --- a/test/test_cleanup.vader +++ b/test/test_cleanup.vader @@ -1,9 +1,5 @@ Before: let g:buffer = bufnr('%') - let g:ale_buffer_loclist_map = { - \ g:buffer : [], - \ 10347: [], - \} let g:ale_buffer_info = { \ g:buffer : {}, @@ -12,10 +8,8 @@ Before: After: unlet! g:buffer - let g:ale_buffer_loclist_map = {} let g:ale_buffer_info = {} Execute('ALE globals should be cleared when the buffer is closed.'): :q! - AssertEqual {10347: []}, g:ale_buffer_loclist_map AssertEqual {10347: {}}, g:ale_buffer_info diff --git a/test/test_cursor_warnings.vader b/test/test_cursor_warnings.vader index 364db4bc..b12f2451 100644 --- a/test/test_cursor_warnings.vader +++ b/test/test_cursor_warnings.vader @@ -1,17 +1,18 @@ Before: - let g:ale_buffer_loclist_map = { - \ bufnr('%'): [ - \ { - \ 'lnum': 1, - \ 'bufnr': bufnr('%'), - \ 'vcol': 0, - \ 'linter_name': 'eslint', - \ 'nr': -1, - \ 'type': 'E', - \ 'col': 10, - \ 'text': 'Missing semicolon. (semi)' - \ }, - \ { + let g:ale_buffer_info = { + \ bufnr('%'): { + \ 'loclist': [ + \ { + \ 'lnum': 1, + \ 'bufnr': bufnr('%'), + \ 'vcol': 0, + \ 'linter_name': 'eslint', + \ 'nr': -1, + \ 'type': 'E', + \ 'col': 10, + \ 'text': 'Missing semicolon. (semi)' + \ }, + \ { \ 'lnum': 2, \ 'bufnr': bufnr('%'), \ 'vcol': 0, @@ -20,8 +21,8 @@ Before: \ 'type': 'W', \ 'col': 10, \ 'text': 'Infix operators must be spaced. (space-infix-ops)' - \ }, - \ { + \ }, + \ { \ 'lnum': 2, \ 'bufnr': bufnr('%'), \ 'vcol': 0, @@ -30,14 +31,15 @@ Before: \ 'type': 'E', \ 'col': 15, \ 'text': 'Missing radix parameter (radix)' - \ } - \ ], + \ } + \ ], + \ }, \} After: unlet! g:output unlet! g:lines - let g:ale_buffer_loclist_map = {} + let g:ale_buffer_info = {} Given javascript(A Javscript file with warnings/errors): var x = 3 diff --git a/test/test_get_loclist.vader b/test/test_get_loclist.vader new file mode 100644 index 00000000..14696998 --- /dev/null +++ b/test/test_get_loclist.vader @@ -0,0 +1,31 @@ +Before: + let g:loclist = [ + \ { + \ 'lnum': 1, + \ 'bufnr': bufnr('%'), + \ 'vcol': 0, + \ 'linter_name': 'eslint', + \ 'nr': -1, + \ 'type': 'E', + \ 'col': 10, + \ 'text': 'Missing semicolon. (semi)' + \ }, + \ { + \ 'lnum': 2, + \ 'bufnr': bufnr('%'), + \ 'vcol': 0, + \ 'linter_name': 'eslint', + \ 'nr': -1, + \ 'type': 'W', + \ 'col': 10, + \ 'text': 'Infix operators must be spaced. (space-infix-ops)' + \ }, + \] + let g:ale_buffer_info = {'1': {'loclist': g:loclist}} + +After: + unlet g:loclist + let g:ale_buffer_info = {} + +Execute(GetLoclist should return the loclist): + AssertEqual g:loclist, ale#engine#GetLoclist(1) diff --git a/test/test_linting_sets_signs.vader b/test/test_linting_sets_signs.vader index 1f323fe8..e96e490b 100644 --- a/test/test_linting_sets_signs.vader +++ b/test/test_linting_sets_signs.vader @@ -26,7 +26,6 @@ Before: After: sign unplace * - let g:ale_buffer_loclist_map = {} let g:ale_buffer_info = {} delfunction g:CollectSigns unlet g:actual_sign_list diff --git a/test/test_linting_updates_loclist.vader b/test/test_linting_updates_loclist.vader index 920a4e46..06f11d8b 100644 --- a/test/test_linting_updates_loclist.vader +++ b/test/test_linting_updates_loclist.vader @@ -3,15 +3,35 @@ Given javascript (Some JavaScript with problems): var y = 3 Before: - let g:ale_buffer_loclist_map = {} - let g:expected_data = {bufnr('%'): [{'lnum': 1, 'bufnr': bufnr('%'), 'vcol': 0, 'linter_name': 'eslint', 'nr': -1, 'type': 'W', 'col': 10, 'text': 'Infix operators must be spaced. [Warning/space-infix-ops]'}, {'lnum': 2, 'bufnr': bufnr('%'), 'vcol': 0, 'linter_name': 'eslint', 'nr': -1, 'type': 'E', 'col': 10, 'text': 'Missing semicolon. [Error/semi]'}]} + let g:expected_data = [ + \ { + \ 'lnum': 1, + \ 'bufnr': bufnr('%'), + \ 'vcol': 0, + \ 'linter_name': 'eslint', + \ 'nr': -1, + \ 'type': 'W', + \ 'col': 10, + \ 'text': 'Infix operators must be spaced. [Warning/space-infix-ops]', + \ }, + \ { + \ 'lnum': 2, + \ 'bufnr': bufnr('%'), + \ 'vcol': 0, + \ 'linter_name': 'eslint', + \ 'nr': -1, + \ 'type': 'E', + \ 'col': 10, + \ 'text': 'Missing semicolon. [Error/semi]', + \ } + \] After: - let g:ale_buffer_loclist_map = {} unlet g:expected_data Execute(The loclist should be updated after linting is done): call ale#Lint() call ale#engine#WaitForJobs(2000) - AssertEqual g:expected_data, g:ale_buffer_loclist_map + AssertEqual ['' . bufnr('%')], keys(g:ale_buffer_info) + AssertEqual g:expected_data, g:ale_buffer_info[bufnr('%')].loclist diff --git a/test/test_statusline.vader b/test/test_statusline.vader index 43245e97..05e60479 100644 --- a/test/test_statusline.vader +++ b/test/test_statusline.vader @@ -1,9 +1,7 @@ Before: - let g:ale_buffer_loclist_map = {} let g:ale_statusline_format = ['%sE', '%sW', 'OKIE'] After: - let g:ale_buffer_loclist_map = {} let g:ale_buffer_info = {} Execute (Count should be 0 when data is empty): @@ -20,19 +18,22 @@ Execute (The count should be correct after an update): AssertEqual [0, 0], ale#statusline#Count(44) Execute (Count should be match the loclist): - let g:ale_buffer_info = {bufnr('%'): {}} - let g:ale_buffer_loclist_map = {bufnr('%'): [ - \ { - \ 'lnum': 1, - \ 'bufnr': 1, - \ 'vcol': 0, - \ 'linter_name': 'testlinter', - \ 'nr': -1, - \ 'type': 'E', - \ 'col': 1, - \ 'text': 'Test Error', - \ }, - \]} + let g:ale_buffer_info = { + \ bufnr('%'): { + \ 'loclist': [ + \ { + \ 'lnum': 1, + \ 'bufnr': 1, + \ 'vcol': 0, + \ 'linter_name': 'testlinter', + \ 'nr': -1, + \ 'type': 'E', + \ 'col': 1, + \ 'text': 'Test Error', + \ }, + \ ], + \ }, + \} AssertEqual [1, 0], ale#statusline#Count(bufnr('%')) Execute (Output should be empty for non-existant buffer): -- cgit v1.2.3