4 files changed, 10 insertions, 10 deletions
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
index 6f8645c806..722f413d82 100644
--- a/src/nvim/eval.lua
+++ b/src/nvim/eval.lua
@@ -35,7 +35,7 @@ return {
     asin={args=1, base=1, func="float_op_wrapper", data="&asin"},  -- WJMc
     assert_beeps={args={1}, base=1},
     assert_equal={args={2, 3}, base=2},
-    assert_equalfile={args={2, 3}},
+    assert_equalfile={args={2, 3}, base=1},
     assert_exception={args={1, 2}},
     assert_fails={args={1, 3}, base=1},
     assert_false={args={1, 2}, base=1},
@@ -44,7 +44,7 @@ return {
     assert_nobeep={args={1}},
     assert_notequal={args={2, 3}, base=2},
     assert_notmatch={args={2, 3}, base=2},
-    assert_report={args=1},
+    assert_report={args=1, base=1},
     assert_true={args={1, 2}, base=1},
     atan={args=1, base=1, func="float_op_wrapper", data="&atan"},
     atan2={args=2, base=1},
@@ -60,8 +60,8 @@ return {
     bufloaded={args=1, base=1},
     bufname={args={0, 1}, base=1},
     bufnr={args={0, 2}, base=1},
-    bufwinid={args=1},
-    bufwinnr={args=1},
+    bufwinid={args=1, base=1},
+    bufwinnr={args=1, base=1},
     byte2line={args=1},
     byteidx={args=2},
     byteidxcomp={args=2},
@@ -408,7 +408,7 @@ return {
     win_id2win={args=1},
     win_screenpos={args=1},
     win_splitmove={args={2, 3}},
-    winbufnr={args=1},
+    winbufnr={args=1, base=1},
     wincol={},
     windowsversion={},
     winheight={args=1},
diff --git a/src/nvim/testdir/test_assert.vim b/src/nvim/testdir/test_assert.vim
index 1d114221dc..52f243aaea 100644
--- a/src/nvim/testdir/test_assert.vim
+++ b/src/nvim/testdir/test_assert.vim
@@ -7,7 +7,7 @@ func Test_assert_equalfile()
 
   let goodtext = ["one", "two", "three"]
   call writefile(goodtext, 'Xone')
-  call assert_equal(1, assert_equalfile('Xone', 'xyzxyz'))
+  call assert_equal(1, 'Xone'->assert_equalfile('xyzxyz'))
   call assert_match("E485: Can't read file xyzxyz", v:errors[0])
   call remove(v:errors, 0)
 
diff --git a/src/nvim/testdir/test_bufline.vim b/src/nvim/testdir/test_bufline.vim
index e038bce08e..2a8c6915e2 100644
--- a/src/nvim/testdir/test_bufline.vim
+++ b/src/nvim/testdir/test_bufline.vim
@@ -131,11 +131,11 @@ func Test_appendbufline_redraw()
   endif
   let lines =<< trim END
     new foo
-    let winnr=bufwinnr('foo')
-    let buf=bufnr('foo')
+    let winnr = 'foo'->bufwinnr()
+    let buf = bufnr('foo')
     wincmd p
     call appendbufline(buf, '$', range(1,200))
-    exe winnr. 'wincmd w'
+    exe winnr .. 'wincmd w'
     norm! G
     wincmd p
     call deletebufline(buf, 1, '$')
diff --git a/src/nvim/testdir/test_bufwintabinfo.vim b/src/nvim/testdir/test_bufwintabinfo.vim
index cb7ab44798..4b5b55e6bf 100644
--- a/src/nvim/testdir/test_bufwintabinfo.vim
+++ b/src/nvim/testdir/test_bufwintabinfo.vim
@@ -18,7 +18,7 @@ function Test_getbufwintabinfo()
     let l = getbufinfo('%')
     call assert_equal(bufnr('%'), l[0].bufnr)
     call assert_equal('vim', l[0].variables.editor)
-    call assert_notequal(-1, index(l[0].windows, bufwinid('%')))
+    call assert_notequal(-1, index(l[0].windows, '%'->bufwinid()))
 
     " Test for getbufinfo() with 'bufmodified'
     call assert_equal(0, len(getbufinfo({'bufmodified' : 1})))