From c2f26159f66c45619049a874a14d6e03e2728390 Mon Sep 17 00:00:00 2001 From: Ben Jackson Date: Mon, 6 Nov 2017 22:51:16 +0000 Subject: [PATCH] Use fake filetype for omni completion test Now that the server supports Java natively, we need to use a filetype that does not have native support to ensure that we call the mocked omnifunc, but also one for which YCM has a semantic trigger. Rather than picking another random languagse, which might break in the future, we invent a language (ycmtest) and supply a manual trigger mapping to the YouCompleteMe object. --- python/ycm/tests/omni_completer_test.py | 85 +++++++++++++------------ 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/python/ycm/tests/omni_completer_test.py b/python/ycm/tests/omni_completer_test.py index fabf2a37..27fbc5c6 100644 --- a/python/ycm/tests/omni_completer_test.py +++ b/python/ycm/tests/omni_completer_test.py @@ -33,8 +33,13 @@ MockVimModule() from ycm import vimsupport from ycm.tests import YouCompleteMeInstance +FILETYPE = 'ycmtest' +TRIGGERS = { + 'ycmtest': [ '.' ] +} -@YouCompleteMeInstance( { 'cache_omnifunc': 1 } ) + +@YouCompleteMeInstance( { 'cache_omnifunc': 1, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_Cache_List_test( ycm ): def Omnifunc( findstart, base ): if findstart: @@ -43,7 +48,7 @@ def OmniCompleter_GetCompletions_Cache_List_test( ycm ): current_buffer = VimBuffer( 'buffer', contents = [ 'test.' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 1, 5 ) ): @@ -57,7 +62,7 @@ def OmniCompleter_GetCompletions_Cache_List_test( ycm ): ) -@YouCompleteMeInstance( { 'cache_omnifunc': 1 } ) +@YouCompleteMeInstance( { 'cache_omnifunc': 1, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_Cache_ListFilter_test( ycm ): def Omnifunc( findstart, base ): if findstart: @@ -66,7 +71,7 @@ def OmniCompleter_GetCompletions_Cache_ListFilter_test( ycm ): current_buffer = VimBuffer( 'buffer', contents = [ 'test.t' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 1, 6 ) ): @@ -80,7 +85,7 @@ def OmniCompleter_GetCompletions_Cache_ListFilter_test( ycm ): ) -@YouCompleteMeInstance( { 'cache_omnifunc': 0 } ) +@YouCompleteMeInstance( { 'cache_omnifunc': 0, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_NoCache_List_test( ycm ): def Omnifunc( findstart, base ): if findstart: @@ -89,7 +94,7 @@ def OmniCompleter_GetCompletions_NoCache_List_test( ycm ): current_buffer = VimBuffer( 'buffer', contents = [ 'test.' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 1, 5 ) ): @@ -103,7 +108,7 @@ def OmniCompleter_GetCompletions_NoCache_List_test( ycm ): ) -@YouCompleteMeInstance( { 'cache_omnifunc': 0 } ) +@YouCompleteMeInstance( { 'cache_omnifunc': 0, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_NoCache_ListFilter_test( ycm ): def Omnifunc( findstart, base ): if findstart: @@ -112,7 +117,7 @@ def OmniCompleter_GetCompletions_NoCache_ListFilter_test( ycm ): current_buffer = VimBuffer( 'buffer', contents = [ 'test.t' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 1, 6 ) ): @@ -128,7 +133,7 @@ def OmniCompleter_GetCompletions_NoCache_ListFilter_test( ycm ): ) -@YouCompleteMeInstance( { 'cache_omnifunc': 0 } ) +@YouCompleteMeInstance( { 'cache_omnifunc': 0, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_NoCache_UseFindStart_test( ycm ): def Omnifunc( findstart, base ): if findstart: @@ -137,7 +142,7 @@ def OmniCompleter_GetCompletions_NoCache_UseFindStart_test( ycm ): current_buffer = VimBuffer( 'buffer', contents = [ 'test.t' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 1, 6 ) ): @@ -153,7 +158,7 @@ def OmniCompleter_GetCompletions_NoCache_UseFindStart_test( ycm ): ) -@YouCompleteMeInstance( { 'cache_omnifunc': 1 } ) +@YouCompleteMeInstance( { 'cache_omnifunc': 1, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_Cache_UseFindStart_test( ycm ): def Omnifunc( findstart, base ): if findstart: @@ -162,7 +167,7 @@ def OmniCompleter_GetCompletions_Cache_UseFindStart_test( ycm ): current_buffer = VimBuffer( 'buffer', contents = [ 'test.t' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 1, 6 ) ): @@ -178,7 +183,7 @@ def OmniCompleter_GetCompletions_Cache_UseFindStart_test( ycm ): ) -@YouCompleteMeInstance( { 'cache_omnifunc': 1 } ) +@YouCompleteMeInstance( { 'cache_omnifunc': 1, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_Cache_Object_test( ycm ): def Omnifunc( findstart, base ): if findstart: @@ -187,7 +192,7 @@ def OmniCompleter_GetCompletions_Cache_Object_test( ycm ): current_buffer = VimBuffer( 'buffer', contents = [ 'test.t' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 1, 6 ) ): @@ -201,7 +206,7 @@ def OmniCompleter_GetCompletions_Cache_Object_test( ycm ): ) -@YouCompleteMeInstance( { 'cache_omnifunc': 1 } ) +@YouCompleteMeInstance( { 'cache_omnifunc': 1, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_Cache_ObjectList_test( ycm ): def Omnifunc( findstart, base ): if findstart: @@ -225,7 +230,7 @@ def OmniCompleter_GetCompletions_Cache_ObjectList_test( ycm ): current_buffer = VimBuffer( 'buffer', contents = [ 'test.tt' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 1, 7 ) ): @@ -245,7 +250,7 @@ def OmniCompleter_GetCompletions_Cache_ObjectList_test( ycm ): ) -@YouCompleteMeInstance( { 'cache_omnifunc': 0 } ) +@YouCompleteMeInstance( { 'cache_omnifunc': 0, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_NoCache_ObjectList_test( ycm ): def Omnifunc( findstart, base ): if findstart: @@ -269,7 +274,7 @@ def OmniCompleter_GetCompletions_NoCache_ObjectList_test( ycm ): current_buffer = VimBuffer( 'buffer', contents = [ 'test.tt' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 1, 7 ) ): @@ -297,7 +302,7 @@ def OmniCompleter_GetCompletions_NoCache_ObjectList_test( ycm ): ) -@YouCompleteMeInstance( { 'cache_omnifunc': 1 } ) +@YouCompleteMeInstance( { 'cache_omnifunc': 1, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_Cache_ObjectListObject_test( ycm ): def Omnifunc( findstart, base ): if findstart: @@ -321,7 +326,7 @@ def OmniCompleter_GetCompletions_Cache_ObjectListObject_test( ycm ): current_buffer = VimBuffer( 'buffer', contents = [ 'test.tt' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 1, 7 ) ): @@ -341,7 +346,7 @@ def OmniCompleter_GetCompletions_Cache_ObjectListObject_test( ycm ): ) -@YouCompleteMeInstance( { 'cache_omnifunc': 0 } ) +@YouCompleteMeInstance( { 'cache_omnifunc': 0, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_NoCache_ObjectListObject_test( ycm ): def Omnifunc( findstart, base ): if findstart: @@ -365,7 +370,7 @@ def OmniCompleter_GetCompletions_NoCache_ObjectListObject_test( ycm ): current_buffer = VimBuffer( 'buffer', contents = [ 'test.tt' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 1, 7 ) ): @@ -395,7 +400,7 @@ def OmniCompleter_GetCompletions_NoCache_ObjectListObject_test( ycm ): @ExpectedFailure( 'Filtering on unicode is not supported by the server', contains_string( "value for 'completions' was <[]>" ) ) -@YouCompleteMeInstance( { 'cache_omnifunc': 1 } ) +@YouCompleteMeInstance( { 'cache_omnifunc': 1, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_Cache_List_Unicode_test( ycm ): def Omnifunc( findstart, base ): if findstart: @@ -404,7 +409,7 @@ def OmniCompleter_GetCompletions_Cache_List_Unicode_test( ycm ): current_buffer = VimBuffer( 'buffer', contents = [ '†åsty_π.' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 1, 12 ) ): @@ -420,7 +425,7 @@ def OmniCompleter_GetCompletions_Cache_List_Unicode_test( ycm ): ) -@YouCompleteMeInstance( { 'cache_omnifunc': 0 } ) +@YouCompleteMeInstance( { 'cache_omnifunc': 0, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_NoCache_List_Unicode_test( ycm ): def Omnifunc( findstart, base ): if findstart: @@ -429,7 +434,7 @@ def OmniCompleter_GetCompletions_NoCache_List_Unicode_test( ycm ): current_buffer = VimBuffer( 'buffer', contents = [ '†åsty_π.' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 1, 12 ) ): @@ -447,7 +452,7 @@ def OmniCompleter_GetCompletions_NoCache_List_Unicode_test( ycm ): @ExpectedFailure( 'Filtering on unicode is not supported by the server', contains_string( "value for 'completions' was <[]>" ) ) -@YouCompleteMeInstance( { 'cache_omnifunc': 1 } ) +@YouCompleteMeInstance( { 'cache_omnifunc': 1, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_Cache_List_Filter_Unicode_test( ycm ): def Omnifunc( findstart, base ): if findstart: @@ -456,7 +461,7 @@ def OmniCompleter_GetCompletions_Cache_List_Filter_Unicode_test( ycm ): current_buffer = VimBuffer( 'buffer', contents = [ '†åsty_π.ππ' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 1, 17 ) ): @@ -470,7 +475,7 @@ def OmniCompleter_GetCompletions_Cache_List_Filter_Unicode_test( ycm ): ) -@YouCompleteMeInstance( { 'cache_omnifunc': 0 } ) +@YouCompleteMeInstance( { 'cache_omnifunc': 0, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_NoCache_List_Filter_Unicode_test( ycm ): def Omnifunc( findstart, base ): if findstart: @@ -479,7 +484,7 @@ def OmniCompleter_GetCompletions_NoCache_List_Filter_Unicode_test( ycm ): current_buffer = VimBuffer( 'buffer', contents = [ '†åsty_π.ππ' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 1, 17 ) ): @@ -495,7 +500,7 @@ def OmniCompleter_GetCompletions_NoCache_List_Filter_Unicode_test( ycm ): @ExpectedFailure( 'Filtering on unicode is not supported by the server', contains_string( "value for 'completions' was <[]>" ) ) -@YouCompleteMeInstance( { 'cache_omnifunc': 1 } ) +@YouCompleteMeInstance( { 'cache_omnifunc': 1, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_Cache_ObjectList_Unicode_test( ycm ): def Omnifunc( findstart, base ): if findstart: @@ -519,7 +524,7 @@ def OmniCompleter_GetCompletions_Cache_ObjectList_Unicode_test( ycm ): current_buffer = VimBuffer( 'buffer', contents = [ '†åsty_π.ππ' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 1, 17 ) ): @@ -539,7 +544,7 @@ def OmniCompleter_GetCompletions_Cache_ObjectList_Unicode_test( ycm ): ) -@YouCompleteMeInstance( { 'cache_omnifunc': 1 } ) +@YouCompleteMeInstance( { 'cache_omnifunc': 1, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_Cache_ObjectListObject_Unicode_test( ycm ): def Omnifunc( findstart, base ): if findstart: @@ -572,7 +577,7 @@ def OmniCompleter_GetCompletions_Cache_ObjectListObject_Unicode_test( ycm ): current_buffer = VimBuffer( 'buffer', contents = [ '†åsty_π.t' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 1, 13 ) ): @@ -592,7 +597,7 @@ def OmniCompleter_GetCompletions_Cache_ObjectListObject_Unicode_test( ycm ): ) -@YouCompleteMeInstance( { 'cache_omnifunc': 1 } ) +@YouCompleteMeInstance( { 'cache_omnifunc': 1, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_RestoreCursorPositionAfterOmnifuncCall_test( ycm ): @@ -608,7 +613,7 @@ def OmniCompleter_GetCompletions_RestoreCursorPositionAfterOmnifuncCall_test( contents = [ 'String test', '', 'test.' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 3, 5 ) ): @@ -626,7 +631,7 @@ def OmniCompleter_GetCompletions_RestoreCursorPositionAfterOmnifuncCall_test( ) -@YouCompleteMeInstance( { 'cache_omnifunc': 0 } ) +@YouCompleteMeInstance( { 'cache_omnifunc': 0, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_NoCache_NoSemanticTrigger_test( ycm ): def Omnifunc( findstart, base ): if findstart: @@ -635,7 +640,7 @@ def OmniCompleter_GetCompletions_NoCache_NoSemanticTrigger_test( ycm ): current_buffer = VimBuffer( 'buffer', contents = [ 'te' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 1, 3 ) ): @@ -649,7 +654,7 @@ def OmniCompleter_GetCompletions_NoCache_NoSemanticTrigger_test( ycm ): ) -@YouCompleteMeInstance( { 'cache_omnifunc': 0 } ) +@YouCompleteMeInstance( { 'cache_omnifunc': 0, 'semantic_triggers': TRIGGERS } ) def OmniCompleter_GetCompletions_NoCache_ForceSemantic_test( ycm ): def Omnifunc( findstart, base ): if findstart: @@ -658,7 +663,7 @@ def OmniCompleter_GetCompletions_NoCache_ForceSemantic_test( ycm ): current_buffer = VimBuffer( 'buffer', contents = [ 'te' ], - filetype = 'java', + filetype = FILETYPE, omnifunc = Omnifunc ) with MockVimBuffers( [ current_buffer ], current_buffer, ( 1, 3 ) ):