Merge pull request #21 from bstaletic/sig-tests

[READY] Signature help tests

Author: puremourning

ycmd/tests/clangd/signature_help_test.py

@@ -27,11 +27,9 @@
 
 import json
 import requests
+from mock import patch
 from nose.tools import eq_
-from hamcrest import ( assert_that,
-                       contains,
-                       empty,
-                       has_entries )
+from hamcrest import assert_that, contains, empty, has_entries
 
 from ycmd.tests.clangd import PathToTestFile, SharedYcmd, IsolatedYcmd
 from ycmd.tests.test_utils import ( EMPTY_SIGNATURE_HELP,
@@ -495,7 +493,7 @@ def Signature_Help_Trigger_After_OtherTrigger_ReTrigger_test( app ):
 
 
 @SharedYcmd
-def Signature_Help_Trigger_JustBeforeClose( app ):
+def Signature_Help_Trigger_JustBeforeClose_test( app ):
   RunTest( app, {
     'description': 'Last argument, before )',
     'request': {
@@ -512,14 +510,21 @@ def Signature_Help_Trigger_JustBeforeClose( app ):
         'errors': empty(),
         'signature_help': has_entries( {
           'activeSignature': 0,
-          'activeParameter': 2,
+          'activeParameter': 0,
           'signatures': contains(
+            SignatureMatcher( 'make_drink(TypeOfDrink type, '
+                              'Temperature temp, '
+                              'int sugargs) -> Drink &', [
+                                ParameterMatcher( 11, 27 ),
+                                ParameterMatcher( 29, 45 ),
+                                ParameterMatcher( 47, 58 ),
+                              ] ),
             SignatureMatcher( 'make_drink(TypeOfDrink type, '
                               'double fizziness, '
                               'Flavour Flavour) -> Drink &', [
-                                ParameterMatcher( 'TypeOfDrink type' ),
-                                ParameterMatcher( 'double fizziness' ),
-                                ParameterMatcher( 'Flavour Flavour' ),
+                                ParameterMatcher( 11, 27 ),
+                                ParameterMatcher( 29, 45 ),
+                                ParameterMatcher( 47, 62 ),
                               ] ),
           )
         } ),
@@ -529,7 +534,7 @@ def Signature_Help_Trigger_JustBeforeClose( app ):
 
 
 @SharedYcmd
-def Signature_Help_Clears_After_EndFunction( app ):
+def Signature_Help_Clears_After_EndFunction_test( app ):
   RunTest( app, {
     'description': 'Empty response on )',
     'request': {
@@ -551,7 +556,7 @@ def Signature_Help_Clears_After_EndFunction( app ):
 
 
 @SharedYcmd
-def Signature_Help_Clears_After_Function_Call( app ):
+def Signature_Help_Clears_After_Function_Call_test( app ):
   RunTest( app, {
     'description': 'Empty response after )',
     'request': {
@@ -570,3 +575,27 @@ def Signature_Help_Clears_After_Function_Call( app ):
       } ),
     },
   } )
+
+
+@patch( 'ycmd.completers.completer.Completer.ShouldUseSignatureHelpNow',
+        return_value = True )
+@patch( 'ycmd.completers.language_server.language_server_completer.'
+        'LanguageServerCompleter._ServerIsInitialized', return_value = False )
+@IsolatedYcmd()
+def Signature_Help_Server_Not_Initialized_test( app, *args ):
+  filepath = PathToTestFile( 'general_fallback', 'make_drink.cc' )
+  request = {
+    'filetype'  : 'cpp',
+    'filepath'  : filepath,
+    'line_num'  : 7,
+    'column_num': 71,
+    'signature_help_state': 'INACTIVE',
+    'contents': ReadFile( filepath )
+  }
+  response = app.post_json( '/signature_help',
+                            BuildRequest( **request ),
+                            expect_errors = True )
+  assert_that( response.json, has_entries( {
+        'errors': empty(),
+        'signature_help': EMPTY_SIGNATURE_HELP,
+      } ) )

ycmd/tests/language_server/generic_completer_test.py

@@ -28,6 +28,7 @@
 import requests
 from hamcrest import ( assert_that,
                        contains,
+                       empty,
                        equal_to,
                        has_entries,
                        has_entry,
@@ -243,3 +244,32 @@ def GenericLSPCompleter_DebugInfo_CustomRoot_test( app, *args ):
       } ) ),
     } ) )
   )
+
+
+@IsolatedYcmd( { 'language_server':
+  [ { 'name': 'foo',
+      'filetypes': [ 'foo' ],
+      'project_root_files': [ 'proj_root' ],
+      'cmdline': [ 'node', PATH_TO_GENERIC_COMPLETER, '--stdio' ] } ] } )
+def GenericLSPCompleter_SignatureHelp_NoTriggers_test( app ):
+  test_file = PathToTestFile(
+      'generic_server', 'foo', 'bar', 'baz', 'test_file' )
+  request = BuildRequest( filepath = test_file,
+                          filetype = 'foo',
+                          line_num = 1,
+                          column_num = 1,
+                          contents = '',
+                          event_name = 'FileReadyToParse' )
+
+  app.post_json( '/event_notification', request )
+  WaitUntilCompleterServerReady( app, 'foo' )
+  request.pop( 'event_name' )
+  response = app.post_json( '/signature_help', request ).json
+  assert_that( response, has_entries( {
+    'signature_help': has_entries( {
+      'activeSignature': 0,
+      'activeParameter': 0,
+      'signatures': empty()
+    } ),
+    'errors': empty()
+  } ) )

ycmd/tests/misc_handlers_test.py

@@ -25,10 +25,14 @@
 
 from hamcrest import ( any_of, assert_that, contains, empty, equal_to,
                        has_entries, instance_of )
+from mock import patch
 import requests
 
 from ycmd.tests import IsolatedYcmd, PathToTestFile, SharedYcmd
-from ycmd.tests.test_utils import BuildRequest, DummyCompleter, PatchCompleter
+from ycmd.tests.test_utils import ( BuildRequest,
+                                    DummyCompleter,
+                                    PatchCompleter,
+                                    ErrorMatcher )
 
 
 @SharedYcmd
@@ -212,3 +216,40 @@ def MiscHandlers_ReceiveMessages_NotSupportedByCompleter_test( app ):
     request_data = BuildRequest( filetype = 'dummy_filetype' )
     assert_that( app.post_json( '/receive_messages', request_data ).json,
                  equal_to( False ) )
+
+
+@SharedYcmd
+@patch( 'ycmd.completers.completer.Completer.ShouldUseSignatureHelpNow',
+        return_value = True )
+def MiscHandlers_SignatureHelp_DefaultEmptyResponse_test( app, *args ):
+  with PatchCompleter( DummyCompleter, filetype = 'dummy_filetype' ):
+    request_data = BuildRequest( filetype = 'dummy_filetype' )
+    response = app.post_json( '/signature_help', request_data ).json
+    assert_that( response, has_entries( {
+      'signature_help': has_entries( {
+        'activeSignature': 0,
+        'activeParameter': 0,
+        'signatures': empty()
+      } ),
+      'errors': empty()
+    } ) )
+
+
+@SharedYcmd
+@patch( 'ycmd.completers.completer.Completer.ComputeSignatures',
+        side_effect = RuntimeError )
+def MiscHandlers_SignatureHelp_ComputeSignatureThrows_test( app, *args ):
+  with PatchCompleter( DummyCompleter, filetype = 'dummy_filetype' ):
+    request_data = BuildRequest( filetype = 'dummy_filetype' )
+    response = app.post_json( '/signature_help', request_data ).json
+    print( response )
+    assert_that( response, has_entries( {
+      'signature_help': has_entries( {
+        'activeSignature': 0,
+        'activeParameter': 0,
+        'signatures': empty()
+      } ),
+      'errors': contains(
+        ErrorMatcher( RuntimeError, '' )
+      )
+    } ) )