vim/YouCompleteMe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor tests using a server instance

Browse Source 
Create a Server_test class for tests that need a server instance.
This commit is contained in:
micbou 2016-07-14 22:49:29 +02:00
parent 630b85ad01
commit 7b2155ab64
6 changed files with 196 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
python/ycm/test_utils.py
View File

@ -47,18 +47,6 @@ BWIPEOUT_REGEX = re.compile( r"^(?:silent! )bwipeout!? ([0-9]+)$" )
# https://github.com/Valloric/YouCompleteMe/pull/1694
VIM_MOCK = MagicMock()
# The default options which are only relevant to the client, not the server and
# thus are not part of default_options.json, but are required for a working
# YouCompleteMe or OmniCompleter object.
DEFAULT_CLIENT_OPTIONS = {
'server_log_level': 'info',
'extra_conf_vim_data': [],
'show_diagnostics_ui': 1,
'enable_diagnostic_signs': 1,
'enable_diagnostic_highlighting': 0,
'always_populate_location_list': 0,
}
def MockGetBufferNumber( buffer_filename ):
for buffer in VIM_MOCK.buffers:

111
python/ycm/tests/event_notification_test.py
View File

@ -23,14 +23,13 @@ from future import standard_library
standard_library.install_aliases()
from builtins import * # noqa
from ycm.test_utils import MockVimModule, ExtendedMock, DEFAULT_CLIENT_OPTIONS
from ycm.test_utils import MockVimModule, ExtendedMock
MockVimModule()
import contextlib
import os
from ycm.youcompleteme import YouCompleteMe
from ycmd import user_options_store
from ycm.tests.server_test import Server_test
from ycmd.responses import ( BuildDiagnosticData, Diagnostic, Location, Range,
UnknownExtraConf, ServerError )
@ -153,21 +152,7 @@ def MockEventNotification( response_method, native_filetype_completer = True ):
yield
class EventNotification_test( object ):
def setUp( self ):
options = dict( user_options_store.DefaultOptions() )
options.update( DEFAULT_CLIENT_OPTIONS )
user_options_store.SetAll( options )
self.server_state = YouCompleteMe( user_options_store.GetAll() )
pass
def tearDown( self ):
if self.server_state:
self.server_state.OnVimLeave()
class EventNotification_test( Server_test ):
@patch( 'vim.command', new_callable = ExtendedMock )
def FileReadyToParse_NonDiagnostic_Error_test( self, vim_command ):
@ -181,9 +166,9 @@ class EventNotification_test( object ):
with MockArbitraryBuffer( 'javascript' ):
with MockEventNotification( ErrorResponse ):
self.server_state.OnFileReadyToParse()
assert self.server_state.FileParseRequestReady()
self.server_state.HandleFileParseRequest()
self._server_state.OnFileReadyToParse()
assert self._server_state.FileParseRequestReady()
self._server_state.HandleFileParseRequest()
# The first call raises a warning
vim_command.assert_has_exact_calls( [
@ -191,15 +176,15 @@ class EventNotification_test( object ):
] )
# Subsequent calls don't re-raise the warning
self.server_state.HandleFileParseRequest()
self._server_state.HandleFileParseRequest()
vim_command.assert_has_exact_calls( [
PostMultiLineNotice_Call( ERROR_TEXT ),
] )
# But it does if a subsequent event raises again
self.server_state.OnFileReadyToParse()
assert self.server_state.FileParseRequestReady()
self.server_state.HandleFileParseRequest()
self._server_state.OnFileReadyToParse()
assert self._server_state.FileParseRequestReady()
self._server_state.HandleFileParseRequest()
vim_command.assert_has_exact_calls( [
PostMultiLineNotice_Call( ERROR_TEXT ),
PostMultiLineNotice_Call( ERROR_TEXT ),
@ -210,8 +195,8 @@ class EventNotification_test( object ):
def FileReadyToParse_NonDiagnostic_Error_NonNative_test( self, vim_command ):
with MockArbitraryBuffer( 'javascript' ):
with MockEventNotification( None, False ):
self.server_state.OnFileReadyToParse()
self.server_state.HandleFileParseRequest()
self._server_state.OnFileReadyToParse()
self._server_state.HandleFileParseRequest()
vim_command.assert_not_called()
@ -243,9 +228,9 @@ class EventNotification_test( object ):
with patch( 'ycm.vimsupport.PresentDialog',
return_value = 0,
new_callable = ExtendedMock ) as present_dialog:
self.server_state.OnFileReadyToParse()
assert self.server_state.FileParseRequestReady()
self.server_state.HandleFileParseRequest()
self._server_state.OnFileReadyToParse()
assert self._server_state.FileParseRequestReady()
self._server_state.HandleFileParseRequest()
present_dialog.assert_has_exact_calls( [
PresentDialog_Confirm_Call( MESSAGE ),
@ -255,7 +240,7 @@ class EventNotification_test( object ):
] )
# Subsequent calls don't re-raise the warning
self.server_state.HandleFileParseRequest()
self._server_state.HandleFileParseRequest()
present_dialog.assert_has_exact_calls( [
PresentDialog_Confirm_Call( MESSAGE )
@ -265,9 +250,9 @@ class EventNotification_test( object ):
] )
# But it does if a subsequent event raises again
self.server_state.OnFileReadyToParse()
assert self.server_state.FileParseRequestReady()
self.server_state.HandleFileParseRequest()
self._server_state.OnFileReadyToParse()
assert self._server_state.FileParseRequestReady()
self._server_state.HandleFileParseRequest()
present_dialog.assert_has_exact_calls( [
PresentDialog_Confirm_Call( MESSAGE ),
@ -282,9 +267,9 @@ class EventNotification_test( object ):
with patch( 'ycm.vimsupport.PresentDialog',
return_value = 1,
new_callable = ExtendedMock ) as present_dialog:
self.server_state.OnFileReadyToParse()
assert self.server_state.FileParseRequestReady()
self.server_state.HandleFileParseRequest()
self._server_state.OnFileReadyToParse()
assert self._server_state.FileParseRequestReady()
self._server_state.HandleFileParseRequest()
present_dialog.assert_has_exact_calls( [
PresentDialog_Confirm_Call( MESSAGE ),
@ -294,7 +279,7 @@ class EventNotification_test( object ):
] )
# Subsequent calls don't re-raise the warning
self.server_state.HandleFileParseRequest()
self._server_state.HandleFileParseRequest()
present_dialog.assert_has_exact_calls( [
PresentDialog_Confirm_Call( MESSAGE )
@ -304,9 +289,9 @@ class EventNotification_test( object ):
] )
# But it does if a subsequent event raises again
self.server_state.OnFileReadyToParse()
assert self.server_state.FileParseRequestReady()
self.server_state.HandleFileParseRequest()
self._server_state.OnFileReadyToParse()
assert self._server_state.FileParseRequestReady()
self._server_state.HandleFileParseRequest()
present_dialog.assert_has_exact_calls( [
PresentDialog_Confirm_Call( MESSAGE ),
@ -337,23 +322,23 @@ class EventNotification_test( object ):
with MockArbitraryBuffer( 'cpp' ):
with MockEventNotification( DiagnosticResponse ):
self.server_state.OnFileReadyToParse()
ok_( self.server_state.FileParseRequestReady() )
self.server_state.HandleFileParseRequest()
self._server_state.OnFileReadyToParse()
ok_( self._server_state.FileParseRequestReady() )
self._server_state.HandleFileParseRequest()
vim_command.assert_has_calls( [
PlaceSign_Call( 1, 1, 0, True )
] )
eq_( self.server_state.GetErrorCount(), 1 )
eq_( self.server_state.GetWarningCount(), 0 )
eq_( self._server_state.GetErrorCount(), 1 )
eq_( self._server_state.GetWarningCount(), 0 )
# Consequent calls to HandleFileParseRequest shouldn't mess with
# existing diagnostics, when there is no new parse request.
vim_command.reset_mock()
ok_( not self.server_state.FileParseRequestReady() )
self.server_state.HandleFileParseRequest()
ok_( not self._server_state.FileParseRequestReady() )
self._server_state.HandleFileParseRequest()
vim_command.assert_not_called()
eq_( self.server_state.GetErrorCount(), 1 )
eq_( self.server_state.GetWarningCount(), 0 )
eq_( self._server_state.GetErrorCount(), 1 )
eq_( self._server_state.GetWarningCount(), 0 )
@patch( 'vim.command' )
@ -370,24 +355,24 @@ class EventNotification_test( object ):
with MockArbitraryBuffer( 'cpp' ):
with MockEventNotification( DiagnosticResponse ):
self.server_state.OnFileReadyToParse()
ok_( self.server_state.FileParseRequestReady() )
self.server_state.HandleFileParseRequest()
self._server_state.OnFileReadyToParse()
ok_( self._server_state.FileParseRequestReady() )
self._server_state.HandleFileParseRequest()
vim_command.assert_has_calls( [
PlaceSign_Call( 2, 2, 0, False ),
UnplaceSign_Call( 1, 0 )
] )
eq_( self.server_state.GetErrorCount(), 0 )
eq_( self.server_state.GetWarningCount(), 1 )
eq_( self._server_state.GetErrorCount(), 0 )
eq_( self._server_state.GetWarningCount(), 1 )
# Consequent calls to HandleFileParseRequest shouldn't mess with
# existing diagnostics, when there is no new parse request.
vim_command.reset_mock()
ok_( not self.server_state.FileParseRequestReady() )
self.server_state.HandleFileParseRequest()
ok_( not self._server_state.FileParseRequestReady() )
self._server_state.HandleFileParseRequest()
vim_command.assert_not_called()
eq_( self.server_state.GetErrorCount(), 0 )
eq_( self.server_state.GetWarningCount(), 1 )
eq_( self._server_state.GetErrorCount(), 0 )
eq_( self._server_state.GetWarningCount(), 1 )
@patch( 'vim.command' )
@ -397,10 +382,10 @@ class EventNotification_test( object ):
# Should be called after _Check_FileReadyToParse_Diagnostic_Warning
with MockArbitraryBuffer( 'cpp' ):
with MockEventNotification( MagicMock( return_value = [] ) ):
self.server_state.OnFileReadyToParse()
self.server_state.HandleFileParseRequest()
self._server_state.OnFileReadyToParse()
self._server_state.HandleFileParseRequest()
vim_command.assert_has_calls( [
UnplaceSign_Call( 2, 0 )
] )
eq_( self.server_state.GetErrorCount(), 0 )
eq_( self.server_state.GetWarningCount(), 0 )
eq_( self._server_state.GetErrorCount(), 0 )
eq_( self._server_state.GetWarningCount(), 0 )

23
python/ycm/tests/omni_completer_test.py
View File

@ -33,11 +33,10 @@ from hamcrest import contains_string
from ycm.test_utils import MockVimModule, ExtendedMock
MockVimModule()
from ycm.test_utils import DEFAULT_CLIENT_OPTIONS, ExpectedFailure
from ycm.omni_completer import OmniCompleter
from ycm.youcompleteme import YouCompleteMe
from ycm.test_utils import ExpectedFailure
from ycm.tests.server_test import MakeUserOptions, Server_test
from ycmd import user_options_store
from ycmd.utils import ToBytes
from ycmd.request_wrap import RequestWrap
@ -75,23 +74,7 @@ def BuildRequestWrap( line_num, column_num, contents ):
return RequestWrap( BuildRequest( line_num, column_num, contents ) )
def MakeUserOptions( custom_options = {} ):
options = dict( user_options_store.DefaultOptions() )
options.update( DEFAULT_CLIENT_OPTIONS )
options.update( custom_options )
return options
class OmniCompleter_test( object ):
def setUp( self ):
# We need a server instance for FilterAndSortCandidates
self._server_state = YouCompleteMe( MakeUserOptions() )
def tearDown( self ):
self._server_state.OnVimLeave()
class OmniCompleter_test( Server_test ):
def OmniCompleter_GetCompletions_Cache_List_test( self ):
omni_completer = OmniCompleter( MakeUserOptions( {

109
python/ycm/tests/postcomplete_tests.py
View File

@ -33,9 +33,9 @@ from hamcrest import assert_that, empty
from mock import MagicMock, DEFAULT, patch
from nose.tools import eq_, ok_
from ycmd.utils import ToBytes
from ycm import vimsupport
from ycm.youcompleteme import YouCompleteMe
from ycm.tests.server_test import Server_test
from ycmd.utils import ToBytes
def GetVariableValue_CompleteItemIs( word, abbr = None, menu = None,
@ -66,15 +66,7 @@ def BuildCompletion( namespace = None, insertion_text = 'Test',
}
class PostComplete_test():
def setUp( self ):
self.ycm = YouCompleteMe( MagicMock( spec_set = dict ) )
def tearDown( self ):
self.ycm.OnVimLeave()
class PostComplete_test( Server_test ):
@contextlib.contextmanager
def _SetupForCsharpCompletionDone( self, completions ):
@ -84,34 +76,34 @@ class PostComplete_test():
request = MagicMock()
request.Done = MagicMock( return_value = True )
request.RawResponse = MagicMock( return_value = completions )
self.ycm._latest_completion_request = request
self._server_state._latest_completion_request = request
yield
@patch( 'ycm.vimsupport.CurrentFiletypes', return_value = [ 'cs' ] )
def GetCompleteDoneHooks_ResultOnCsharp_test( self, *args ):
result = self.ycm.GetCompleteDoneHooks()
result = self._server_state.GetCompleteDoneHooks()
eq_( 1, len( list( result ) ) )
@patch( 'ycm.vimsupport.CurrentFiletypes', return_value = [ 'txt' ] )
def GetCompleteDoneHooks_EmptyOnOtherFiletype_test( self, *args ):
result = self.ycm.GetCompleteDoneHooks()
result = self._server_state.GetCompleteDoneHooks()
eq_( 0, len( list( result ) ) )
@patch( 'ycm.vimsupport.CurrentFiletypes', return_value = [ 'txt' ] )
def OnCompleteDone_WithActionCallsIt_test( self, *args ):
action = MagicMock()
self.ycm._complete_done_hooks[ 'txt' ] = action
self.ycm.OnCompleteDone()
self._server_state._complete_done_hooks[ 'txt' ] = action
self._server_state.OnCompleteDone()
ok_( action.called )
@patch( 'ycm.vimsupport.CurrentFiletypes', return_value = [ 'txt' ] )
def OnCompleteDone_NoActionNoError_test( self, *args ):
self.ycm.OnCompleteDone()
self._server_state.OnCompleteDone()
@patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
@ -119,7 +111,8 @@ class PostComplete_test():
GetVariableValue_CompleteItemIs( 'Test' ) )
def FilterToCompletedCompletions_NewVim_MatchIsReturned_test( self, *args ):
completions = [ BuildCompletion( insertion_text = 'Test' ) ]
result = self.ycm._FilterToMatchingCompletions( completions, False )
result = self._server_state._FilterToMatchingCompletions( completions,
False )
eq_( list( result ), completions )
@ -129,7 +122,7 @@ class PostComplete_test():
def FilterToCompletedCompletions_NewVim_ShortTextDoesntRaise_test( self,
*args ):
completions = [ BuildCompletion( insertion_text = 'AAA' ) ]
self.ycm._FilterToMatchingCompletions( completions, False )
self._server_state._FilterToMatchingCompletions( completions, False )
@patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
@ -138,7 +131,8 @@ class PostComplete_test():
def FilterToCompletedCompletions_NewVim_ExactMatchIsReturned_test( self,
*args ):
completions = [ BuildCompletion( insertion_text = 'Test' ) ]
result = self.ycm._FilterToMatchingCompletions( completions, False )
result = self._server_state._FilterToMatchingCompletions( completions,
False )
eq_( list( result ), completions )
@ -148,7 +142,8 @@ class PostComplete_test():
def FilterToCompletedCompletions_NewVim_NonMatchIsntReturned_test( self,
*args ):
completions = [ BuildCompletion( insertion_text = 'A' ) ]
result = self.ycm._FilterToMatchingCompletions( completions, False )
result = self._server_state._FilterToMatchingCompletions( completions,
False )
assert_that( list( result ), empty() )
@ -157,7 +152,8 @@ class PostComplete_test():
GetVariableValue_CompleteItemIs( '†es†' ) )
def FilterToCompletedCompletions_NewVim_Unicode_test( self, *args ):
completions = [ BuildCompletion( insertion_text = '†es†' ) ]
result = self.ycm._FilterToMatchingCompletions( completions, False )
result = self._server_state._FilterToMatchingCompletions( completions,
False )
eq_( list( result ), completions )
@ -165,7 +161,8 @@ class PostComplete_test():
@patch( 'ycm.vimsupport.TextBeforeCursor', return_value = ' Test' )
def FilterToCompletedCompletions_OldVim_MatchIsReturned_test( self, *args ):
completions = [ BuildCompletion( insertion_text = 'Test' ) ]
result = self.ycm._FilterToMatchingCompletions( completions, False )
result = self._server_state._FilterToMatchingCompletions( completions,
False )
eq_( list( result ), completions )
@ -174,7 +171,7 @@ class PostComplete_test():
def FilterToCompletedCompletions_OldVim_ShortTextDoesntRaise_test( self,
*args ):
completions = [ BuildCompletion( insertion_text = 'AAA' ) ]
self.ycm._FilterToMatchingCompletions( completions, False )
self._server_state._FilterToMatchingCompletions( completions, False )
@patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
@ -182,7 +179,8 @@ class PostComplete_test():
def FilterToCompletedCompletions_OldVim_ExactMatchIsReturned_test( self,
*args ):
completions = [ BuildCompletion( insertion_text = 'Test' ) ]
result = self.ycm._FilterToMatchingCompletions( completions, False )
result = self._server_state._FilterToMatchingCompletions( completions,
False )
eq_( list( result ), completions )
@ -191,7 +189,8 @@ class PostComplete_test():
def FilterToCompletedCompletions_OldVim_NonMatchIsntReturned_test( self,
*args ):
completions = [ BuildCompletion( insertion_text = 'A' ) ]
result = self.ycm._FilterToMatchingCompletions( completions, False )
result = self._server_state._FilterToMatchingCompletions( completions,
False )
assert_that( list( result ), empty() )
@ -199,7 +198,8 @@ class PostComplete_test():
@patch( 'ycm.vimsupport.TextBeforeCursor', return_value = 'Uniçø∂¢' )
def FilterToCompletedCompletions_OldVim_Unicode_test( self, *args ):
completions = [ BuildCompletion( insertion_text = 'Uniçø∂¢' ) ]
result = self.ycm._FilterToMatchingCompletions( completions, False )
result = self._server_state._FilterToMatchingCompletions( completions,
False )
assert_that( list( result ), empty() )
@ -208,7 +208,7 @@ class PostComplete_test():
def HasCompletionsThatCouldBeCompletedWithMoreText_OldVim_MatchIsReturned_test( # noqa
self, *args ):
completions = [ BuildCompletion( insertion_text = 'Test' ) ]
result = self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText(
result = self._server_state._HasCompletionsThatCouldBeCompletedWithMoreText(
completions )
eq_( result, True )
@ -218,7 +218,8 @@ class PostComplete_test():
def HasCompletionsThatCouldBeCompletedWithMoreText_OldVim_ShortTextDoesntRaise_test( # noqa
self, *args ):
completions = [ BuildCompletion( insertion_text = "AAA" ) ]
self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText( completions )
self._server_state._HasCompletionsThatCouldBeCompletedWithMoreText(
completions )
@patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
@ -226,7 +227,7 @@ class PostComplete_test():
def HasCompletionsThatCouldBeCompletedWithMoreText_OldVim_ExactMatchIsntReturned_test( # noqa
self, *args ):
completions = [ BuildCompletion( insertion_text = 'Test' ) ]
result = self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText(
result = self._server_state._HasCompletionsThatCouldBeCompletedWithMoreText(
completions )
eq_( result, False )
@ -236,7 +237,7 @@ class PostComplete_test():
def HasCompletionsThatCouldBeCompletedWithMoreText_OldVim_NonMatchIsntReturned_test( # noqa
self, *args ):
completions = [ BuildCompletion( insertion_text = 'A' ) ]
result = self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText(
result = self._server_state._HasCompletionsThatCouldBeCompletedWithMoreText(
completions )
eq_( result, False )
@ -246,7 +247,7 @@ class PostComplete_test():
def HasCompletionsThatCouldBeCompletedWithMoreText_OldVim_Unicode_test(
self, *args ):
completions = [ BuildCompletion( insertion_text = 'Uniçø∂¢' ) ]
result = self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText(
result = self._server_state._HasCompletionsThatCouldBeCompletedWithMoreText(
completions )
eq_( result, True )
@ -258,7 +259,7 @@ class PostComplete_test():
def HasCompletionsThatCouldBeCompletedWithMoreText_NewVim_MatchIsReturned_test( # noqa
self, *args ):
completions = [ BuildCompletion( insertion_text = 'Test' ) ]
result = self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText(
result = self._server_state._HasCompletionsThatCouldBeCompletedWithMoreText(
completions )
eq_( result, True )
@ -270,7 +271,8 @@ class PostComplete_test():
def HasCompletionsThatCouldBeCompletedWithMoreText_NewVim_ShortTextDoesntRaise_test( # noqa
self, *args ):
completions = [ BuildCompletion( insertion_text = 'AAA' ) ]
self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText( completions )
self._server_state._HasCompletionsThatCouldBeCompletedWithMoreText(
completions )
@patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
@ -280,7 +282,7 @@ class PostComplete_test():
def HasCompletionsThatCouldBeCompletedWithMoreText_NewVim_ExactMatchIsntReturned_test( # noqa
self, *args ):
completions = [ BuildCompletion( insertion_text = 'Test' ) ]
result = self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText(
result = self._server_state._HasCompletionsThatCouldBeCompletedWithMoreText(
completions )
eq_( result, False )
@ -292,7 +294,7 @@ class PostComplete_test():
def HasCompletionsThatCouldBeCompletedWithMoreText_NewVim_NonMatchIsntReturned_test( # noqa
self, *args ):
completions = [ BuildCompletion( insertion_text = "A" ) ]
result = self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText(
result = self._server_state._HasCompletionsThatCouldBeCompletedWithMoreText(
completions )
eq_( result, False )
@ -304,27 +306,27 @@ class PostComplete_test():
def HasCompletionsThatCouldBeCompletedWithMoreText_NewVim_Unicode_test(
self, *args ):
completions = [ BuildCompletion( insertion_text = "Uniçø∂¢" ) ]
result = self.ycm._HasCompletionsThatCouldBeCompletedWithMoreText(
result = self._server_state._HasCompletionsThatCouldBeCompletedWithMoreText(
completions )
eq_( result, True )
def GetRequiredNamespaceImport_ReturnNoneForNoExtraData_test( self ):
eq_( None, self.ycm._GetRequiredNamespaceImport( {} ) )
eq_( None, self._server_state._GetRequiredNamespaceImport( {} ) )
def GetRequiredNamespaceImport_ReturnNamespaceFromExtraData_test( self ):
namespace = 'A_NAMESPACE'
eq_( namespace, self.ycm._GetRequiredNamespaceImport(
eq_( namespace, self._server_state._GetRequiredNamespaceImport(
BuildCompletion( namespace )
) )
def GetCompletionsUserMayHaveCompleted_ReturnEmptyIfNotDone_test( self ):
with self._SetupForCsharpCompletionDone( [] ):
self.ycm._latest_completion_request.Done = MagicMock(
self._server_state._latest_completion_request.Done = MagicMock(
return_value = False )
eq_( [], self.ycm.GetCompletionsUserMayHaveCompleted() )
eq_( [], self._server_state.GetCompletionsUserMayHaveCompleted() )
@patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
@ -334,7 +336,7 @@ class PostComplete_test():
self, *args ):
completions = [ BuildCompletion( None ) ]
with self._SetupForCsharpCompletionDone( completions ):
eq_( [], self.ycm.GetCompletionsUserMayHaveCompleted() )
eq_( [], self._server_state.GetCompletionsUserMayHaveCompleted() )
@patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
@ -343,7 +345,7 @@ class PostComplete_test():
completions = [ BuildCompletion( None ) ]
with self._SetupForCsharpCompletionDone( completions ):
with patch( 'ycm.vimsupport.TextBeforeCursor', return_value = ' Te' ):
eq_( [], self.ycm.GetCompletionsUserMayHaveCompleted() )
eq_( [], self._server_state.GetCompletionsUserMayHaveCompleted() )
@patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
@ -354,7 +356,8 @@ class PostComplete_test():
with self._SetupForCsharpCompletionDone( completions ):
with patch( 'ycm.vimsupport.GetVariableValue',
GetVariableValue_CompleteItemIs( *info[ 1: ] ) ):
eq_( completions, self.ycm.GetCompletionsUserMayHaveCompleted() )
eq_( completions,
self._server_state.GetCompletionsUserMayHaveCompleted() )
@patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
@ -367,7 +370,7 @@ class PostComplete_test():
with patch( 'ycm.vimsupport.GetVariableValue',
GetVariableValue_CompleteItemIs( *info[ 1: ] ) ):
eq_( [ completions[ 0 ] ],
self.ycm.GetCompletionsUserMayHaveCompleted() )
self._server_state.GetCompletionsUserMayHaveCompleted() )
@patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
@ -379,7 +382,7 @@ class PostComplete_test():
with self._SetupForCsharpCompletionDone( completions ):
with patch( 'ycm.vimsupport.GetVariableValue',
GetVariableValue_CompleteItemIs( *info[ 1: ] ) ):
eq_( [], self.ycm.GetCompletionsUserMayHaveCompleted() )
eq_( [], self._server_state.GetCompletionsUserMayHaveCompleted() )
@patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = True )
@ -389,7 +392,8 @@ class PostComplete_test():
self, *args ):
completions = [ BuildCompletion( None ) ]
with self._SetupForCsharpCompletionDone( completions ):
eq_( completions, self.ycm.GetCompletionsUserMayHaveCompleted() )
eq_( completions,
self._server_state.GetCompletionsUserMayHaveCompleted() )
@patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
@ -397,13 +401,14 @@ class PostComplete_test():
self, *args ):
completions = [ BuildCompletion( None ) ]
with self._SetupForCsharpCompletionDone( completions ):
eq_( completions, self.ycm.GetCompletionsUserMayHaveCompleted() )
eq_( completions,
self._server_state.GetCompletionsUserMayHaveCompleted() )
@patch( 'ycm.vimsupport.VimVersionAtLeast', return_value = False )
def PostCompleteCsharp_EmptyDoesntInsertNamespace_test( self, *args ):
with self._SetupForCsharpCompletionDone( [] ):
self.ycm._OnCompleteDone_Csharp()
self._server_state._OnCompleteDone_Csharp()
ok_( not vimsupport.InsertNamespace.called )
@ -412,7 +417,7 @@ class PostComplete_test():
self, *args ):
completions = [ BuildCompletion( None ) ]
with self._SetupForCsharpCompletionDone( completions ):
self.ycm._OnCompleteDone_Csharp()
self._server_state._OnCompleteDone_Csharp()
ok_( not vimsupport.InsertNamespace.called )
@ -421,7 +426,7 @@ class PostComplete_test():
namespace = 'A_NAMESPACE'
completions = [ BuildCompletion( namespace ) ]
with self._SetupForCsharpCompletionDone( completions ):
self.ycm._OnCompleteDone_Csharp()
self._server_state._OnCompleteDone_Csharp()
vimsupport.InsertNamespace.assert_called_once_with( namespace )
@ -435,5 +440,5 @@ class PostComplete_test():
BuildCompletion( namespace2 ),
]
with self._SetupForCsharpCompletionDone( completions ):
self.ycm._OnCompleteDone_Csharp()
self._server_state._OnCompleteDone_Csharp()
vimsupport.InsertNamespace.assert_called_once_with( namespace2 )

86
python/ycm/tests/server_test.py Normal file
View File

@ -0,0 +1,86 @@
# Copyright (C) 2016 YouCompleteMe contributors
#
# This file is part of YouCompleteMe.
#
# YouCompleteMe is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# YouCompleteMe is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with YouCompleteMe. If not, see <http://www.gnu.org/licenses/>.
from __future__ import unicode_literals
from __future__ import print_function
from __future__ import division
from __future__ import absolute_import
from future import standard_library
standard_library.install_aliases()
from builtins import * # noqa
from ycm.test_utils import MockVimModule
MockVimModule()
import requests
import time
from ycm.client.base_request import BaseRequest
from ycm.youcompleteme import YouCompleteMe
from ycmd import user_options_store
# The default options which are only relevant to the client, not the server and
# thus are not part of default_options.json, but are required for a working
# YouCompleteMe or OmniCompleter object.
DEFAULT_CLIENT_OPTIONS = {
'server_log_level': 'info',
'extra_conf_vim_data': [],
'show_diagnostics_ui': 1,
'enable_diagnostic_signs': 1,
'enable_diagnostic_highlighting': 0,
'always_populate_location_list': 0,
}
def MakeUserOptions( custom_options = {} ):
options = dict( user_options_store.DefaultOptions() )
options.update( DEFAULT_CLIENT_OPTIONS )
options.update( custom_options )
return options
class Server_test():
def _IsReady( self ):
return BaseRequest.GetDataFromHandler( 'ready' )
def _WaitUntilReady( self, timeout = 5 ):
total_slept = 0
while True:
try:
if total_slept > timeout:
raise RuntimeError( 'Waited for the server to be ready '
'for {0} seconds, aborting.'.format(
timeout ) )
if self._IsReady():
return
except requests.exceptions.ConnectionError:
pass
finally:
time.sleep( 0.1 )
total_slept += 0.1
def setUp( self ):
self._server_state = YouCompleteMe( MakeUserOptions() )
self._WaitUntilReady()
def tearDown( self ):
self._server_state.OnVimLeave()

13
python/ycm/tests/youcompleteme_test.py
View File

@ -27,21 +27,12 @@ from ycm.test_utils import MockVimModule
MockVimModule()
import sys
from mock import MagicMock
from hamcrest import assert_that, is_in, is_not
from ycm.youcompleteme import YouCompleteMe
from ycm.tests.server_test import Server_test
class YouCompleteMe_test():
def setUp( self ):
self.ycm = YouCompleteMe( MagicMock( spec_set = dict ) )
def tearDown( self ):
self.ycm.OnVimLeave()
class YouCompleteMe_test( Server_test ):
def YcmCoreNotImported_test( self ):
assert_that( 'ycm_core', is_not( is_in( sys.modules ) ) )