Fix private methods and synchronize stop event

Author: fwcd

adapter/src/test/kotlin/org/javacs/ktda/DebugAdapterTestFixture.kt

@@ -5,18 +5,21 @@ import java.nio.file.Paths
 import org.eclipse.lsp4j.debug.DisconnectArguments
 import org.javacs.ktda.adapter.KotlinDebugAdapter
 import org.javacs.ktda.jdi.launch.JDILauncher
-import org.junit.AfterClass
+import org.junit.After
 
-abstract class DebugAdapterTestFixture(relativeWorkspaceRoot: String) {
+abstract class DebugAdapterTestFixture(relativeWorkspaceRoot: String, mainClass: String) {
     val absoluteWorkspaceRoot: Path = Paths.get(DebugAdapterTestFixture::class.java.getResource("/").toURI()).resolve(relativeWorkspaceRoot)
     val debugAdapter: KotlinDebugAdapter = JDILauncher()
         .let(::KotlinDebugAdapter)
-        .also { it.launch(mapOf(
+    
+    fun launch() {
+        debugAdapter.launch(mapOf(
             "projectRoot" to absoluteWorkspaceRoot.toString(),
             "mainClass" to "sample.workspace.AppKt"
-        )) }
+        ))
+    }
 
-    @AfterClass private fun closeDebugAdapter() {
+    @After fun closeDebugAdapter() {
         debugAdapter.disconnect(DisconnectArguments()).join()
     }
 }

adapter/src/test/kotlin/org/javacs/ktda/SampleWorkspaceTest.kt

@@ -13,13 +13,16 @@ import org.junit.Assert.assertThat
 import org.junit.Test
 import org.hamcrest.Matchers.contains
 import org.hamcrest.Matchers.equalTo
+import java.util.concurrent.Semaphore
 
 /**
  * Tests a very basic debugging scenario
  * using a sample application.
  */
-class SampleWorkspaceTest : DebugAdapterTestFixture("sample-workspace") {
-    @Test private fun testBreakpointsAndVariables() {
+class SampleWorkspaceTest : DebugAdapterTestFixture("sample-workspace", "sample.workspace.AppKt") {
+    @Test fun testBreakpointsAndVariables() {
+        val semaphore = Semaphore(0)
+
         debugAdapter.connect(object : IDebugProtocolClient {
             override fun stopped(args: StoppedEventArguments) {
                 assertThat(args.reason, equalTo("breakpoint"))
@@ -41,6 +44,7 @@ class SampleWorkspaceTest : DebugAdapterTestFixture("sample-workspace") {
                     Pair("member", "\"test\""),
                     Pair("local", "123")
                 ))
+                semaphore.release()
             }
         })
         debugAdapter.setBreakpoints(SetBreakpointsArguments().apply {
@@ -58,5 +62,7 @@ class SampleWorkspaceTest : DebugAdapterTestFixture("sample-workspace") {
                 line = 8
             })
         })
+        launch()
+        semaphore.acquire() // Wait for the end
     }
 }