Fix vader tests

The current vader async-helper tests depend on passing callback
functions, in order to know when to stop waiting for the async request
to complete. However, this no longer works, as the new callback logic
returns the results of the request without performing side-effects such
as navigation or quickfix population.

These tests are now simply waited on with a call to `sleep 5`.

Author: nickspoons

test/fixusings.vader

@@ -81,9 +81,33 @@ Expect cs(should not add ambiguous using):
       public class class1{}
   }
 
-Execute (should add ambiguous usings to quickfix):
+Execute (should return ambiguous usings to Callback):
   call OmniSharpTestInitializeBuffer('FixUsings4')
   call OmniSharpWarmup('OmniSharp#actions#usings#Fix', [])
-  call OmniSharpTestAwait('OmniSharp#actions#usings#Fix', [])
+  let g:OmniSharp_test_locations = []
+  function! s:Callback(locations)
+    let g:OmniSharp_test_waiting = 0
+    let g:OmniSharp_test_locations = a:locations
+  endfunction
+  let g:OmniSharp_test_waiting = 1
+  call function('OmniSharp#actions#usings#Fix', [function('s:Callback')])()
+  let starttime = reltime()
+  while g:OmniSharp_test_waiting
+  \ && reltime(starttime)[0] < g:OmniSharp_test_timeout
+    sleep 50m
+  endwhile
+  AssertEqual len(getqflist()), 0
+  Assert !g:OmniSharp_test_waiting, 'OmniSharp#actions#usings#Fix timed out'
+  AssertEqual len(g:OmniSharp_test_locations), 2
+  AssertEqual g:OmniSharp_test_locations[0].lnum, 2
+
+Execute (should add ambiguous usings to quickfix):
+  call OmniSharpTestInitializeBuffer('FixUsings5')
+  call OmniSharpWarmup('OmniSharp#actions#usings#Fix', [])
+  " Cannot use OmniSharpTestAwait, as the callback prevents the default quickfix
+  " behaviour
+  call OmniSharp#actions#usings#Fix()
+  sleep 5
+  AssertEqual len(getqflist()), 2
   cfirst
   AssertEqual line('.'), 2

test/gotodefinition.vader

@@ -15,5 +15,8 @@ Given cs():
 Execute (go to definition):
   call OmniSharpTestInitializeBuffer('GotoDefinition')
   call search("i = 0")
-  call OmniSharpTestAwait('OmniSharp#actions#definition#Find', [])
+  " Cannot use OmniSharpTestAwait, as the callback prevents the default
+  " navigation behaviour
+  call OmniSharp#actions#definition#Find()
+  sleep 5
   AssertEqual 3, line(".")

test/gotometadata.vader

@@ -12,7 +12,10 @@ Given cs():
 Execute (go to metadata preview):
   call OmniSharpTestInitializeBuffer('GotoMetadata1')
   call search("MemoryStream stream")
-  call OmniSharpTestAwait('OmniSharp#actions#definition#Preview', [])
+  " Cannot use OmniSharpTestAwait, as the callback prevents the default preview
+  " behaviour
+  call OmniSharp#actions#definition#Preview()
+  sleep 5
   wincmd p
   AssertEqual 'MemoryStream.cs', expand('%:t')
   pclose
@@ -28,5 +31,8 @@ Given cs():
 Execute (go to metadata window):
   call OmniSharpTestInitializeBuffer('GotoMetadata2')
   call search("MemoryStream stream")
-  call OmniSharpTestAwait('OmniSharp#actions#definition#Find', [])
+  " Cannot use OmniSharpTestAwait, as the callback prevents the default
+  " navigation behaviour
+  call OmniSharp#actions#definition#Find()
+  sleep 5
   AssertEqual 'MemoryStream.cs', expand('%:t')