Run test/tests in file/tests in project

Author: nickspoons

autoload/OmniSharp/actions/test.vim

@@ -23,7 +23,7 @@ endfunction
 function! s:debug.prepare(bufferTests) abort
   let bufnr = a:bufferTests[0].bufnr
   let tests = a:bufferTests[0].tests
-  let currentTest = s:utils.findTest(tests)
+  let currentTest = s:utils.findTest(tests, '')
   if type(currentTest) != type({})
     return s:utils.log.warn('No test found')
   endif
@@ -105,16 +105,18 @@ function! s:debug.process.closed(...) abort
 endfunction
 
 
-function! OmniSharp#actions#test#Run(nobuild) abort
+function! OmniSharp#actions#test#Run(nobuild, ...) abort
   if !s:utils.capabilities() | return | endif
   let s:nobuild = a:nobuild
-  call s:utils.initialize([bufnr('%')], s:run.single.test)
+  let bufnr = a:0 ? (type(a:1) == type('') ? bufnr(a:1) : a:1) : bufnr('%')
+  let RunTest = funcref('s:run.single.test', [a:0 > 1 ? a:2 : ''])
+  call s:utils.initialize([bufnr], RunTest)
 endfunction
 
-function! s:run.single.test(bufferTests) abort
+function! s:run.single.test(testName, bufferTests) abort
   let bufnr = a:bufferTests[0].bufnr
   let tests = a:bufferTests[0].tests
-  let currentTest = s:utils.findTest(tests)
+  let currentTest = s:utils.findTest(tests, a:testName)
   if type(currentTest) != type({})
     return s:utils.log.warn('No test found')
   endif
@@ -124,6 +126,7 @@ function! s:run.single.test(bufferTests) abort
   let targetFramework = project.MsBuildProject.TargetFramework
   let opts = {
   \ 'ResponseHandler': funcref('s:run.process', [s:run.single.complete, bufnr, tests]),
+  \ 'BufNum': bufnr,
   \ 'Parameters': {
   \   'MethodName': currentTest.name,
   \   'NoBuild': get(s:, 'nobuild', 0),
@@ -405,10 +408,10 @@ function! s:utils.extractTests(codeElements) abort
 endfunction
 
 " Find the test in a list of tests that matches the current cursor position
-function! s:utils.findTest(tests, ...) abort
+function! s:utils.findTest(tests, testName) abort
   for test in a:tests
-    if a:0
-      if test.name ==# a:1
+    if a:testName !=# ''
+      if test.name ==# a:testName
         return test
       endif
     else
@@ -441,7 +444,8 @@ function! s:utils.init.extract(Callback, codeStructures) abort
   \ 'tests': s:utils.extractTests(cs[1])
   \}})
   call OmniSharp#testrunner#SetTests(bufferTests)
-  call a:Callback(bufferTests)
+  let dict = { 'f': a:Callback }
+  call dict.f(bufferTests)
 endfunction
 
 function! s:utils.log.echo(highlightGroup, message) abort

autoload/OmniSharp/testrunner.vim

@@ -23,6 +23,28 @@ endfunction
 
 
 function! OmniSharp#testrunner#Run() abort
+  let filename = ''
+  let line = getline('.')
+  if line =~# '^\a'
+    " Project selected - run all tests
+    let projectname = getline('.')
+    for sln_or_dir in OmniSharp#proc#ListRunningJobs()
+      let job = OmniSharp#proc#GetJob(sln_or_dir)
+      if has_key(job, 'tests') && has_key(job.tests, projectname)
+        call OmniSharp#actions#test#RunInFile(1, keys(job.tests[projectname]))
+      endif
+    endfor
+  elseif line =~# '^    \f'
+    " File selected
+    let filename = trim(line)
+    call OmniSharp#actions#test#RunInFile(0, filename)
+    return
+  else
+    let test = s:utils.findTest()
+    if has_key(test, 'filename')
+      call OmniSharp#actions#test#Run(0, test.filename, test.name)
+    endif
+  endif
 endfunction
 
 
@@ -49,27 +71,10 @@ function! OmniSharp#testrunner#Navigate() abort
       endif
     endif
     if filename ==# ''
-      " Search for test
-      let testpattern = '[-|*!]        \S'
-      if line =~# testpattern
-        let testline = line('.')
-      else
-        let testline = search(testpattern, 'bcnWz')
-      endif
-      if testline > 0
-        let testname = matchlist(getline(testline), '[-|*!]        \zs.*$')[0]
-        let projectline = search('^\a', 'bcnWz')
-        let projectname = matchlist(getline(projectline), '^\S\+')[0]
-        let fileline = search('^    \f', 'bcnWz')
-        let filename = matchlist(getline(fileline), '^    \zs.*$')[0]
-        let filename = fnamemodify(filename, ':p')
-        for sln_or_dir in OmniSharp#proc#ListRunningJobs()
-          let job = OmniSharp#proc#GetJob(sln_or_dir)
-          if has_key(job, 'tests') && has_key(job.tests, projectname)
-            let lnum = job.tests[projectname][filename][testname].lnum
-            break
-          endif
-        endfor
+      let test = s:utils.findTest()
+      if has_key(test, 'filename')
+        let filename = test.filename
+        let lnum = test.lnum
       endif
     endif
   endif
@@ -245,13 +250,15 @@ function! OmniSharp#testrunner#SetTests(bufferTests) abort
     let testproject = get(job.tests, projectname, {})
     let job.tests[projectname] = testproject
     let filename = fnamemodify(bufname(buffer.bufnr), ':p')
-    let existing = get(testproject, filename, {})
-    let testproject[filename] = existing
-    for test in buffer.tests
-      let extest = get(existing, test.name, { 'state': 'Not run' })
-      let existing[test.name] = extest
-      let extest.framework = test.framework
-      let extest.lnum = test.nameRange.Start.Line
+    let filetests = get(testproject, filename, {})
+    let testproject[filename] = filetests
+    for buffertest in buffer.tests
+      let test = get(filetests, buffertest.name, { 'state': 'Not run' })
+      let filetests[buffertest.name] = test
+      let test.name = buffertest.name
+      let test.filename = filename
+      let test.framework = buffertest.framework
+      let test.lnum = buffertest.nameRange.Start.Line
     endfor
   endfor
   call s:Open()
@@ -404,6 +411,32 @@ let s:utils.state2char = {
 \ 'Failed': '!'
 \}
 
+function! s:utils.findTest() abort
+  if &filetype !=# 'omnisharptest' | return {} | endif
+  let testpattern = '[-|*!]        \S'
+  let line = getline('.')
+  if line =~# testpattern
+    let testline = line('.')
+  else
+    let testline = search(testpattern, 'bcnWz')
+  endif
+  if testline > 0
+    let testname = matchlist(getline(testline), '[-|*!]        \zs.*$')[0]
+    let projectline = search('^\a', 'bcnWz')
+    let projectname = matchlist(getline(projectline), '^\S\+')[0]
+    let fileline = search('^    \f', 'bcnWz')
+    let filename = matchlist(getline(fileline), '^    \zs.*$')[0]
+    let filename = fnamemodify(filename, ':p')
+    for sln_or_dir in OmniSharp#proc#ListRunningJobs()
+      let job = OmniSharp#proc#GetJob(sln_or_dir)
+      if has_key(job, 'tests') && has_key(job.tests, projectname)
+        return job.tests[projectname][filename][testname]
+      endif
+    endfor
+  endif
+  return {}
+endfunction
+
 function! s:utils.getProjectName(bufnr) abort
   let project = OmniSharp#GetHost(a:bufnr).project
   let msbuildproject = get(project, 'MsBuildProject', {})