11local log = require (' java-core.utils.log' )
22local data_adapters = require (' java-core.adapters' )
33
4- local JavaDebug = require (' java-core.ls.clients.java-debug-client' )
5- local JavaTest = require (' java-core.ls.clients.java-test-client' )
4+ local DebugClient = require (' java-core.ls.clients.java-debug-client' )
5+ local TestClient = require (' java-core.ls.clients.java-test-client' )
66
77--- @class java_core.TestApi
8- --- @field private client java_core .JdtlsClient
9- --- @field private debug_client JavaCoreDebugClient
10- --- @field private test_client java_core .TestClient
11- --- @field private runner java_core .DapRunner
8+ --- @field private client java-core .JdtlsClient
9+ --- @field private debug_client java-core.DebugClient
10+ --- @field private test_client java-core .TestClient
11+ --- @field private runner java-dap .DapRunner
1212local M = {}
1313
1414--- Returns a new test helper client
15- --- @param args { client : LspClient , runner : java_core .DapRunner }
15+ --- @param args { client : LspClient , runner : java-dap .DapRunner }
1616--- @return java_core.TestApi
1717function M :new (args )
1818 local o = {
1919 client = args .client ,
2020 }
2121
22- o .debug_client = JavaDebug :new ({
23- client = args .client ,
24- })
25-
26- o .test_client = JavaTest :new ({
27- client = args .client ,
28- })
29-
22+ o .debug_client = DebugClient (args .client )
23+ o .test_client = TestClient (args .client )
3024 o .runner = args .runner
3125
3226 setmetatable (o , self )
3731
3832--- Returns a list of test methods
3933--- @param file_uri string uri of the class
40- --- @return java_core .TestDetailsWithRange[] # list of test methods
34+ --- @return java-core .TestDetailsWithRange[] # list of test methods
4135function M :get_test_methods (file_uri )
4236 local classes = self .test_client :find_test_types_and_methods (file_uri )
4337 local methods = {}
@@ -53,14 +47,10 @@ function M:get_test_methods(file_uri)
5347 return methods
5448end
5549
56- --- Runs the test class in the given buffer
57- --- @param buffer integer
58- --- @param config JavaCoreDapLauncherConfigOverridable
59-
6050--- comment
6151--- @param buffer number
6252--- @param report java_test.JUnitTestReport
63- --- @param config ? JavaCoreDapLauncherConfigOverridable config to override the default values in test launcher config
53+ --- @param config ? java-dap.DapLauncherConfigOverridable config to override the default values in test launcher config
6454function M :run_class_by_buffer (buffer , report , config )
6555 local tests = self :get_test_class_by_buffer (buffer )
6656 self :run_test (tests , report , config )
6959--- Returns test classes in the given buffer
7060--- @priate
7161--- @param buffer integer
72- --- @return java_core .TestDetailsWithChildrenAndRange # get test class details
62+ --- @return java-core .TestDetailsWithChildrenAndRange # get test class details
7363function M :get_test_class_by_buffer (buffer )
7464 log .debug (' finding test class by buffer' )
7565
@@ -78,9 +68,9 @@ function M:get_test_class_by_buffer(buffer)
7868end
7969
8070--- Run the given test
81- --- @param tests java_core .TestDetails[]
71+ --- @param tests java-core .TestDetails[]
8272--- @param report java_test.JUnitTestReport
83- --- @param config ? JavaCoreDapLauncherConfigOverridable config to override the default values in test launcher config
73+ --- @param config ? java-dap.DapLauncherConfigOverridable config to override the default values in test launcher config
8474function M :run_test (tests , report , config )
8575 local launch_args = self .test_client :resolve_junit_launch_arguments (
8676 data_adapters .get_junit_launch_argument_params (tests )
0 commit comments