Skip to content
This repository was archived by the owner on Nov 30, 2025. It is now read-only.

Commit 7736cbf

Browse files
s1n7axs1n7ax
committed
refactor: test apis to accept a dap runner
1 parent a1c750e commit 7736cbf

6 files changed

Lines changed: 19 additions & 76 deletions

File tree

‎lua/java-core/adapters/init.lua‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
local jdtls_types = require('java-core.ls.servers.jdtls.jdtls-types')
2-
31
local List = require('java-core.utils.list')
42
local Set = require('java-core.utils.set')
53
local JavaTestClient = require('java-core.ls.clients.java-test-client')
@@ -10,7 +8,7 @@ local M = {}
108
---@param launch_args JavaCoreTestJunitLaunchArguments
119
---@param java_exec string
1210
---@param config { debug: boolean, label: string }
13-
---@return JavaCoreDapLauncherConfig
11+
---@return java_core.DapLauncherConfig
1412
function M.get_dap_launcher_config(launch_args, java_exec, config)
1513
return {
1614
name = config.label,

‎lua/java-core/api/test.lua‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
local log = require('java-core.utils.log')
22
local data_adapters = require('java-core.adapters')
33

4-
local TestReport = require('java-core.dap.test-report')
5-
local JavaDapRunner = require('java-core.dap.runner')
64
local JavaDebug = require('java-core.ls.clients.java-debug-client')
75
local JavaTest = require('java-core.ls.clients.java-test-client')
86

9-
---@class JavaCoreTestApi
7+
---@class java_core.TestApi
108
---@field private client java_core.JdtlsClient
119
---@field private debug_client JavaCoreDebugClient
1210
---@field private test_client java_core.TestClient
13-
---@field private runner JavaCoreDapRunner
11+
---@field private runner java_core.DapRunner
1412
local M = {}
1513

1614
---Returns a new test helper client
17-
---@param args { client: LspClient }
18-
---@return JavaCoreTestApi
15+
---@param args { client: LspClient, runner: java_core.DapRunner }
16+
---@return java_core.TestApi
1917
function M:new(args)
2018
local o = {
2119
client = args.client,
@@ -29,9 +27,7 @@ function M:new(args)
2927
client = args.client,
3028
})
3129

32-
o.runner = JavaDapRunner:new({
33-
reporter = TestReport:new(),
34-
})
30+
o.runner = args.runner
3531

3632
setmetatable(o, self)
3733
self.__index = self
@@ -80,7 +76,6 @@ end
8076
---@param tests java_core.TestDetails[]
8177
---@param config? JavaCoreDapLauncherConfigOverridable config to override the default values in test launcher config
8278
function M:run_test(tests, config)
83-
---@type JavaCoreTestJunitLaunchArguments
8479
local launch_args = self.test_client:resolve_junit_launch_arguments(
8580
data_adapters.get_junit_launch_argument_params(tests)
8681
)

‎lua/java-core/dap/adapters.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ local M = {}
44
---@param main JavaDebugResolveMainClassRecord
55
---@param classpath string[][]
66
---@param java_exec string
7-
---@return JavaCoreDapLauncherConfig
7+
---@return java_core.DapLauncherConfig
88
function M.get_dap_config(main, classpath, java_exec)
99
local project_name = main.projectName
1010
local main_class = main.mainClass

‎lua/java-core/dap/init.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function M:get_dap_adapter()
4444
end
4545

4646
---Returns the dap configuration for the current project
47-
---@return JavaCoreDapLauncherConfig[] # dap configuration details
47+
---@return java_core.DapLauncherConfig[] # dap configuration details
4848
function M:get_dap_config()
4949
log.info('creating dap configuration for java')
5050

@@ -60,7 +60,7 @@ end
6060

6161
---Returns the dap config for the given main class
6262
---@param main JavaDebugResolveMainClassRecord
63-
---@return JavaCoreDapLauncherConfig # dap launch configuration record
63+
---@return java_core.DapLauncherConfig # dap launch configuration record
6464
function M:get_dap_config_record(main)
6565
local classpaths =
6666
self.java_debug:resolve_classpath(main.mainClass, main.projectName)
@@ -92,7 +92,7 @@ return M
9292
---@field preLaunchTask? string
9393
---@field postDebugTask? string
9494

95-
---@class JavaCoreDapLauncherConfig
95+
---@class java_core.DapLauncherConfig
9696
---@field name string
9797
---@field type string
9898
---@field request string

‎lua/java-core/dap/runner.lua‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
local log = require('java-core.utils.log')
22

3-
---@class JavaCoreDapRunner
4-
---@field reporter JavaCoreDapRunReport
3+
---@class java_core.DapRunner
4+
---@field reporter java_core.DapRunReport
55
---@field private server uv_tcp_t
66
local M = {}
77

8-
---@param args { reporter: JavaCoreDapRunReport }
9-
---@return JavaCoreDapRunner
8+
---@param args { reporter: java_core.DapRunReport }
9+
---@return java_core.DapRunner
1010
function M:new(args)
1111
local o = {
1212
reporter = args.reporter,
@@ -19,7 +19,7 @@ function M:new(args)
1919
end
2020

2121
---Dap run with given config
22-
---@param config JavaCoreDapLauncherConfig
22+
---@param config java_core.DapLauncherConfig
2323
function M:run_by_config(config)
2424
log.debug('running dap with config: ', config)
2525

@@ -36,8 +36,8 @@ end
3636

3737
---Runs before the dap run
3838
---@private
39-
---@param conf JavaCoreDapLauncherConfig
40-
---@return JavaCoreDapLauncherConfig
39+
---@param conf java_core.DapLauncherConfig
40+
---@return java_core.DapLauncherConfig
4141
function M:before(conf)
4242
log.debug('running "before" callback')
4343

@@ -72,5 +72,5 @@ end
7272

7373
return M
7474

75-
---@class JavaCoreDapRunReport
76-
---@field get_stream_reader fun(self: JavaCoreDapRunReport, conn: uv_tcp_t): fun(err: string|nil, buffer: string|nil)
75+
---@class java_core.DapRunReport
76+
---@field get_stream_reader fun(self: java_core.DapRunReport, conn: uv_tcp_t): fun(err: string|nil, buffer: string|nil)

‎lua/java-core/dap/test-report.lua‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)