add mtp client (#7)

* add mtp client

test running

alternative test discovery

fix running multiple tests

start debug strategy

start mtp runner

mtp runner

parse test runner results

* add mtp debugger

* improve client creation

* improve handling of many tests cases

* refactor mtp client

* improve output reporting

* improve debugger

* fix crash on missing project file

Author: Nsidorenco

README.md

@@ -12,9 +12,11 @@
 Neotest adapter for dotnet
 
 - Based on the VSTest for dotnet allowing test functionality similar to those found in IDEs like Rider and Visual Studio.
+  - Will use the new [Microsoft.Testing.Platform](https://learn.microsoft.com/en-us/dotnet/core/testing/microsoft-testing-platform-intro?tabs=dotnetcli) when available for newer projects.
 - Supports all testing frameworks.
 - DAP strategy for attaching debug adapter to test execution.
 - Supports `C#` and `F#`.
+- No external dependencies, only the `dotnet sdk` required.
 - Can run tests on many groupings including:
   - All tests
   - Test projects

lua/neotest-vstest/client.lua

@@ -0,0 +1,153 @@
+local nio = require("nio")
+local lib = require("neotest.lib")
+local logger = require("neotest.logging")
+local dotnet_utils = require("neotest-vstest.dotnet_utils")
+local vstest = require("neotest-vstest.vstest")
+local cli_wrapper = require("neotest-vstest.vstest.cli_wrapper")
+local files = require("neotest-vstest.files")
+local utilities = require("neotest-vstest.utilities")
+
+local Client = {}
+Client.__index = Client
+
+---@param project DotnetProjectInfo
+function Client:new(project)
+  local client = {
+    project = project,
+    test_cases = {},
+    last_discovered = 0,
+    semaphore = nio.control.semaphore(1),
+  }
+  setmetatable(client, self)
+  return client
+end
+
+function Client:discover_tests(path)
+  self.semaphore.with(function()
+    local last_modified
+    if path then
+      last_modified = files.get_path_last_modified(path)
+    else
+      last_modified = dotnet_utils.get_project_last_modified(self.project)
+    end
+    if last_modified and last_modified > self.last_discovered then
+      logger.debug(
+        "neotest-vstest: Discovering tests: "
+          .. " last modified at "
+          .. last_modified
+          .. " last discovered at "
+          .. self.last_discovered
+      )
+      dotnet_utils.build_project(self.project)
+      last_modified = dotnet_utils.get_project_last_modified(self.project)
+      self.last_discovered = last_modified or 0
+      self.test_cases = vstest.discover_tests_in_project(self.project) or {}
+    end
+  end)
+
+  return self.test_cases
+end
+
+function Client:discover_tests_for_path(path)
+  self:discover_tests(path)
+  return self.test_cases[path]
+end
+
+---@async
+---@param ids string[] list of test ids to run
+---@return neotest-vstest.Client.RunResult
+function Client:run_tests(ids)
+  local result_future = nio.control.future()
+  local process_output_file, stream_file, result_file = vstest.run_tests(self.project, ids)
+
+  local result_stream_data, result_stop_stream = lib.files.stream_lines(stream_file)
+  local output_stream_data, output_stop_stream = lib.files.stream_lines(process_output_file)
+
+  local result_stream = utilities.stream_queue()
+
+  nio.run(function()
+    local stream = result_stream_data()
+    for _, line in ipairs(stream) do
+      local success, result = pcall(vim.json.decode, line)
+      assert(success, "neotest-vstest: failed to decode result stream: " .. line)
+      result_stream.write(result)
+    end
+  end)
+
+  local stop_stream = function()
+    output_stop_stream()
+    result_stop_stream()
+  end
+
+  nio.run(function()
+    cli_wrapper.spin_lock_wait_file(result_file, 5 * 30 * 1000)
+    local parsed = {}
+    local results = lib.files.read_lines(result_file)
+    for _, line in ipairs(results) do
+      local success, result = pcall(vim.json.decode, line)
+      assert(success, "neotest-vstest: failed to decode result file: " .. line)
+      parsed[result.id] = result.result
+    end
+    result_future.set(parsed)
+  end)
+
+  return {
+    result_future = result_future,
+    result_stream = result_stream.get,
+    output_stream = output_stream_data,
+    stop = stop_stream,
+  }
+end
+
+---@async
+---@param ids string[] list of test ids to run
+---@return neotest-vstest.Client.RunResult
+function Client:debug_tests(ids)
+  local result_future = nio.control.future()
+  local pid, on_attach, process_output_file, stream_file, result_file =
+    vstest.debug_tests(self.project, ids)
+
+  local result_stream_data, result_stop_stream = lib.files.stream_lines(stream_file)
+  local output_stream_data, output_stop_stream = lib.files.stream_lines(process_output_file)
+
+  local result_stream = utilities.stream_queue()
+
+  nio.run(function()
+    local stream = result_stream_data()
+    for _, line in ipairs(stream) do
+      local success, result = pcall(vim.json.decode, line)
+      assert(success, "neotest-vstest: failed to decode result stream: " .. line)
+      result_stream.write(result)
+    end
+  end)
+
+  local stop_stream = function()
+    output_stop_stream()
+    result_stop_stream()
+  end
+
+  nio.run(function()
+    cli_wrapper.spin_lock_wait_file(result_file, 5 * 30 * 1000)
+    local parsed = {}
+    local results = lib.files.read_lines(result_file)
+    for _, line in ipairs(results) do
+      local success, result = pcall(vim.json.decode, line)
+      assert(success, "neotest-vstest: failed to decode result file: " .. line)
+      parsed[result.id] = result.result
+    end
+    result_future.set(parsed)
+  end)
+
+  assert(pid, "neotest-vstest: failed to get pid from debug tests")
+
+  return {
+    pid = pid,
+    on_attach = on_attach,
+    result_future = result_future,
+    output_stream = output_stream_data,
+    result_stream = result_stream.get,
+    stop = stop_stream,
+  }
+end
+
+return Client

lua/neotest-vstest/dotnet_utils.lua

@@ -102,6 +102,7 @@ end
 ---@field dll_file string
 ---@field proj_dir string
 ---@field is_test_project boolean
+---@field is_mtp_project boolean is project compiler use Microsoft.Testting.Platform
 
 ---@type table<string, DotnetProjectInfo>
 local proj_info_cache = {}
@@ -147,6 +148,10 @@ function M.get_proj_info(path)
 
   local semaphore
 
+  if not proj_file then
+    return nil
+  end
+
   if project_semaphore[proj_file] then
     semaphore = project_semaphore[proj_file]
   else
@@ -178,6 +183,7 @@ function M.get_proj_info(path)
     "-getProperty:TargetPath",
     "-getProperty:MSBuildProjectDirectory",
     "-getProperty:IsTestProject",
+    "-getProperty:IsTestingPlatformApplication",
     "-property:TargetFramework=" .. target_framework,
   }
 
@@ -197,6 +203,7 @@ function M.get_proj_info(path)
     dll_file = properties.TargetPath,
     proj_dir = properties.MSBuildProjectDirectory,
     is_test_project = properties.IsTestProject == "true",
+    is_mtp_project = properties.IsTestingPlatformApplication == "true",
   }
 
   if proj_data.dll_file == "" then
@@ -212,7 +219,12 @@ function M.get_proj_info(path)
   end
 
   semaphore.release()
-  return proj_data
+  return (
+    proj_data.dll_file ~= ""
+    and proj_data.proj_file ~= ""
+    and (proj_data.is_test_project or proj_data.is_mtp_project)
+    and proj_data
+  ) or nil
 end
 
 local solution_discovery_semaphore = nio.control.semaphore(1)