To: vim_dev@googlegroups.com
Subject: Patch 8.0.0435
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.0.0435
Problem:    Some functions are not tested.
Solution:   Add more tests for functions. (Dominique Pelle, closes #1541)
Files:      src/testdir/test_functions.vim


*** ../vim-8.0.0434/src/testdir/test_functions.vim	2017-03-02 22:47:56.898286649 +0100
--- src/testdir/test_functions.vim	2017-03-09 12:06:09.405990264 +0100
***************
*** 27,32 ****
--- 27,39 ----
    call assert_equal(1, empty(v:false))
    call assert_equal(0, empty(v:true))
  
+   if has('channel')
+     call assert_equal(1, empty(test_null_channel()))
+   endif
+   if has('job')
+     call assert_equal(1, empty(test_null_job()))
+   endif
+ 
    call assert_equal(0, empty(function('Test_empty')))
  endfunc
  
***************
*** 467,472 ****
--- 474,720 ----
    set fileformats&
  endfunc
  
+ func Test_bufexists()
+   call assert_equal(0, bufexists('does_not_exist'))
+   call assert_equal(1, bufexists(bufnr('%')))
+   call assert_equal(0, bufexists(0))
+   new Xfoo
+   let bn = bufnr('%')
+   call assert_equal(1, bufexists(bn))
+   call assert_equal(1, bufexists('Xfoo'))
+   call assert_equal(1, bufexists(getcwd() . '/Xfoo'))
+   call assert_equal(1, bufexists(0))
+   bw
+   call assert_equal(0, bufexists(bn))
+   call assert_equal(0, bufexists('Xfoo'))
+ endfunc
+ 
+ func Test_last_buffer_nr()
+   call assert_equal(bufnr('$'), last_buffer_nr())
+ endfunc
+ 
+ func Test_stridx()
+   call assert_equal(-1, stridx('', 'l'))
+   call assert_equal(0,  stridx('', ''))
+   call assert_equal(0,  stridx('hello', ''))
+   call assert_equal(-1, stridx('hello', 'L'))
+   call assert_equal(2,  stridx('hello', 'l', -1))
+   call assert_equal(2,  stridx('hello', 'l', 0))
+   call assert_equal(2,  stridx('hello', 'l', 1))
+   call assert_equal(3,  stridx('hello', 'l', 3))
+   call assert_equal(-1, stridx('hello', 'l', 4))
+   call assert_equal(-1, stridx('hello', 'l', 10))
+   call assert_equal(2,  stridx('hello', 'll'))
+   call assert_equal(-1, stridx('hello', 'hello world'))
+ endfunc
+ 
+ func Test_strridx()
+   call assert_equal(-1, strridx('', 'l'))
+   call assert_equal(0,  strridx('', ''))
+   call assert_equal(5,  strridx('hello', ''))
+   call assert_equal(-1, strridx('hello', 'L'))
+   call assert_equal(3,  strridx('hello', 'l'))
+   call assert_equal(3,  strridx('hello', 'l', 10))
+   call assert_equal(3,  strridx('hello', 'l', 3))
+   call assert_equal(2,  strridx('hello', 'l', 2))
+   call assert_equal(-1, strridx('hello', 'l', 1))
+   call assert_equal(-1, strridx('hello', 'l', 0))
+   call assert_equal(-1, strridx('hello', 'l', -1))
+   call assert_equal(2,  strridx('hello', 'll'))
+   call assert_equal(-1, strridx('hello', 'hello world'))
+ endfunc
+ 
+ func Test_matchend()
+   call assert_equal(7,  matchend('testing', 'ing'))
+   call assert_equal(7,  matchend('testing', 'ing', 2))
+   call assert_equal(-1, matchend('testing', 'ing', 5))
+ endfunc
+ 
+ func Test_nextnonblank_prevnonblank()
+   new
+ insert
+ This
+ 
+ 
+ is
+ 
+ a
+ Test
+ .
+   call assert_equal(0, nextnonblank(-1))
+   call assert_equal(0, nextnonblank(0))
+   call assert_equal(1, nextnonblank(1))
+   call assert_equal(4, nextnonblank(2))
+   call assert_equal(4, nextnonblank(3))
+   call assert_equal(4, nextnonblank(4))
+   call assert_equal(6, nextnonblank(5))
+   call assert_equal(6, nextnonblank(6))
+   call assert_equal(7, nextnonblank(7))
+   call assert_equal(0, nextnonblank(8))
+ 
+   call assert_equal(0, prevnonblank(-1))
+   call assert_equal(0, prevnonblank(0))
+   call assert_equal(1, prevnonblank(1))
+   call assert_equal(1, prevnonblank(2))
+   call assert_equal(1, prevnonblank(3))
+   call assert_equal(4, prevnonblank(4))
+   call assert_equal(4, prevnonblank(5))
+   call assert_equal(6, prevnonblank(6))
+   call assert_equal(7, prevnonblank(7))
+   call assert_equal(0, prevnonblank(8))
+   bw!
+ endfunc
+ 
+ func Test_byte2line_line2byte()
+   new
+   call setline(1, ['a', 'bc', 'd'])
+ 
+   set fileformat=unix
+   call assert_equal([-1, -1, 1, 1, 2, 2, 2, 3, 3, -1],
+   \                 map(range(-1, 8), 'byte2line(v:val)'))
+   call assert_equal([-1, -1, 1, 3, 6, 8, -1],
+   \                 map(range(-1, 5), 'line2byte(v:val)'))
+ 
+   set fileformat=mac
+   call assert_equal([-1, -1, 1, 1, 2, 2, 2, 3, 3, -1],
+   \                 map(range(-1, 8), 'byte2line(v:val)'))
+   call assert_equal([-1, -1, 1, 3, 6, 8, -1],
+   \                 map(range(-1, 5), 'line2byte(v:val)'))
+ 
+   set fileformat=dos
+   call assert_equal([-1, -1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, -1],
+   \                 map(range(-1, 11), 'byte2line(v:val)'))
+   call assert_equal([-1, -1, 1, 4, 8, 11, -1],
+   \                 map(range(-1, 5), 'line2byte(v:val)'))
+ 
+   set fileformat&
+   bw!
+ endfunc
+ 
+ func Test_count()
+   let l = ['a', 'a', 'A', 'b']
+   call assert_equal(2, count(l, 'a'))
+   call assert_equal(1, count(l, 'A'))
+   call assert_equal(1, count(l, 'b'))
+   call assert_equal(0, count(l, 'B'))
+ 
+   call assert_equal(2, count(l, 'a', 0))
+   call assert_equal(1, count(l, 'A', 0))
+   call assert_equal(1, count(l, 'b', 0))
+   call assert_equal(0, count(l, 'B', 0))
+ 
+   call assert_equal(3, count(l, 'a', 1))
+   call assert_equal(3, count(l, 'A', 1))
+   call assert_equal(1, count(l, 'b', 1))
+   call assert_equal(1, count(l, 'B', 1))
+   call assert_equal(0, count(l, 'c', 1))
+ 
+   call assert_equal(1, count(l, 'a', 0, 1))
+   call assert_equal(2, count(l, 'a', 1, 1))
+   call assert_fails('call count(l, "a", 0, 10)', 'E684:')
+ 
+   let d = {1: 'a', 2: 'a', 3: 'A', 4: 'b'}
+   call assert_equal(2, count(d, 'a'))
+   call assert_equal(1, count(d, 'A'))
+   call assert_equal(1, count(d, 'b'))
+   call assert_equal(0, count(d, 'B'))
+ 
+   call assert_equal(2, count(d, 'a', 0))
+   call assert_equal(1, count(d, 'A', 0))
+   call assert_equal(1, count(d, 'b', 0))
+   call assert_equal(0, count(d, 'B', 0))
+ 
+   call assert_equal(3, count(d, 'a', 1))
+   call assert_equal(3, count(d, 'A', 1))
+   call assert_equal(1, count(d, 'b', 1))
+   call assert_equal(1, count(d, 'B', 1))
+   call assert_equal(0, count(d, 'c', 1))
+ 
+   call assert_fails('call count(d, "a", 0, 1)', 'E474:')
+   call assert_fails('call count("a", "a")', 'E712:')
+ endfunc
+ 
+ func Test_changenr()
+   new Xchangenr
+   call assert_equal(0, changenr())
+   norm ifoo
+   call assert_equal(1, changenr())
+   set undolevels=10
+   norm Sbar
+   call assert_equal(2, changenr())
+   undo
+   call assert_equal(1, changenr())
+   redo
+   call assert_equal(2, changenr())
+   bw!
+   set undolevels&
+ endfunc
+ 
+ func Test_filewritable()
+   new Xfilewritable
+   write!
+   call assert_equal(1, filewritable('Xfilewritable'))
+ 
+   call assert_notequal(0, setfperm('Xfilewritable', 'r--r-----'))
+   call assert_equal(0, filewritable('Xfilewritable'))
+ 
+   call assert_notequal(0, setfperm('Xfilewritable', 'rw-r-----'))
+   call assert_equal(1, filewritable('Xfilewritable'))
+ 
+   call assert_equal(0, filewritable('doesnotexist'))
+ 
+   call delete('Xfilewritable')
+   bw!
+ endfunc
+ 
+ func Test_hostname()
+   let hostname_vim = hostname()
+   if has('unix')
+     let hostname_system = systemlist('uname -n')[0]
+     call assert_equal(hostname_vim, hostname_system)
+   endif
+ endfunc
+ 
+ func Test_getpid()
+   " getpid() always returns the same value within a vim instance.
+   call assert_equal(getpid(), getpid())
+   if has('unix')
+     call assert_equal(systemlist('echo $PPID')[0], string(getpid()))
+   endif
+ endfunc
+ 
+ func Test_hlexists()
+   call assert_equal(0, hlexists('does_not_exist'))
+   call assert_equal(0, hlexists('Number'))
+   call assert_equal(0, highlight_exists('does_not_exist'))
+   call assert_equal(0, highlight_exists('Number'))
+   syntax on
+   call assert_equal(0, hlexists('does_not_exist'))
+   call assert_equal(1, hlexists('Number'))
+   call assert_equal(0, highlight_exists('does_not_exist'))
+   call assert_equal(1, highlight_exists('Number'))
+   syntax off
+ endfunc
+ 
+ func Test_col()
+   new
+   call setline(1, 'abcdef')
+   norm gg4|mx6|mY2|
+   call assert_equal(2, col('.'))
+   call assert_equal(7, col('$'))
+   call assert_equal(4, col("'x"))
+   call assert_equal(6, col("'Y"))
+   call assert_equal(2, col([1, 2]))
+   call assert_equal(7, col([1, '$']))
+ 
+   call assert_equal(0, col(''))
+   call assert_equal(0, col('x'))
+   call assert_equal(0, col([2, '$']))
+   call assert_equal(0, col([1, 100]))
+   call assert_equal(0, col([1]))
+   bw!
+ endfunc
+ 
  func Test_balloon_show()
    if has('balloon_eval')
      " This won't do anything but must not crash either.
*** ../vim-8.0.0434/src/version.c	2017-03-09 11:58:35.445168330 +0100
--- src/version.c	2017-03-09 12:04:00.006899932 +0100
***************
*** 766,767 ****
--- 766,769 ----
  {   /* Add new patch number below this line */
+ /**/
+     435,
  /**/

-- 
How many light bulbs does it take to change a person?

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///