Skip to content

Commit 32ee225

Browse files
committed
Use unite#start()
1 parent 56c0806 commit 32ee225

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

plugin/javaunit.vim

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@ else
1818
let g:JavaUnit_tempdir = g:JavaUnit_Home .s:Fsep .'bin'
1919
endif
2020

21-
let s:JavaUnit_Exec = "Unite -log -wrap output/shellcmd:"
22-
2321
let s:JavaUnit_TestMethod_Source = g:JavaUnit_Home .s:Fsep .join(['src','com','wsdjeg','util','TestMethod.java'],s:Fsep)
2422

25-
lockvar! s:JavaUnit_Exec s:JavaUnit_TestMethod_Source g:JavaUnit_tempdir
23+
lockvar! s:JavaUnit_TestMethod_Source g:JavaUnit_tempdir
2624

2725
if findfile(g:JavaUnit_tempdir.join(['','com','wsdjeg','util','TestMethod.class'],s:Fsep))==""
2826
silent exec '!javac -encoding utf8 -d "'.g:JavaUnit_tempdir.'" "'.s:JavaUnit_TestMethod_Source .'"'
@@ -59,7 +57,7 @@ function JaveUnitTestMethod(args,...)
5957
\.' '
6058
\.cwords
6159
endif
62-
exec s:JavaUnit_Exec.JavaUnitEscapeCMD(cmd)
60+
call unite#start([['output/shellcmd', cmd]], {'log': 1, 'wrap': 1})
6361
else
6462
if filereadable('pom.xml')
6563
let cmd='java -cp "'
@@ -83,15 +81,15 @@ function JaveUnitTestMethod(args,...)
8381
\.' '
8482
\.a:args
8583
endif
86-
exec s:JavaUnit_Exec.JavaUnitEscapeCMD(cmd)
84+
call unite#start([['output/shellcmd', cmd]], {'log': 1, 'wrap': 1})
8785
endif
8886
endfunction
8987

9088
function JavaUnitTestAllMethods()
9189
let line = getline(search("package","nb",getline("0$")))
9290
let currentClassName = split(split(line," ")[1],";")[0].".".expand("%:t:r")
9391
let cmd='java -cp "'.g:JavaUnit_tempdir.s:Psep.g:JavaComplete_LibsPath.'" com.wsdjeg.util.TestMethod '.currentClassName
94-
exec s:JavaUnit_Exec.JavaUnitEscapeCMD(cmd)
92+
call unite#start([['output/shellcmd', cmd]], {'log': 1, 'wrap': 1})
9593
endfunction
9694

9795
function JavaUnitEscapeCMD(cmd)
@@ -106,11 +104,12 @@ function JavaUnitMavenTest()
106104
let line = getline(search("package","nb",getline("0$")))
107105
let currentClassName = split(split(line," ")[1],";")[0].".".expand("%:t:r")
108106
let cmd = 'mvn test -Dtest='.currentClassName.'|ag --nocolor "^[^[]"'
109-
exec s:JavaUnit_Exec.JavaUnitEscapeCMD(cmd)
107+
call unite#start([['output/shellcmd', cmd]], {'log': 1, 'wrap': 1})
110108
endfunction
111109

112110
function JavaUnitMavenTestAll()
113-
exec s:JavaUnit_Exec.JavaUnitEscapeCMD('mvn test|ag --nocolor "^[^[]"')
111+
let cmd = 'mvn test|ag --nocolor "^[^[]"'
112+
call unite#start([['output/shellcmd', cmd]], {'log': 1, 'wrap': 1})
114113
endfunction
115114

116115
function JavaUnitNewClass(classNAME)

0 commit comments

Comments
 (0)