Skip to content

Fixed TestScalaJSModule.testCached #796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 22, 2020
Merged

Fixed TestScalaJSModule.testCached #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6ebf5b
Fixed TestScalaJSModule.testCached
lefou Mar 20, 2020
d52dd09
keep protected visibility
lefou Mar 20, 2020
0703434
Added test case to test ScalaJS testCached
lefou Mar 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions scalajslib/src/ScalaJSModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import mill.scalalib.Lib.resolveDependencies
import mill.scalalib.{DepSyntax, Lib, TestModule, TestRunner}
import mill.util.Ctx
import mill.api.Loose
import mill.define.Task
import mill.scalajslib.api._
trait ScalaJSModule extends scalalib.ScalaModule { outer =>

Expand Down Expand Up @@ -202,22 +203,22 @@ trait TestScalaJSModule extends ScalaJSModule with TestModule {

override def testLocal(args: String*) = T.command { test(args:_*) }

override def test(args: String*) = T.command {
override protected def testTask(args: Task[Seq[String]]): Task[(String, Seq[TestRunner.Result])] = T.task {
val (close, framework) = mill.scalajslib.ScalaJSWorkerApi.scalaJSWorker().getFramework(
toolsClasspath().map(_.path),
jsEnvConfig(),
testFrameworks().head,
fastOptTest().path.toIO,
moduleKind()
)
toolsClasspath().map(_.path),
jsEnvConfig(),
testFrameworks().head,
fastOptTest().path.toIO,
moduleKind()
)

val (doneMsg, results) = TestRunner.runTests(
_ => Seq(framework),
runClasspath().map(_.path),
Agg(compile().classes.path),
args,
T.testReporter
)
_ => Seq(framework),
runClasspath().map(_.path),
Agg(compile().classes.path),
args(),
T.testReporter
)
val res = TestModule.handleResults(doneMsg, results)
// Hack to try and let the Node.js subprocess finish streaming it's stdout
// to the JVM. Without this, the stdout can still be streaming when `close()`
Expand Down
113 changes: 71 additions & 42 deletions scalajslib/test/src/HelloJSWorldTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,68 +150,97 @@ object HelloJSWorldTests extends TestSuite {
'artifactId_100RC1 - testArtifactId("2.12.4", "1.0.0-RC1", "hello-js-world_sjs1.0-RC1_2.12")
'artifactId_100 - testArtifactId("2.12.4", "1.0.0", "hello-js-world_sjs1_2.12")
}
'test - {
def runTests(testTask: define.Command[(String, Seq[TestRunner.Result])]): Map[String, Map[String, TestRunner.Result]] = {
val Left(Result.Failure(_, Some(res))) = helloWorldEvaluator(testTask)

val (doneMsg, testResults) = res
testResults
.groupBy(_.fullyQualifiedName)
.mapValues(_.map(e => e.selector -> e).toMap)
}
def runTests(testTask: define.NamedTask[(String, Seq[TestRunner.Result])]): Map[String, Map[String, TestRunner.Result]] = {
val Left(Result.Failure(_, Some(res))) = helloWorldEvaluator(testTask)

def checkUtest(scalaVersion: String, scalaJSVersion: String) = {
val resultMap = runTests(HelloJSWorld.buildUTest(scalaVersion, scalaJSVersion).test.test())
val (doneMsg, testResults) = res
testResults
.groupBy(_.fullyQualifiedName)
.mapValues(_.map(e => e.selector -> e).toMap)
}

val mainTests = resultMap("MainTests")
val argParserTests = resultMap("ArgsParserTests")
def checkUtest(scalaVersion: String, scalaJSVersion: String, cached: Boolean) = {
val resultMap = runTests(
if(!cached) HelloJSWorld.buildUTest(scalaVersion, scalaJSVersion).test.test()
else HelloJSWorld.buildUTest(scalaVersion, scalaJSVersion).test.testCached
)

assert(
mainTests.size == 2,
mainTests("MainTests.vmName.containJs").status == "Success",
mainTests("MainTests.vmName.containScala").status == "Success",
val mainTests = resultMap("MainTests")
val argParserTests = resultMap("ArgsParserTests")

argParserTests.size == 2,
argParserTests("ArgsParserTests.one").status == "Success",
argParserTests("ArgsParserTests.two").status == "Failure"
)
}
assert(
mainTests.size == 2,
mainTests("MainTests.vmName.containJs").status == "Success",
mainTests("MainTests.vmName.containScala").status == "Success",

def checkScalaTest(scalaVersion: String, scalaJSVersion: String) = {
val resultMap = runTests(HelloJSWorld.buildScalaTest(scalaVersion, scalaJSVersion).test.test())
argParserTests.size == 2,
argParserTests("ArgsParserTests.one").status == "Success",
argParserTests("ArgsParserTests.two").status == "Failure"
)
}

val mainSpec = resultMap("MainSpec")
val argParserSpec = resultMap("ArgsParserSpec")
def checkScalaTest(scalaVersion: String, scalaJSVersion: String, cached: Boolean) = {
val resultMap = runTests(
if(!cached) HelloJSWorld.buildScalaTest(scalaVersion, scalaJSVersion).test.test()
else HelloJSWorld.buildScalaTest(scalaVersion, scalaJSVersion).test.testCached
)

assert(
mainSpec.size == 2,
mainSpec("vmName should contain js").status == "Success",
mainSpec("vmName should contain Scala").status == "Success",
val mainSpec = resultMap("MainSpec")
val argParserSpec = resultMap("ArgsParserSpec")

argParserSpec.size == 2,
argParserSpec("parse should one").status == "Success",
argParserSpec("parse should two").status == "Failure"
)
}
assert(
mainSpec.size == 2,
mainSpec("vmName should contain js").status == "Success",
mainSpec("vmName should contain Scala").status == "Success",

argParserSpec.size == 2,
argParserSpec("parse should one").status == "Success",
argParserSpec("parse should two").status == "Failure"
)
}

'utest_21112_0622 - TestUtil.disableInJava9OrAbove(checkUtest("2.11.12", "0.6.22"))
'utest_2124_0622 - checkUtest("2.12.4", "0.6.22")
'utest_21112_0631 - TestUtil.disableInJava9OrAbove(checkUtest("2.11.12", "0.6.31"))
'utest_2124_0631 - checkUtest("2.12.4", "0.6.31")
'test - {
val cached = false
'utest_21112_0622 - TestUtil.disableInJava9OrAbove(checkUtest("2.11.12", "0.6.22", cached))
'utest_2124_0622 - checkUtest("2.12.4", "0.6.22", cached)
'utest_21112_0631 - TestUtil.disableInJava9OrAbove(checkUtest("2.11.12", "0.6.31", cached))
'utest_2124_0631 - checkUtest("2.12.4", "0.6.31", cached)
// No utest artifact for Scala.js 1.0.0 published yet
// 'utest_21112_100 - TestUtil.disableInJava9OrAbove(checkUtest("2.11.12", "1.0.0"))
// 'utest_2124_100 - checkUtest("2.12.4", "1.0.0")

// No test for ScalaTest with 0.6.22 because ScalaTest 3.1.0 requires Scala.js 0.6.29+
'scalaTest_21112_0631 - TestUtil.disableInJava9OrAbove(checkScalaTest("2.11.12", "0.6.31"))
'scalaTest_2124_0631 - checkScalaTest("2.12.4", "0.6.31")
'scalaTest_21112_100RC1 - checkScalaTest("2.11.12", "1.0.0-RC1")
'scalaTest_2124_100RC1 - checkScalaTest("2.12.4", "1.0.0-RC1")
'scalaTest_21112_0631 - TestUtil.disableInJava9OrAbove(checkScalaTest("2.11.12", "0.6.31", cached))
'scalaTest_2124_0631 - checkScalaTest("2.12.4", "0.6.31", cached)
'scalaTest_21112_100RC1 - checkScalaTest("2.11.12", "1.0.0-RC1", cached)
'scalaTest_2124_100RC1 - checkScalaTest("2.12.4", "1.0.0-RC1", cached)
// No ScalaTest artifact for Scala.js 1.0.0 published yet
// 'scalaTest_21112_100 - checkScalaTest("2.11.12", "1.0.0")
// 'scalaTest_2124_100 - checkScalaTest("2.12.4", "1.0.0")
}

'testCached - {
val cached = true
'utest_21112_0622 - TestUtil.disableInJava9OrAbove(checkUtest("2.11.12", "0.6.22", cached))
'utest_2124_0622 - checkUtest("2.12.4", "0.6.22", cached)
'utest_21112_0631 - TestUtil.disableInJava9OrAbove(checkUtest("2.11.12", "0.6.31", cached))
'utest_2124_0631 - checkUtest("2.12.4", "0.6.31", cached)
// No utest artifact for Scala.js 1.0.0 published yet
// 'utest_21112_100 - TestUtil.disableInJava9OrAbove(checkUtest("2.11.12", "1.0.0"))
// 'utest_2124_100 - checkUtest("2.12.4", "1.0.0")

// No test for ScalaTest with 0.6.22 because ScalaTest 3.1.0 requires Scala.js 0.6.29+
'scalaTest_21112_0631 - TestUtil.disableInJava9OrAbove(checkScalaTest("2.11.12", "0.6.31", cached))
'scalaTest_2124_0631 - checkScalaTest("2.12.4", "0.6.31", cached)
'scalaTest_21112_100RC1 - checkScalaTest("2.11.12", "1.0.0-RC1", cached)
'scalaTest_2124_100RC1 - checkScalaTest("2.12.4", "1.0.0-RC1", cached)
// No ScalaTest artifact for Scala.js 1.0.0 published yet
// 'scalaTest_21112_100 - checkScalaTest("2.11.12", "1.0.0")
// 'scalaTest_2124_100 - checkScalaTest("2.12.4", "1.0.0")
}


def checkRun(scalaVersion: String, scalaJSVersion: String): Unit = {
val task = HelloJSWorld.helloJsWorld(scalaVersion, scalaJSVersion).run()

Expand Down