Mercurial > vim
changeset 11205:4db196820d3b v8.0.0489
patch 8.0.0489: clipboard and "* register is not tested
commit https://github.com/vim/vim/commit/7dd4850698e37c3ed4a3c3b23f4cdbf1ae6542f8
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 19 20:04:22 2017 +0100
patch 8.0.0489: clipboard and "* register is not tested
Problem: Clipboard and "* register is not tested.
Solution: Add a test for Mac and X11. (Kazunobu Kuriyama)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 19 Mar 2017 20:15:05 +0100 |
| parents | 7a1ada568d8c |
| children | 7f0df640e94e |
| files | src/Makefile src/testdir/Make_all.mak src/testdir/runtest.vim src/testdir/test_quotestar.vim src/version.c |
| diffstat | 5 files changed, 144 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -2185,6 +2185,7 @@ test_arglist \ test_pyx2 \ test_pyx3 \ test_quickfix \ + test_quotestar \ test_recover \ test_regexp_latin \ test_regexp_utf8 \
--- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -194,6 +194,7 @@ NEW_TESTS = test_arabic.res \ test_pyx2.res \ test_pyx3.res \ test_quickfix.res \ + test_quotestar.res \ test_retab.res \ test_ruby.res \ test_search.res \
--- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -228,6 +228,7 @@ let s:flaky = [ \ 'Test_pipe_through_sort_all()', \ 'Test_pipe_through_sort_some()', \ 'Test_quoteplus()', + \ 'Test_quotestar()', \ 'Test_reltime()', \ ]
new file mode 100644 --- /dev/null +++ b/src/testdir/test_quotestar.vim @@ -0,0 +1,139 @@ +" *-register (quotestar) tests + +if !has('clipboard') + finish +endif + +source shared.vim + +let s:where = 0 +func Abort(id) + call assert_report('Test timed out at ' . s:where) + call FinishTesting() +endfunc + +func Do_test_quotestar_for_macunix() + if empty(exepath('pbcopy')) || empty(exepath('pbpaste')) + return 'Test requires pbcopy(1) and pbpaste(1)' + endif + + let @* = '' + + " Test #1: Pasteboard to Vim + let test_msg = "text from pasteboard to vim via quotestar" + " Write a piece of text to the pasteboard. + call system('/bin/echo -n "' . test_msg . '" | pbcopy') + " See if the *-register is changed as expected. + call assert_equal(test_msg, @*) + + " Test #2: Vim to Pasteboard + let test_msg = "text from vim to pasteboard via quotestar" + " Write a piece of text to the *-register. + let @* = test_msg + " See if the pasteboard is changed as expected. + call assert_equal(test_msg, system('pbpaste')) + + return '' +endfunc + +func Do_test_quotestar_for_x11() + if !has('clientserver') || !has('job') + return 'Test requires the client-server and job features' + endif + + let cmd = GetVimCommand() + if cmd == '' + return 'GetVimCommand() failed' + endif + + " Some of these commands may hang when failing. + call timer_start(10000, 'Abort') + + let s:where = 1 + let name = 'XVIMCLIPBOARD' + let cmd .= ' --servername ' . name + let g:job = job_start(cmd, {'stoponexit': 'kill', 'out_io': 'null'}) + call WaitFor('job_status(g:job) == "run"') + if job_status(g:job) != 'run' + call assert_report('Cannot run the Vim server') + return '' + endif + let s:where = 2 + + " Takes a short while for the server to be active. + call WaitFor('serverlist() =~ "' . name . '"') + call assert_match(name, serverlist()) + let s:where = 3 + + " Clear the *-register of this vim instance. + let @* = '' + + " Try to change the *-register of the server. + call remote_foreground(name) + let s:where = 4 + call remote_send(name, ":let @* = 'yes'\<CR>") + let s:where = 5 + call WaitFor('remote_expr("' . name . '", "@*") == "yes"') + let s:where = 6 + call assert_equal('yes', remote_expr(name, "@*")) + let s:where = 7 + + " Check that the *-register of this vim instance is changed as expected. + call assert_equal('yes', @*) + + if has('unix') && has('gui') && !has('gui_running') + let @* = '' + + " Running in a terminal and the GUI is avaiable: Tell the server to open + " the GUI and check that the remote command still works. + " Need to wait for the GUI to start up, otherwise the send hangs in trying + " to send to the terminal window. + if has('gui_athena') || has('gui_motif') + " For those GUIs, ignore the 'failed to create input context' error. + call remote_send(name, ":call test_ignore_error('E285') | gui -f\<CR>") + else + call remote_send(name, ":gui -f\<CR>") + endif + let s:where = 8 + sleep 500m + call remote_send(name, ":let @* = 'maybe'\<CR>") + let s:where = 9 + call WaitFor('remote_expr("' . name . '", "@*") == "maybe"') + let s:where = 10 + call assert_equal('maybe', remote_expr(name, "@*")) + let s:where = 11 + + call assert_equal('maybe', @*) + endif + + call remote_send(name, ":qa!\<CR>") + let s:where = 12 + call WaitFor('job_status(g:job) == "dead"') + let s:where = 13 + if job_status(g:job) != 'dead' + call assert_report('Server did not exit') + call job_stop(g:job, 'kill') + endif + + return '' +endfunc + +func Test_quotestar() + let skipped = '' + + let quotestar_saved = @* + + if has('macunix') + let skipped = Do_test_quotestar_for_macunix() + elseif !empty("$DISPLAY") + let skipped = Do_test_quotestar_for_x11() + else + let skipped = "Test is not implemented yet for this platform." + endif + + let @* = quotestar_saved + + if !empty(skipped) + throw skipped + endif +endfunc