Factor launcher option handling in tests

modules/cli-tests/src/main/scala/coursier/clitests/BootstrapTests.scala

@@ -17,12 +17,10 @@ import coursier.clitests.util.TestAuthProxy
 import coursier.dependencyString
 import utest._
 
-abstract class BootstrapTests extends TestSuite {
+abstract class BootstrapTests extends TestSuite with LauncherOptions {
 
   def launcher: String
   def assembly: String
-  def acceptsDOptions: Boolean = true
-  def acceptsJOptions: Boolean = true
 
   def overrideProguarded: Option[Boolean] =
     None

modules/cli-tests/src/main/scala/coursier/clitests/LauncherOptions.scala

@@ -0,0 +1,6 @@
+package coursier.clitests
+
+trait LauncherOptions {
+  def acceptsDOptions: Boolean
+  def acceptsJOptions: Boolean
+}

modules/cli-tests/src/main/scala/coursier/clitests/Run.scala

@@ -42,10 +42,16 @@ object Run extends CaseApp[RunOptions] {
 
     val launchTests = new LaunchTests {
       val launcher = options.launcher
+
+      def acceptsDOptions = true
+      def acceptsJOptions = true
     }
     val bootstrapTests = new BootstrapTests {
       val launcher = options.launcher
       val assembly = options.assembly
+
+      def acceptsDOptions = true
+      def acceptsJOptions = true
     }
     val fetchTests = new FetchTests {
       val launcher = options.launcher

modules/cli-tests/src/test/scala/coursier/clitests/PackBootstrapTests.scala

@@ -1,30 +1,10 @@
 package coursier.clitests
 
-import java.util.Locale
-
 import scala.util.Properties
 
-object PackBootstrapTests extends BootstrapTests {
+object PackBootstrapTests extends BootstrapTests with PackLauncherOptions {
   val launcher = LauncherTestUtil.launcher
   val assembly = LauncherTestUtil.assembly
-  override lazy val acceptsDOptions =
-    sys.props.get("coursier-test-launcher-accepts-D").map(_.toLowerCase(Locale.ROOT)) match {
-      case Some("true")  => true
-      case Some("false") => false
-      case None          => true
-      case Some(other) =>
-        System.err.println(s"Warning: unrecognized coursier-test-launcher-accepts-D value '$other'")
-        true
-    }
-  override lazy val acceptsJOptions =
-    sys.props.get("coursier-test-launcher-accepts-J").map(_.toLowerCase(Locale.ROOT)) match {
-      case Some("true")  => true
-      case Some("false") => false
-      case None          => !Properties.isWin
-      case Some(other) =>
-        System.err.println(s"Warning: unrecognized coursier-test-launcher-accepts-J value '$other'")
-        true
-    }
   override lazy val overrideProguarded: Option[Boolean] =
     if (sys.props.get("java.version").exists(!_.startsWith("1.")))
       // It seems bootstrap JARs built on Java 11 fail at runtime with some obscure

modules/cli-tests/src/test/scala/coursier/clitests/PackLauncherOptions.scala

@@ -0,0 +1,26 @@
+package coursier.clitests
+
+import java.util.Locale
+
+import scala.util.Properties
+
+trait PackLauncherOptions extends LauncherOptions {
+  override lazy val acceptsDOptions =
+    sys.props.get("coursier-test-launcher-accepts-D").map(_.toLowerCase(Locale.ROOT)) match {
+      case Some("true")  => true
+      case Some("false") => false
+      case None          => true
+      case Some(other) =>
+        System.err.println(s"Warning: unrecognized coursier-test-launcher-accepts-D value '$other'")
+        true
+    }
+  override lazy val acceptsJOptions =
+    sys.props.get("coursier-test-launcher-accepts-J").map(_.toLowerCase(Locale.ROOT)) match {
+      case Some("true")  => true
+      case Some("false") => false
+      case None          => !Properties.isWin
+      case Some(other) =>
+        System.err.println(s"Warning: unrecognized coursier-test-launcher-accepts-J value '$other'")
+        true
+    }
+}