test/util: expect_err() (#8257)

other cleanup, ref #8245

1 files changed, 12 insertions, 14 deletions

diff --git a/test/functional/api/ui_spec.lua b/test/functional/api/ui_spec.lua
index 32aae5d8f2..b028a50b02 100644
--- a/test/functional/api/ui_spec.lua
+++ b/test/functional/api/ui_spec.lua
@@ -3,6 +3,8 @@ local Screen = require('test.functional.ui.screen')
 local clear = helpers.clear
 local eq = helpers.eq
 local eval = helpers.eval
+local expect_err = helpers.expect_err
+local meths = helpers.meths
 local request = helpers.request
 
 describe('nvim_ui_attach()', function()
@@ -16,24 +18,20 @@ describe('nvim_ui_attach()', function()
     eq(999, eval('&columns'))
   end)
   it('invalid option returns error', function()
-    local screen = Screen.new()
-    local status, rv = pcall(function() screen:attach({foo={'foo'}}) end)
-    eq(false, status)
-    eq('No such UI option', rv:match("No such .*"))
+    expect_err('No such UI option: foo',
+               meths.ui_attach, 80, 24, { foo={'foo'} })
   end)
   it('validates channel arg', function()
-    assert.has_error(function() request('nvim_ui_try_resize', 40, 10) end,
-                     'UI not attached to channel: 1')
-    assert.has_error(function() request('nvim_ui_set_option', 'rgb', true) end,
-                     'UI not attached to channel: 1')
-    assert.has_error(function() request('nvim_ui_detach') end,
-                     'UI not attached to channel: 1')
+    expect_err('UI not attached to channel: 1',
+               request, 'nvim_ui_try_resize', 40, 10)
+    expect_err('UI not attached to channel: 1',
+               request, 'nvim_ui_set_option', 'rgb', true)
+    expect_err('UI not attached to channel: 1',
+               request, 'nvim_ui_detach')
 
     local screen = Screen.new()
     screen:attach({rgb=false})
-    assert.has_error(function()
-      request('nvim_ui_attach', 40, 10, { rgb=false })
-    end,
-    'UI already attached to channel: 1')
+    expect_err('UI already attached to channel: 1',
+               request, 'nvim_ui_attach', 40, 10, { rgb=false })
   end)
 end)