Merge pull request #545 from adpi2/fix-main-class-in-test

[sbt plugin] Fix debug main class in test scope
scalacenter · Aug 2, 2023 · da6456a · da6456a
2 parents 7e00298 + fbf740b
commit da6456a
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,12 +26,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
-        jvm: ['adoptium:1.8.0-372', 'adoptium:1.11.0.19', 'adoptium:1.17.0.7']
         include:
+          - os: ubuntu-latest
+            jvm: 'adoptium:1.8.0-372'
+          - os: window-latest
+            jvm: 'adoptium:1.11.0.19'
+          - os: macOS-latest
+            jvm: 'adoptium:1.17.0.7'
           - os: ubuntu-latest
             jvm: 'adoptium:1.20.0.1'
-    name: Test on ${{ matrix.os }} -- ${{ matrix.jvm }}
+    name: Unit Tests on ${{ matrix.os }} -- ${{ matrix.jvm }}
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -44,7 +48,27 @@ jobs:
     - name: Unit tests
       run: sbt test
       shell: bash
-    - name: Scripted sbt tests
+  scripted-test:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: windows-latest
+            jvm: 'adoptium:1.8.0-372'
+          - os: unbutu-latest
+            jvm: 'adoptium:1.11.0.19'
+          - os: macOS-latest
+            jvm: 'adoptium:1.17.0.7'
+    name: Scripted Tests on ${{ matrix.os }} -- ${{ matrix.jvm }}
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+    - uses: coursier/setup-action@v1.3.3
+      with:
+        jvm: ${{ matrix.jvm }}
+        apps: sbt
+    - name: Scripted tests
       run: sbt sbtPlugin/scripted
       shell: bash
-      if: ${{ matrix.jvm != 'adoptium:1.20.0.1' && (matrix.jvm != 'adoptium:1.17.0.7' || matrix.os != 'windows-latest' ) }}
diff --git a/build.sbt b/build.sbt
@@ -148,7 +148,7 @@ lazy val sbtPlugin = project
     scriptedLaunchOpts += s"-Dplugin.version=${version.value}",
     scriptedBufferLog := false,
     scriptedDependencies := scriptedDependencies
-      .dependsOn(publishLocal, core212 / publishLocal, tests212 / publishLocal)
+      .dependsOn(publishLocal, core212 / publishLocal, tests212 / publishLocal, expressionCompiler212 / publishLocal)
       .value
   )
   .dependsOn(core212)

diff --git a/...s/sbt-plugin/src/main/scala/ch/epfl/scala/debugadapter/sbtplugin/DebugAdapterPlugin.scala b/...s/sbt-plugin/src/main/scala/ch/epfl/scala/debugadapter/sbtplugin/DebugAdapterPlugin.scala
@@ -123,6 +123,7 @@ object DebugAdapterPlugin extends sbt.AutoPlugin {
    * }}}
    */
   def testSettings: Seq[Def.Setting[_]] = Seq(
+    startMainClassDebugSession := mainClassSessionTask.evaluated,
     startTestSuitesDebugSession := testSuitesSessionTask(convertFromArrayToTestSuites).evaluated,
     startTestSuitesSelectionDebugSession := testSuitesSessionTask(convertToTestSuites).evaluated,
     startRemoteDebugSession := remoteSessionTask.evaluated,

diff --git a/modules/sbt-plugin/src/sbt-test/debug-session/test-main-class/build.sbt b/modules/sbt-plugin/src/sbt-test/debug-session/test-main-class/build.sbt
@@ -0,0 +1,10 @@
+import ch.epfl.scala.debugadapter.testfmk._
+
+val checkDebugSession = inputKey[Unit]("Check the main class debug session")
+
+scalaVersion := "2.12.14"
+checkDebugSession := {
+  val uri = (Test / startMainClassDebugSession).evaluated
+  val source = (Test / sources).value.head.toPath
+  DebugTest.check(uri)(Breakpoint(source, 5))
+}
diff --git a/modules/sbt-plugin/src/sbt-test/debug-session/test-main-class/project/plugins.sbt b/modules/sbt-plugin/src/sbt-test/debug-session/test-main-class/project/plugins.sbt
@@ -0,0 +1,12 @@
+val pluginVersion = sys.props
+  .get("plugin.version")
+  .getOrElse {
+    sys.error(
+      """|The system property 'plugin.version' is not defined.
+         |Specify this property using the scriptedLaunchOpts -D.
+         |""".stripMargin
+    )
+  }
+
+addSbtPlugin("ch.epfl.scala" % "sbt-debug-adapter" % pluginVersion)
+libraryDependencies += "ch.epfl.scala" %% "scala-debug-adapter-test" % pluginVersion
diff --git a/modules/sbt-plugin/src/sbt-test/debug-session/test-main-class/project/project/plugins.sbt b/modules/sbt-plugin/src/sbt-test/debug-session/test-main-class/project/project/plugins.sbt
@@ -0,0 +1,2 @@
+// required for adopt@1.8
+addSbtPlugin("org.scala-debugger" % "sbt-jdi-tools" % "1.1.1")
diff --git a/...s/sbt-plugin/src/sbt-test/debug-session/test-main-class/src/test/scala/example/Main.scala b/...s/sbt-plugin/src/sbt-test/debug-session/test-main-class/src/test/scala/example/Main.scala
@@ -0,0 +1,7 @@
+package example
+
+object Main {
+  def main(args: Array[String]): Unit = {
+    println("Hello, World!")
+  }
+}
diff --git a/modules/sbt-plugin/src/sbt-test/debug-session/test-main-class/test b/modules/sbt-plugin/src/sbt-test/debug-session/test-main-class/test
@@ -0,0 +1,2 @@
+> 'checkDebugSession {"class":"example.Main","arguments":[],"jvmOptions":[]}'
+> stopDebugSession