Skip to content
Permalink
Browse files

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)
  • Loading branch information...
brammool committed Mar 19, 2017
1 parent b4c5572 commit 7dd4850698e37c3ed4a3c3b23f4cdbf1ae6542f8
Showing with 144 additions and 0 deletions.
  1. +1 −0 src/Makefile
  2. +1 −0 src/testdir/Make_all.mak
  3. +1 −0 src/testdir/runtest.vim
  4. +139 −0 src/testdir/test_quotestar.vim
  5. +2 −0 src/version.c
@@ -2185,6 +2185,7 @@ test_arglist \
test_pyx2 \
test_pyx3 \
test_quickfix \
test_quotestar \
test_recover \
test_regexp_latin \
test_regexp_utf8 \
@@ -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 \
@@ -228,6 +228,7 @@ let s:flaky = [
\ 'Test_pipe_through_sort_all()',
\ 'Test_pipe_through_sort_some()',
\ 'Test_quoteplus()',
\ 'Test_quotestar()',
\ 'Test_reltime()',
\ ]

@@ -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
@@ -764,6 +764,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
489,
/**/
488,
/**/

0 comments on commit 7dd4850

Please sign in to comment.
You can’t perform that action at this time.