Get tests to pass in Vim 8.1

1 files changed, 46 insertions, 26 deletions

diff --git a/test/test_ale_toggle.vader b/test/test_ale_toggle.vader
index 3b3c509c..db891009 100644
--- a/test/test_ale_toggle.vader
+++ b/test/test_ale_toggle.vader
@@ -115,7 +115,7 @@ Execute(ALEToggle should reset everything and then run again):
   ALELint
 
   " First check that everything is there...
-  AssertEqual g:expected_loclist, getloclist(0)
+  AssertEqual g:expected_loclist, ale#test#GetLoclistWithoutModule()
   AssertEqual [0, [[2, 1000001, 'ALEErrorSign']]], ale#sign#FindCurrentSigns(bufnr('%'))
   AssertEqual
   \ [{'group': 'ALEError', 'pos1': [2, 3, 1]}],
@@ -128,7 +128,7 @@ Execute(ALEToggle should reset everything and then run again):
 
   " Everything should be cleared.
   Assert !has_key(g:ale_buffer_info, bufnr('')), 'The g:ale_buffer_info Dictionary was not removed'
-  AssertEqual [], getloclist(0), 'The loclist was not cleared'
+  AssertEqual [], ale#test#GetLoclistWithoutModule(), 'The loclist was not cleared'
   AssertEqual [0, []], ale#sign#FindCurrentSigns(bufnr('%')), 'The signs were not cleared'
   AssertEqual [], getmatches(), 'The highlights were not cleared'
   AssertEqual g:expected_groups, ParseAuGroups()
@@ -136,7 +136,7 @@ Execute(ALEToggle should reset everything and then run again):
   " Toggle ALE on, everything should be set up and run again.
   ALEToggle
 
-  AssertEqual g:expected_loclist, getloclist(0)
+  AssertEqual g:expected_loclist, ale#test#GetLoclistWithoutModule()
   AssertEqual [0, [[2, 1000001, 'ALEErrorSign']]], ale#sign#FindCurrentSigns(bufnr('%'))
   AssertEqual
   \ [{'group': 'ALEError', 'pos1': [2, 3, 1]}],
@@ -189,16 +189,16 @@ Execute(ALEToggle should skip filename keys and preserve them):
 Execute(ALEDisable should reset everything and stay disabled):
   ALELint
 
-  AssertEqual g:expected_loclist, getloclist(0)
+  AssertEqual g:expected_loclist, ale#test#GetLoclistWithoutModule()
 
   ALEDisable
 
-  AssertEqual [], getloclist(0)
+  AssertEqual [], ale#test#GetLoclistWithoutModule()
   AssertEqual 0, g:ale_enabled
 
   ALEDisable
 
-  AssertEqual [], getloclist(0)
+  AssertEqual [], ale#test#GetLoclistWithoutModule()
   AssertEqual 0, g:ale_enabled
 
 Execute(ALEEnable should enable ALE and lint again):
@@ -206,7 +206,7 @@ Execute(ALEEnable should enable ALE and lint again):
 
   ALEEnable
 
-  AssertEqual g:expected_loclist, getloclist(0)
+  AssertEqual g:expected_loclist, ale#test#GetLoclistWithoutModule()
   AssertEqual 1, g:ale_enabled
 
 Execute(ALEReset should reset everything for a buffer):
@@ -215,7 +215,7 @@ Execute(ALEReset should reset everything for a buffer):
   ALELint
 
   " First check that everything is there...
-  AssertEqual g:expected_loclist, getloclist(0)
+  AssertEqual g:expected_loclist, ale#test#GetLoclistWithoutModule()
   AssertEqual [0, [[2, 1000001, 'ALEErrorSign']]], ale#sign#FindCurrentSigns(bufnr('%'))
   AssertEqual
   \ [{'group': 'ALEError', 'pos1': [2, 3, 1]}],
@@ -227,7 +227,7 @@ Execute(ALEReset should reset everything for a buffer):
 
   " Everything should be cleared.
   Assert !has_key(g:ale_buffer_info, bufnr('')), 'The g:ale_buffer_info Dictionary was not removed'
-  AssertEqual [], getloclist(0), 'The loclist was not cleared'
+  AssertEqual [], ale#test#GetLoclistWithoutModule(), 'The loclist was not cleared'
   AssertEqual [0, []], ale#sign#FindCurrentSigns(bufnr('%')), 'The signs were not cleared'
   AssertEqual [], getmatches(), 'The highlights were not cleared'
 
@@ -239,7 +239,7 @@ Execute(ALEToggleBuffer should reset everything and then run again):
   ALELint
 
   " First check that everything is there...
-  AssertEqual g:expected_loclist, getloclist(0)
+  AssertEqual g:expected_loclist, ale#test#GetLoclistWithoutModule()
   AssertEqual [0, [[2, 1000001, 'ALEErrorSign']]], ale#sign#FindCurrentSigns(bufnr('%'))
   AssertEqual
   \ [{'group': 'ALEError', 'pos1': [2, 3, 1]}],
@@ -251,14 +251,14 @@ Execute(ALEToggleBuffer should reset everything and then run again):
 
   " Everything should be cleared.
   Assert !has_key(g:ale_buffer_info, bufnr('')), 'The g:ale_buffer_info Dictionary was not removed'
-  AssertEqual [], getloclist(0), 'The loclist was not cleared'
+  AssertEqual [], ale#test#GetLoclistWithoutModule(), 'The loclist was not cleared'
   AssertEqual [0, []], ale#sign#FindCurrentSigns(bufnr('%')), 'The signs were not cleared'
   AssertEqual [], getmatches(), 'The highlights were not cleared'
 
   " Toggle ALE on, everything should be set up and run again.
   ALEToggleBuffer
 
-  AssertEqual g:expected_loclist, getloclist(0)
+  AssertEqual g:expected_loclist, ale#test#GetLoclistWithoutModule()
   AssertEqual [0, [[2, 1000001, 'ALEErrorSign']]], ale#sign#FindCurrentSigns(bufnr('%'))
   AssertEqual
   \ [{'group': 'ALEError', 'pos1': [2, 3, 1]}],
@@ -269,11 +269,11 @@ Execute(ALEToggleBuffer should reset everything and then run again):
 Execute(ALEDisableBuffer should reset everything and stay disabled):
   ALELint
 
-  AssertEqual g:expected_loclist, getloclist(0)
+  AssertEqual g:expected_loclist, ale#test#GetLoclistWithoutModule()
 
   ALEDisableBuffer
 
-  AssertEqual [], getloclist(0)
+  AssertEqual [], ale#test#GetLoclistWithoutModule()
   AssertEqual 0, b:ale_enabled
 
 Execute(ALEEnableBuffer should enable ALE and lint again):
@@ -281,7 +281,7 @@ Execute(ALEEnableBuffer should enable ALE and lint again):
 
   ALEEnableBuffer
 
-  AssertEqual g:expected_loclist, getloclist(0)
+  AssertEqual g:expected_loclist, ale#test#GetLoclistWithoutModule()
   AssertEqual 1, b:ale_enabled
 
 Execute(ALEEnableBuffer should complain when ALE is disabled globally):
@@ -292,7 +292,7 @@ Execute(ALEEnableBuffer should complain when ALE is disabled globally):
     ALEEnableBuffer
   redir END
 
-  AssertEqual [], getloclist(0)
+  AssertEqual [], ale#test#GetLoclistWithoutModule()
   AssertEqual 0, b:ale_enabled
   AssertEqual 0, g:ale_enabled
   AssertEqual
@@ -305,7 +305,7 @@ Execute(ALEResetBuffer should reset everything for a buffer):
   ALELint
 
   " First check that everything is there...
-  AssertEqual g:expected_loclist, getloclist(0)
+  AssertEqual g:expected_loclist, ale#test#GetLoclistWithoutModule()
   AssertEqual [0, [[2, 1000001, 'ALEErrorSign']]], ale#sign#FindCurrentSigns(bufnr('%'))
   AssertEqual
   \ [{'group': 'ALEError', 'pos1': [2, 3, 1]}],
@@ -317,7 +317,7 @@ Execute(ALEResetBuffer should reset everything for a buffer):
 
   " Everything should be cleared.
   Assert !has_key(g:ale_buffer_info, bufnr('')), 'The g:ale_buffer_info Dictionary was not removed'
-  AssertEqual [], getloclist(0), 'The loclist was not cleared'
+  AssertEqual [], ale#test#GetLoclistWithoutModule(), 'The loclist was not cleared'
   AssertEqual [0, []], ale#sign#FindCurrentSigns(bufnr('%')), 'The signs were not cleared'
   AssertEqual [], getmatches(), 'The highlights were not cleared'
 
@@ -326,40 +326,60 @@ Execute(ALEResetBuffer should reset everything for a buffer):
 
 Execute(Disabling ALE should disable balloons):
   " These tests won't run in the console, but we can run them manually in GVim.
-  if has('balloon_eval') && has('gui_running') ||
-  \  has('balloon_eval_term') && !has('gui_running')
+  if has('balloon_eval') && has('gui_running')
+  \|| (has('balloon_eval_term') && !has('gui_running'))
     call ale#linter#Reset()
 
     " Enable balloons, so we can check the expr value.
     call ale#balloon#Enable()
 
-    AssertEqual 1, &ballooneval
+    if has('balloon_eval') && has('gui_running')
+      AssertEqual 1, &ballooneval
+    else
+      AssertEqual 1, &balloonevalterm
+    endif
+
     AssertEqual 'ale#balloon#Expr()', &balloonexpr
 
     " Toggle ALE off.
     ALEToggle
 
     " The balloon settings should be reset.
-    AssertEqual 0, &ballooneval
+    if has('balloon_eval') && has('gui_running')
+      AssertEqual 0, &ballooneval
+    else
+      AssertEqual 0, &balloonevalterm
+    endif
+
     AssertEqual '', &balloonexpr
   endif
 
 Execute(Enabling ALE should enable balloons if the setting is on):
-  if has('balloon_eval') && has('gui_running') ||
-  \  has('balloon_eval_term') && !has('gui_running')
+  if has('balloon_eval') && has('gui_running')
+  \|| (has('balloon_eval_term') && !has('gui_running'))
     call ale#linter#Reset()
     call ale#balloon#Disable()
     ALEDisable
     let g:ale_set_balloons = 0
     ALEEnable
 
-    AssertEqual 0, &ballooneval
+    if has('balloon_eval') && has('gui_running')
+      AssertEqual 0, &ballooneval
+    else
+      AssertEqual 0, &balloonevalterm
+    endif
+
     AssertEqual '', &balloonexpr
 
     ALEDisable
     let g:ale_set_balloons = 1
     ALEEnable
 
-    AssertEqual 1, &ballooneval
+    if has('balloon_eval') && has('gui_running')
+      AssertEqual 1, &ballooneval
+    else
+      AssertEqual 1, &balloonevalterm
+    endif
+
     AssertEqual 'ale#balloon#Expr()', &balloonexpr
   endif