Added an endpoint to list the available test run configurations

VirtusLab · Nov 16, 2020 · e1ef66b · e1ef66b
1 parent 8cd7064
commit e1ef66b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/api/src/main/scala/org/virtuslab/ideprobe/protocol/Endpoints.scala b/api/src/main/scala/org/virtuslab/ideprobe/protocol/Endpoints.scala
@@ -25,6 +25,7 @@ object Endpoints {
   val RunApp = Request[ApplicationRunConfiguration, ProcessResult]("run/application")
   val RunJUnit = Request[TestScope, TestsRunResult]("run/junit")
   val RunTestsFromGenerated = Request[(TestScope, Option[String]), TestsRunResult]("run/test")
+  val TestConfigurations = Request[TestScope, Seq[String]]("run/testConfigurations")
   val RerunFailedTests = Request[ProjectRef, TestsRunResult]("run/failedTests")
   val Shutdown = Notification[Unit]("shutdown")
   val SyncFiles = Request[Unit, Unit]("fs/sync")

diff --git a/driver/sources/src/main/scala/org/virtuslab/ideprobe/ProbeDriver.scala b/driver/sources/src/main/scala/org/virtuslab/ideprobe/ProbeDriver.scala
@@ -209,6 +209,12 @@ class ProbeDriver(
    */
   def freezes: Seq[Freeze] = send(Endpoints.Freezes)
 
+  /**
+   * Returns the list of test configuration names that are available for the given scope
+   */
+  def testConfigurations(testScope: TestScope): Seq[String] =
+    send(Endpoints.TestConfigurations, testScope)
+
   /**
    * Runs the specified test configuration with the first available test runner
    */
@@ -222,6 +228,10 @@ class ProbeDriver(
     runTestsFromGenerated(runConfiguration, runnerToSelect = Some(runnerToSelect))
   }
 
+  /**
+   * Runs the specified test configuration with a test runner containing provided `runnerToSelect` substring,
+   * or the first available test runner if `runnerToSelect` is `None`
+   */
   def runTestsFromGenerated(runConfiguration: TestScope, runnerToSelect: Option[String]): TestsRunResult = {
     send(Endpoints.RunTestsFromGenerated, (runConfiguration, runnerToSelect))
   }

diff --git a/probePlugin/src/main/scala/org/virtuslab/ideprobe/BaseProbeHandlerContributor.scala b/probePlugin/src/main/scala/org/virtuslab/ideprobe/BaseProbeHandlerContributor.scala
@@ -38,6 +38,7 @@ class BaseProbeHandlerContributor extends ProbeHandlerContributor {
       .on(Endpoints.RunApp)(RunConfigurations.runApp)
       .on(Endpoints.RunJUnit)(RunConfigurations.runJUnit)
       .on(Endpoints.RerunFailedTests)(RunConfigurations.rerunFailedTests)
+      .on(Endpoints.TestConfigurations)(RunConfigurations.testConfigurations)
       .on(Endpoints.RunTestsFromGenerated)((RunConfigurations.runTestsFromGenerated _).tupled)
       .on(Endpoints.TakeScreenshot)(Screenshot.take)
       .on(Endpoints.RunLocalInspection)(Inspections.runLocal)

diff --git a/probePlugin/src/main/scala/org/virtuslab/ideprobe/handlers/RunConfigurations.scala b/probePlugin/src/main/scala/org/virtuslab/ideprobe/handlers/RunConfigurations.scala
@@ -33,6 +33,13 @@ object RunConfigurations extends IntelliJApi {
     ExecutionManager.getInstance(project).restartRunProfile(environment)
   }
 
+  def testConfigurations(
+    scope: TestScope
+  )(implicit ec: ExecutionContext): Seq[String] = {
+    val configurations = availableRunConfigurations(scope)
+    configurations.map(_.getConfigurationSettings.getName)
+  }
+
   def runTestsFromGenerated(
       scope: TestScope,
       runnerToSelect: Option[String]