Skip to content

Commit

Permalink
Enable Scala 2.13.0 in the linker and all the other artifacts.
Browse files Browse the repository at this point in the history
Partest is not yet enabled in this commit, because a dependency of
`partest` 2.13.0, namely `testkit`, was not published. See
scala/bug#11529 upstream.
  • Loading branch information
sjrd committed Jun 20, 2019
1 parent f62ad29 commit fa94b39
Showing 1 changed file with 8 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ package org.scalajs.jsenv.test

import org.scalajs.jsenv.JSEnv

import scala.collection.JavaConverters._
import scala.reflect.ClassTag

import org.junit.runner.Runner
Expand All @@ -40,7 +39,7 @@ abstract class JSEnvSuite(private[test] val config: JSEnvSuiteConfig)

/** Runner for a [[JSEnvSuite]]. May only be used on subclasses of [[JSEnvSuite]]. */
final class JSEnvSuiteRunner(root: Class[_], config: JSEnvSuiteConfig)
extends Suite(root, JSEnvSuiteRunner.getRunners(config).asJava) {
extends Suite(root, JSEnvSuiteRunner.getRunners(config)) {

/** Constructor for reflective instantiation via `@RunWith`. */
def this(suite: Class[_ <: JSEnvSuite]) =
Expand All @@ -56,16 +55,19 @@ private object JSEnvSuiteRunner {
.map { case (name, value) => s"$name = $value" }
.mkString("[", ", ", "]")

val paramValues = config +: params.map(_._2)
val paramValues = new java.util.LinkedList[AnyRef]
paramValues.add(config)
for (param <- params)
paramValues.add(param._2)

new BlockJUnit4ClassRunnerWithParameters(
new TestWithParameters(name, new TestClass(t.runtimeClass), paramValues.asJava))
new TestWithParameters(name, new TestClass(t.runtimeClass), paramValues))
}

private def getRunners(config: JSEnvSuiteConfig): List[Runner] = {
private def getRunners(config: JSEnvSuiteConfig): java.util.List[Runner] = {
import java.lang.Boolean.{TRUE, FALSE}

List(
java.util.Arrays.asList(
r[RunTests](config, "withCom" -> FALSE),
r[RunTests](config, "withCom" -> TRUE),
r[TimeoutRunTests](config, "withCom" -> FALSE),
Expand Down

0 comments on commit fa94b39

Please sign in to comment.