From 67d49c75a819aa4e7ded97785a1014ba18f06e5d Mon Sep 17 00:00:00 2001 From: w0rp Date: Tue, 21 May 2019 21:23:21 +0100 Subject: [PATCH] Fix the eclipselsp tests --- .../test_eclipselsp_command_callback.vader | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/test/command_callback/test_eclipselsp_command_callback.vader b/test/command_callback/test_eclipselsp_command_callback.vader index 881eb8c1..2d2b4613 100644 --- a/test/command_callback/test_eclipselsp_command_callback.vader +++ b/test/command_callback/test_eclipselsp_command_callback.vader @@ -1,19 +1,21 @@ Before: call ale#assert#SetUpLinterTest('java', 'eclipselsp') - let b:ale_java_eclipselsp_path = '/home/user/eclipse.dst.ls' 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') - let b:cfg = 'C:\testplugin\test\config_win' + let b:cfg = ale#path#Simplify(g:dir . '/../config_win') elseif has('macunix') - let b:cfg = '/testplugin/test/config_mac' + let b:cfg = ale#path#Simplify(g:dir . '/../config_mac') endif - After: - unlet b:ale_java_eclipselsp_path + unlet! b:ale_java_eclipselsp_path + unlet! b:cfg + call ale#assert#TearDownLinterTest() Execute(VersionCheck should return correct version): @@ -86,7 +88,7 @@ Execute(The eclipselsp callback should allow custom executable): AssertLinter '/bin/foobar', join(cmd, ' ') 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'), \ '-Declipse.application=org.eclipse.jdt.ls.core.id1', \ '-Dosgi.bundles.defaultStartLevel=4', @@ -97,7 +99,7 @@ Execute(The eclipselsp callback should allow custom configuration path): \ '-jar', \ '', \ '-configuration', - \ b:ale_java_eclipselsp_config_path, + \ ale#path#Simplify('/home/config'), \ '-data', \ '' \]