Update ExecCMD

Author: wsdjeg

autoload/javaunit.vim

@@ -62,8 +62,7 @@ function javaunit#TestMethod(args,...)
                         \.' '
                         \.cwords
         endif
-        let cmd = javaunit#util#EscapeCMD(cmd)
-        call unite#start([['output/shellcmd', cmd]], {'log': 1, 'wrap': 1})
+        call javaunit#util#ExecCMD(cmd)
     else
         if filereadable('pom.xml')
             let cmd='java -cp "'
@@ -87,15 +86,15 @@ function javaunit#TestMethod(args,...)
                         \.' '
                         \.a:args
         endif
-        call unite#start([['output/shellcmd', cmd]], {'log': 1, 'wrap': 1})
+        call javaunit#util#ExecCMD(cmd)
     endif
 endfunction
 
 function javaunit#TestAllMethods()
     let line = getline(search("package","nb",getline("0$")))
     let currentClassName = split(split(line," ")[1],";")[0].".".expand("%:t:r")
     let cmd='java -cp "'.s:JavaUnit_tempdir.s:Psep.g:JavaComplete_LibsPath.'" com.wsdjeg.util.TestMethod '.currentClassName
-    call unite#start([['output/shellcmd', cmd]], {'log': 1, 'wrap': 1})
+    call javaunit#util#ExecCMD(cmd)
 endfunction
 
 
@@ -108,7 +107,7 @@ endfunction
 
 function javaunit#MavenTestAll()
     let cmd = 'mvn test|ag --nocolor "^[^[]"'
-    call unite#start([['output/shellcmd', cmd]], {'log': 1, 'wrap': 1})
+    call javaunit#util#ExecCMD(cmd)
 endfunction
 
 function javaunit#NewTestClass(classNAME)
@@ -153,29 +152,29 @@ function! javaunit#TestMain(...) abort
     else
         let currentClassName = expand("%:t:r")
     endif
-        if filereadable('pom.xml')
-            let cmd='java -cp "'
-                        \.s:JavaUnit_tempdir
-                        \.s:Psep
-                        \.getcwd()
-                        \.join(['','target','test-classes'],s:Fsep)
-                        \.s:Psep
-                        \.get(g:,'JavaComplete_LibsPath','.')
-                        \.'" '
-                        \.currentClassName
-                        \.' '
-                        \.(len(a:000) > 0 ? join(a:000,' ') : '')
-        else
-            let cmd='java -cp "'
-                        \.s:JavaUnit_tempdir
-                        \.s:Psep
-                        \.get(g:,'JavaComplete_LibsPath','.')
-                        \.'" '
-                        \.currentClassName
-                        \.' '
-                        \.(len(a:000) > 0 ? join(a:000,' ') : '')
-        endif
-        call unite#start([['output/shellcmd', cmd]], {'log': 1, 'wrap': 1})
+    if filereadable('pom.xml')
+        let cmd='java -cp "'
+                    \.s:JavaUnit_tempdir
+                    \.s:Psep
+                    \.getcwd()
+                    \.join(['','target','test-classes'],s:Fsep)
+                    \.s:Psep
+                    \.get(g:,'JavaComplete_LibsPath','.')
+                    \.'" '
+                    \.currentClassName
+                    \.' '
+                    \.(len(a:000) > 0 ? join(a:000,' ') : '')
+    else
+        let cmd='java -cp "'
+                    \.s:JavaUnit_tempdir
+                    \.s:Psep
+                    \.get(g:,'JavaComplete_LibsPath','.')
+                    \.'" '
+                    \.currentClassName
+                    \.' '
+                    \.(len(a:000) > 0 ? join(a:000,' ') : '')
+    endif
+    call javaunit#util#ExecCMD(cmd)
 endfunction
 let &cpo = s:save_cpo
 unlet s:save_cpo

autoload/javaunit/util.vim

@@ -32,15 +32,25 @@ function! javaunit#util#Psep() abort
     endif
 endfunction
 
+function! javaunit#util#ExecCMD(cmd)
+        call unite#start([['output/shellcmd', s:EscapeCMD(a:cmd)]], {'log': 1, 'wrap': 1})
+endfunction
 
-function! javaunit#util#EscapeCMD(cmd)
-    let s:cmd = substitute(a:cmd,' ',':','g')
+function! s:EscapeCMD(cmd)
     if s:WINDOWS()
-        let s:cmd = substitute(s:cmd,';','\\;','g')
+        let cmd = substitute(a:cmd,' ','\\ ','g')
+        let cmd = substitute(cmd,'\','\\\','g')
+        let cmd = substitute(cmd,';','\\;','g')
+        let cmd = substitute(cmd, '\t', '\\t', 'g')
+        let cmd = substitute(cmd,':','\\:','g')
+    else
+        let cmd = substitute(a:cmd,' ','\\ ','g')
+        let cmd = substitute(cmd,'\','\\\','g')
+        let cmd = substitute(cmd,';','\\;','g')
+        let cmd = substitute(cmd, '\t', '\\t', 'g')
+        let cmd = substitute(cmd,':','\\:','g')
     endif
-    let s:cmd = substitute(s:cmd,'\','\\\','g')
-    let s:cmd = substitute(s:cmd, '\t', '\\t', 'g')
-    return substitute(s:cmd,':','\\:','g')
+    return cmd
 endfunction
 
 let &cpo = s:save_cpo