Skip to content

Community build: update ScalaTest and friends to 3.2.7 #12089

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.

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
Apr 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -193,3 +193,6 @@
[submodule "community-build/community-projects/play-json"]
path = community-build/community-projects/play-json
url = https://github.com/dotty-staging/play-json.git
[submodule "community-build/community-projects/scalatestplus-testng"]
path = community-build/community-projects/scalatestplus-testng
url = https://github.com/dotty-staging/scalatestplus-testng.git
2 changes: 1 addition & 1 deletion community-build/community-projects/scalatest
Submodule scalatest updated 239 files
1 change: 1 addition & 0 deletions community-build/community-projects/scalatestplus-testng
Submodule scalatestplus-testng added at f7a439
24 changes: 19 additions & 5 deletions community-build/src/scala/dotty/communitybuild/projects.scala
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ sealed trait CommunityProject:
val publishCommand: String
val docCommand: String
val dependencies: List[CommunityProject]
val testOnlyDependencies: () => List[CommunityProject]
val binaryName: String
val runCommandsArgs: List[String] = Nil
val requiresExperimental: Boolean
Expand Down Expand Up @@ -87,6 +88,7 @@ final case class MillCommunityProject(
project: String,
baseCommand: String,
dependencies: List[CommunityProject] = Nil,
testOnlyDependencies: () => List[CommunityProject] = () => Nil,
ignoreDocs: Boolean = false,
requiresExperimental: Boolean = false,
) extends CommunityProject:
Expand All @@ -104,6 +106,7 @@ final case class SbtCommunityProject(
sbtTestCommand: String,
extraSbtArgs: List[String] = Nil,
dependencies: List[CommunityProject] = Nil,
testOnlyDependencies: () => List[CommunityProject] = () => Nil,
sbtPublishCommand: String = null,
sbtDocCommand: String = null,
scalacOptions: List[String] = SbtCommunityProject.scalacOptions,
Expand Down Expand Up @@ -273,15 +276,17 @@ object projects:
sbtDocCommand = forceDoc("jvm")
)

lazy val scalatest = SbtCommunityProject(
lazy val scalatest: SbtCommunityProject = SbtCommunityProject(
project = "scalatest",
sbtTestCommand = "scalacticDotty/clean;scalacticTestDotty/test; scalatestTestDotty/test",
sbtPublishCommand = "scalacticDotty/publishLocal; scalatestDotty/publishLocal",
sbtDocCommand = ";scalacticDotty/doc" // fails with missing type ;scalatestDotty/doc"
sbtTestCommand = "scalacticDotty/clean; scalacticDottyJS/clean; scalacticTestDotty/test; scalatestTestDotty/test; scalacticDottyJS/compile; scalatestDottyJS/compile",
sbtPublishCommand = "scalacticDotty/publishLocal; scalatestDotty/publishLocal; scalacticDottyJS/publishLocal; scalatestDottyJS/publishLocal",
sbtDocCommand = ";scalacticDotty/doc", // fails with missing type ;scalatestDotty/doc"
// cannot take signature of (test: org.scalatest.concurrent.ConductorFixture#OneArgTest):
// org.scalatest.Outcome
// Problem parsing scalatest.dotty/target/scala-3.0.0-M2/src_managed/main/org/scalatest/concurrent/ConductorFixture.scala:[602..624..3843], documentation may not be generated.
// dotty.tools.dotc.core.MissingType:
dependencies = List(scalaXml),
testOnlyDependencies = () => List(scalatestplusJunit, scalatestplusTestNG)
)

lazy val scalatestplusScalacheck = SbtCommunityProject(
Expand All @@ -299,9 +304,17 @@ object projects:
dependencies = List(scalatest)
)

lazy val scalatestplusTestNG = SbtCommunityProject(
project = "scalatestplus-testng",
sbtTestCommand = "test",
sbtPublishCommand = "publishLocal",
dependencies = List(scalatest)
)

lazy val scalaXml = SbtCommunityProject(
project = "scala-xml",
sbtTestCommand = "xml/test",
sbtTestCommand = "xml/test",
sbtPublishCommand = "xml/publishLocal",
sbtDocCommand = "xml/doc"
)

Expand Down Expand Up @@ -736,6 +749,7 @@ def allProjects = List(
projects.protoquill,
projects.onnxScala,
projects.playJson,
projects.scalatestplusTestNG,
)

lazy val projectMap = allProjects.groupBy(_.project)
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ abstract class CommunityBuildTest:
)
return
self.dependencies.foreach(_.publish())
self.testOnlyDependencies().foreach(_.publish())
suite.test(self)

/** Build the given project with the published local compiler and sbt plugin.
Expand Down Expand Up @@ -96,6 +97,7 @@ class CommunityBuildTestA extends CommunityBuildTest:
@Test def izumiReflect = projects.izumiReflect.run()
@Test def scalaSTM = projects.scalaSTM.run()
@Test def scalatest = projects.scalatest.run()
@Test def scalatestplusTestNG = projects.scalatestplusTestNG.run()
// 'Sciss/Lucre' dependencies:
// @Test def scissEqual = projects.scissEqual .run()
// @Test def scissFingerTree = projects.scissFingerTree.run()
Expand Down