Skip to content

Commit 7cf67be

Browse files
committed
Fix Windows support
Fix #5
1 parent c19f370 commit 7cf67be

File tree

2 files changed

+15
-27
lines changed

2 files changed

+15
-27
lines changed

autoload/javaunit.vim

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,47 +41,47 @@ function javaunit#TestMethod(args,...)
4141
if a:args == ""
4242
let cwords = split(airline#extensions#tagbar#currenttag(),'(')[0]
4343
if filereadable('pom.xml')
44-
let cmd='java -cp "'
44+
let cmd="java -cp '"
4545
\.s:JavaUnit_tempdir
4646
\.s:Psep
4747
\.getcwd()
4848
\.join(['','target','test-classes'],s:Fsep)
4949
\.s:Psep
5050
\.get(g:,'JavaComplete_LibsPath','.')
51-
\.'" com.wsdjeg.util.TestMethod '
51+
\."' com.wsdjeg.util.TestMethod "
5252
\.currentClassName
5353
\.' '
5454
\.cwords
5555
else
56-
let cmd='java -cp "'
56+
let cmd="java -cp '"
5757
\.s:JavaUnit_tempdir
5858
\.s:Psep
5959
\.get(g:,'JavaComplete_LibsPath','.')
60-
\.'" com.wsdjeg.util.TestMethod '
60+
\."' com.wsdjeg.util.TestMethod "
6161
\.currentClassName
6262
\.' '
6363
\.cwords
6464
endif
6565
call javaunit#util#ExecCMD(cmd)
6666
else
6767
if filereadable('pom.xml')
68-
let cmd='java -cp "'
68+
let cmd="java -cp '"
6969
\.s:JavaUnit_tempdir
7070
\.s:Psep
7171
\.getcwd()
7272
\.join(['','target','test-classes'],s:Fsep)
7373
\.s:Psep
7474
\.get(g:,'JavaComplete_LibsPath','.')
75-
\.'" com.wsdjeg.util.TestMethod '
75+
\."' com.wsdjeg.util.TestMethod "
7676
\.currentClassName
7777
\.' '
7878
\.a:args
7979
else
80-
let cmd='java -cp "'
80+
let cmd="java -cp '"
8181
\.s:JavaUnit_tempdir
8282
\.s:Psep
8383
\.get(g:,'JavaComplete_LibsPath','.')
84-
\.'" com.wsdjeg.util.TestMethod '
84+
\."' com.wsdjeg.util.TestMethod "
8585
\.currentClassName
8686
\.' '
8787
\.a:args
@@ -93,7 +93,7 @@ endfunction
9393
function javaunit#TestAllMethods()
9494
let line = getline(search("package","nb",getline("0$")))
9595
let currentClassName = split(split(line," ")[1],";")[0].".".expand("%:t:r")
96-
let cmd='java -cp "'.s:JavaUnit_tempdir.s:Psep.g:JavaComplete_LibsPath.'" com.wsdjeg.util.TestMethod '.currentClassName
96+
let cmd="java -cp '" . s:JavaUnit_tempdir.s:Psep.g:JavaComplete_LibsPath . "' com.wsdjeg.util.TestMethod " . currentClassName
9797
call javaunit#util#ExecCMD(cmd)
9898
endfunction
9999

@@ -153,23 +153,23 @@ function! javaunit#TestMain(...) abort
153153
let currentClassName = expand("%:t:r")
154154
endif
155155
if filereadable('pom.xml')
156-
let cmd='java -cp "'
156+
let cmd="java -cp '"
157157
\.s:JavaUnit_tempdir
158158
\.s:Psep
159159
\.getcwd()
160160
\.join(['','target','test-classes'],s:Fsep)
161161
\.s:Psep
162162
\.get(g:,'JavaComplete_LibsPath','.')
163-
\.'" '
163+
\."' "
164164
\.currentClassName
165165
\.' '
166166
\.(len(a:000) > 0 ? join(a:000,' ') : '')
167167
else
168-
let cmd='java -cp "'
168+
let cmd="java -cp '"
169169
\.s:JavaUnit_tempdir
170170
\.s:Psep
171171
\.get(g:,'JavaComplete_LibsPath','.')
172-
\.'" '
172+
\."' "
173173
\.currentClassName
174174
\.' '
175175
\.(len(a:000) > 0 ? join(a:000,' ') : '')

autoload/javaunit/util.vim

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,11 @@ function! javaunit#util#Psep() abort
3333
endfunction
3434

3535
function! javaunit#util#ExecCMD(cmd)
36-
if s:WINDOWS()
37-
echomsg system(a:cmd)
38-
else
39-
call unite#start([['output/shellcmd', s:EscapeCMD(a:cmd)]], {'log': 1, 'wrap': 1})
40-
endif
36+
call unite#start([['output/shellcmd', s:EscapeCMD(a:cmd)]], {'log': 1, 'wrap': 1})
4137
endfunction
4238

4339
function! s:EscapeCMD(cmd)
44-
let cmd = a:cmd
45-
if s:WINDOWS()
46-
let cmd = substitute(a:cmd,' ','\\ ','g')
47-
let cmd = substitute(cmd,'\','\\\','g')
48-
let cmd = substitute(cmd,';','\\;','g')
49-
let cmd = substitute(cmd, '\t', '\\t', 'g')
50-
let cmd = substitute(cmd,':','\\:','g')
51-
endif
52-
return cmd
40+
return a:cmd
5341
endfunction
5442

5543
let &cpo = s:save_cpo

0 commit comments

Comments
 (0)