1 files changed, 14 insertions, 12 deletions
diff --git a/test/functional/plugin/lsp/diagnostic_spec.lua b/test/functional/plugin/lsp/diagnostic_spec.lua
index 705c182df7..c5e14ffdc2 100644
--- a/test/functional/plugin/lsp/diagnostic_spec.lua
+++ b/test/functional/plugin/lsp/diagnostic_spec.lua
@@ -1,12 +1,14 @@
-local helpers = require('test.functional.helpers')(after_each)
-local lsp_helpers = require('test.functional.plugin.lsp.helpers')
+local t = require('test.testutil')
+local n = require('test.functional.testnvim')()
 
-local clear = helpers.clear
-local exec_lua = helpers.exec_lua
-local eq = helpers.eq
-local neq = require('test.helpers').neq
+local t_lsp = require('test.functional.plugin.lsp.testutil')
 
-local create_server_definition = lsp_helpers.create_server_definition
+local clear = n.clear
+local exec_lua = n.exec_lua
+local eq = t.eq
+local neq = t.neq
+
+local create_server_definition = t_lsp.create_server_definition
 
 describe('vim.lsp.diagnostic', function()
   local fake_uri
@@ -257,7 +259,7 @@ describe('vim.lsp.diagnostic', function()
         }, {client_id=client_id})
         return vim.fn.bufnr(vim.uri_to_fname("file:///fake/uri2"))
       ]]
-      eq(bufnr, -1)
+      eq(-1, bufnr)
 
       -- Create buffer on diagnostics
       bufnr = exec_lua [[
@@ -269,8 +271,8 @@ describe('vim.lsp.diagnostic', function()
         }, {client_id=client_id})
         return vim.fn.bufnr(vim.uri_to_fname("file:///fake/uri2"))
       ]]
-      neq(bufnr, -1)
-      eq(exec_lua([[return #vim.diagnostic.get(...)]], bufnr), 1)
+      neq(-1, bufnr)
+      eq(1, exec_lua([[return #vim.diagnostic.get(...)]], bufnr))
 
       -- Clear diagnostics after buffer was created
       bufnr = exec_lua [[
@@ -280,8 +282,8 @@ describe('vim.lsp.diagnostic', function()
         }, {client_id=client_id})
         return vim.fn.bufnr(vim.uri_to_fname("file:///fake/uri2"))
       ]]
-      neq(bufnr, -1)
-      eq(exec_lua([[return #vim.diagnostic.get(...)]], bufnr), 0)
+      neq(-1, bufnr)
+      eq(0, exec_lua([[return #vim.diagnostic.get(...)]], bufnr))
     end)
   end)