Fix the eclipselsp tests

This commit is contained in:
w0rp 2019-05-21 21:23:21 +01:00
parent 0427ee84b4
commit 67d49c75a8
No known key found for this signature in database
GPG Key ID: 0FC1ECAA8C81CD83

View File

@ -1,19 +1,21 @@
Before: Before:
call ale#assert#SetUpLinterTest('java', 'eclipselsp') call ale#assert#SetUpLinterTest('java', 'eclipselsp')
let b:ale_java_eclipselsp_path = '/home/user/eclipse.dst.ls'
call ale#test#SetFilename('dummy.java') call ale#test#SetFilename('dummy.java')
let b:cfg = '/testplugin/test/config_linux' let b:ale_java_eclipselsp_path = '/home/user/eclipse.dst.ls'
let b:cfg = ale#path#Simplify(g:dir . '/../config_linux')
if has('win32') if has('win32')
let b:cfg = 'C:\testplugin\test\config_win' let b:cfg = ale#path#Simplify(g:dir . '/../config_win')
elseif has('macunix') elseif has('macunix')
let b:cfg = '/testplugin/test/config_mac' let b:cfg = ale#path#Simplify(g:dir . '/../config_mac')
endif endif
After: After:
unlet b:ale_java_eclipselsp_path unlet! b:ale_java_eclipselsp_path
unlet! b:cfg
call ale#assert#TearDownLinterTest() call ale#assert#TearDownLinterTest()
Execute(VersionCheck should return correct version): Execute(VersionCheck should return correct version):
@ -86,7 +88,7 @@ Execute(The eclipselsp callback should allow custom executable):
AssertLinter '/bin/foobar', join(cmd, ' ') AssertLinter '/bin/foobar', join(cmd, ' ')
Execute(The eclipselsp callback should allow custom configuration path): Execute(The eclipselsp callback should allow custom configuration path):
let b:ale_java_eclipselsp_config_path='/home/config' let b:ale_java_eclipselsp_config_path = '/home/config'
let cmd = [ ale#Escape('java'), let cmd = [ ale#Escape('java'),
\ '-Declipse.application=org.eclipse.jdt.ls.core.id1', \ '-Declipse.application=org.eclipse.jdt.ls.core.id1',
\ '-Dosgi.bundles.defaultStartLevel=4', \ '-Dosgi.bundles.defaultStartLevel=4',
@ -97,7 +99,7 @@ Execute(The eclipselsp callback should allow custom configuration path):
\ '-jar', \ '-jar',
\ '', \ '',
\ '-configuration', \ '-configuration',
\ b:ale_java_eclipselsp_config_path, \ ale#path#Simplify('/home/config'),
\ '-data', \ '-data',
\ '' \ ''
\] \]