Rename TestBaseModule to TestRootModule (#5143)

Follow up from #5141

The term `TestBaseModule` is a bit ambiguous, since it seems like a
"base class" that all test modules should inherit, when only the root
module should inherit it. Naming it `TestRootModule` should avoid that
confusion

Author: lihaoyi

changelog.adoc

@@ -137,7 +137,7 @@ published with some other suffix via `def extraPublish`
 * Improve performances of Bloop/install ({link-pr}/4600[#4600]) ({link-pr}/4628[#4628])
 * Pass Mill source JARs to Bloop ({link-pr}/4608[#4608])
 * Optimize BSP initialization stuff ({link-pr}/4698[#4698])
-* Make source path configurable in TestBaseModule ({link-pr}/4703[#4703])
+* Make source path configurable in TestRootModule ({link-pr}/4703[#4703])
 
 _For details refer to
 {link-milestone}/{milestone}?closed=1[milestone {milestone-name}]

contrib/bloop/test/src/mill/contrib/bloop/BloopTests.scala

@@ -7,7 +7,7 @@
 //import mill.define.Discover
 //import mill.scalanativelib.api.ReleaseMode
 //import mill.testkit.UnitTester
-//import mill.testkit.TestBaseModule
+//import mill.testkit.TestRootModule
 //import os.Path
 //import upickle.default._
 //import utest._
@@ -25,7 +25,7 @@
 //    addMillSources = None
 //  )
 //
-//  object build extends TestBaseModule {
+//  object build extends TestRootModule {
 //    object scalaModule extends scalalib.ScalaModule with testBloop.Module {
 //      def scalaVersion = "2.12.8"
 //      val bloopVersion = mill.contrib.bloop.Versions.bloop

contrib/buildinfo/test/src/mill/contrib/buildinfo/BuildInfoTests.scala

@@ -6,7 +6,7 @@ import mill.kotlinlib.KotlinModule
 import mill.scalalib.ScalaModule
 import mill.scalajslib.ScalaJSModule
 import mill.testkit.UnitTester
-import mill.testkit.TestBaseModule
+import mill.testkit.TestRootModule
 import mill.define.Discover
 import os.Path
 import utest.*
@@ -17,15 +17,15 @@ object BuildInfoTests extends TestSuite {
   val scalaJSVersionString = sys.props.getOrElse("TEST_SCALAJS_VERSION", ???)
   val kotlinVersionString = sys.props.getOrElse("TEST_KOTLIN_VERSION", ???)
 
-  object EmptyBuildInfo extends TestBaseModule with BuildInfo with ScalaModule {
+  object EmptyBuildInfo extends TestRootModule with BuildInfo with ScalaModule {
     def scalaVersion = scalaVersionString
     def buildInfoPackageName = "foo"
     def buildInfoMembers = Seq.empty[BuildInfo.Value]
 
     lazy val millDiscover = Discover[this.type]
   }
 
-  object BuildInfoPlain extends TestBaseModule with BuildInfo with ScalaModule {
+  object BuildInfoPlain extends TestRootModule with BuildInfo with ScalaModule {
     def scalaVersion = scalaVersionString
     def buildInfoPackageName = "foo"
     def buildInfoMembers = Seq(
@@ -35,7 +35,7 @@ object BuildInfoTests extends TestSuite {
     lazy val millDiscover = Discover[this.type]
   }
 
-  object BuildInfoScalaJS extends TestBaseModule with BuildInfo with ScalaJSModule {
+  object BuildInfoScalaJS extends TestRootModule with BuildInfo with ScalaJSModule {
     def scalaVersion = scalaVersionString
     def scalaJSVersion = scalaJSVersionString
     def buildInfoPackageName = "foo"
@@ -46,7 +46,7 @@ object BuildInfoTests extends TestSuite {
     lazy val millDiscover = Discover[this.type]
   }
 
-  object BuildInfoComment extends TestBaseModule with BuildInfo with ScalaModule {
+  object BuildInfoComment extends TestRootModule with BuildInfo with ScalaModule {
     def scalaVersion = scalaVersionString
     def buildInfoPackageName = "foo"
     def buildInfoMembers = Seq(
@@ -65,7 +65,7 @@ object BuildInfoTests extends TestSuite {
     lazy val millDiscover = Discover[this.type]
   }
 
-  object BuildInfoStatic extends TestBaseModule with BuildInfo with ScalaModule {
+  object BuildInfoStatic extends TestRootModule with BuildInfo with ScalaModule {
     def scalaVersion = scalaVersionString
     def buildInfoPackageName = "foo"
     override def buildInfoStaticCompiled = true
@@ -76,7 +76,7 @@ object BuildInfoTests extends TestSuite {
     lazy val millDiscover = Discover[this.type]
   }
 
-  object BuildInfoSettings extends TestBaseModule with BuildInfo with ScalaModule {
+  object BuildInfoSettings extends TestRootModule with BuildInfo with ScalaModule {
     def scalaVersion = scalaVersionString
     def buildInfoPackageName = "foo"
     override def buildInfoObjectName = "bar"
@@ -87,7 +87,7 @@ object BuildInfoTests extends TestSuite {
     lazy val millDiscover = Discover[this.type]
   }
 
-  object BuildInfoJava extends TestBaseModule with BuildInfo {
+  object BuildInfoJava extends TestRootModule with BuildInfo {
     def buildInfoPackageName = "foo"
     def buildInfoMembers = Seq(
       BuildInfo.Value("scalaVersion", "not-provided-for-java-modules")
@@ -96,7 +96,7 @@ object BuildInfoTests extends TestSuite {
     lazy val millDiscover = Discover[this.type]
   }
 
-  object BuildInfoJavaStatic extends TestBaseModule with BuildInfo {
+  object BuildInfoJavaStatic extends TestRootModule with BuildInfo {
     def buildInfoPackageName = "foo"
     override def buildInfoStaticCompiled = true
     def buildInfoMembers = Seq(
@@ -106,7 +106,7 @@ object BuildInfoTests extends TestSuite {
     lazy val millDiscover = Discover[this.type]
   }
 
-  object BuildInfoKotlin extends TestBaseModule with KotlinModule with BuildInfo {
+  object BuildInfoKotlin extends TestRootModule with KotlinModule with BuildInfo {
     def kotlinVersion = kotlinVersionString
     // FIXME: the mainClass should be found automatically
     def mainClass = Some("foo.Main")
@@ -118,7 +118,7 @@ object BuildInfoTests extends TestSuite {
     lazy val millDiscover = Discover[this.type]
   }
 
-  object BuildInfoKotlinStatic extends TestBaseModule with KotlinModule with BuildInfo {
+  object BuildInfoKotlinStatic extends TestRootModule with KotlinModule with BuildInfo {
     def kotlinVersion = kotlinVersionString
     // FIXME: the mainClass should be found automatically
     def mainClass = Some("foo.Main")

contrib/docker/test/src/mill/contrib/docker/DockerModuleTest.scala

@@ -5,7 +5,7 @@ import mill.scalalib.JavaModule
 import mill.api.ExecResult
 import mill.define.Discover
 import mill.testkit.UnitTester
-import mill.testkit.TestBaseModule
+import mill.testkit.TestRootModule
 import os.Path
 import utest.*
 import utest.framework.TestPath
@@ -16,7 +16,7 @@ object DockerModuleTest extends TestSuite {
     if (isInstalled("podman")) "podman"
     else "docker"
 
-  object Docker extends TestBaseModule with JavaModule with DockerModule {
+  object Docker extends TestRootModule with JavaModule with DockerModule {
 
     override def artifactName = testArtifactName
 
@@ -62,7 +62,7 @@ object DockerModuleTest extends TestSuite {
     os.proc(getPathCmd, executable).call(check = false).exitCode == 0
   }
 
-  private def workspaceTest(m: mill.testkit.TestBaseModule)(t: UnitTester => Unit)(
+  private def workspaceTest(m: mill.testkit.TestRootModule)(t: UnitTester => Unit)(
       implicit tp: TestPath
   ): Unit = {
     if (isInstalled(testExecutable) && !scala.util.Properties.isWin)

contrib/flyway/test/src/mill/contrib/flyway/BuildTest.scala

@@ -4,12 +4,12 @@ import mill.*
 import mill.define.Discover
 import mill.scalalib.*
 import mill.testkit.UnitTester
-import mill.testkit.TestBaseModule
+import mill.testkit.TestRootModule
 import utest.{TestSuite, Tests, assert, *}
 
 object BuildTest extends TestSuite {
 
-  object Build extends TestBaseModule {
+  object Build extends TestRootModule {
     object build extends FlywayModule {
 
       val resourceFolder = os.Path(sys.env("MILL_TEST_RESOURCE_DIR"))

contrib/gitlab/test/src/mill/contrib/gitlab/GitlabModuleTests.scala

@@ -5,7 +5,7 @@ import mill.api.ExecResult.Failure
 import mill.define.Discover
 import mill.scalalib.publish.PomSettings
 import mill.testkit.UnitTester
-import mill.testkit.TestBaseModule
+import mill.testkit.TestRootModule
 import utest.{TestSuite, Tests, assertMatch, test}
 import mill.util.TokenReaders._
 object GitlabModuleTests extends TestSuite {
@@ -14,7 +14,7 @@ object GitlabModuleTests extends TestSuite {
     override def tokenSearchOrder = Seq.empty
   }
 
-  object GitlabModule extends TestBaseModule with GitlabPublishModule {
+  object GitlabModule extends TestRootModule with GitlabPublishModule {
     override def publishRepository: ProjectRepository =
       ProjectRepository("http://gitlab.local", 0)
 
@@ -30,7 +30,7 @@ object GitlabModuleTests extends TestSuite {
 
   // GitlabMavenRepository does not need to be a module, but it needs to be invoked from one.
   // So for test purposes we make a module with it to get a Ctx for evaluation
-  object GLMvnRepo extends TestBaseModule with GitlabMavenRepository {
+  object GLMvnRepo extends TestRootModule with GitlabMavenRepository {
     override def gitlabRepository: GitlabPackageRepository =
       InstanceRepository("https://gl.local")
 

contrib/jmh/test/src/mill/contrib/jmh/JmhModuleTest.scala

@@ -5,13 +5,13 @@ import mill.define.Discover
 import mill.define.ExecutionPaths
 import mill.scalalib.ScalaModule
 import mill.testkit.UnitTester
-import mill.testkit.TestBaseModule
+import mill.testkit.TestRootModule
 import os.Path
 import utest.*
 
 object JmhModuleTest extends TestSuite {
 
-  object jmh extends TestBaseModule with ScalaModule with JmhModule {
+  object jmh extends TestRootModule with ScalaModule with JmhModule {
 
     override def scalaVersion = sys.props.getOrElse("TEST_SCALA_2_13_VERSION", ???)
     override def jmhCoreVersion = "1.35"

contrib/playlib/test/src/mill/playlib/PlayModuleTests.scala

@@ -2,13 +2,13 @@ package mill
 package playlib
 
 import mill.scalalib.api.JvmWorkerUtil
-import mill.testkit.{TestBaseModule, UnitTester}
+import mill.testkit.{TestRootModule, UnitTester}
 import utest.{TestSuite, Tests, assert, _}
 import mill.define.Discover
 
 object PlayModuleTests extends TestSuite with PlayTestSuite {
 
-  object playmulti extends TestBaseModule {
+  object playmulti extends TestRootModule {
     object core extends Cross[CoreCrossModule](matrix)
     trait CoreCrossModule extends PlayModule with Cross.Module2[String, String] {
       val (crossScalaVersion, crossPlayVersion) = (crossValue, crossValue2)

contrib/playlib/test/src/mill/playlib/PlaySingleApiModuleTests.scala

@@ -1,13 +1,13 @@
 package mill.playlib
 
 import mill.Task
-import mill.testkit.{TestBaseModule, UnitTester}
+import mill.testkit.{TestRootModule, UnitTester}
 import utest.{TestSuite, Tests, assert, _}
 import mill.define.Discover
 import mill.util.TokenReaders._
 object PlaySingleApiModuleTests extends TestSuite with PlayTestSuite {
 
-  object playsingleapi extends TestBaseModule with PlayApiModule {
+  object playsingleapi extends TestRootModule with PlayApiModule {
     override val moduleDir = os.temp() // workaround problem in `SingleModule`
     override def playVersion = Task { testPlay28 }
     override def scalaVersion = Task { "2.13.12" }

contrib/playlib/test/src/mill/playlib/PlaySingleModuleTests.scala

@@ -2,12 +2,12 @@ package mill.playlib
 
 import mill.define.Discover
 import mill.Task
-import mill.testkit.{TestBaseModule, UnitTester}
+import mill.testkit.{TestRootModule, UnitTester}
 import utest.{TestSuite, Tests, assert, _}
 import mill.util.TokenReaders._
 object PlaySingleModuleTests extends TestSuite with PlayTestSuite {
 
-  object playsingle extends TestBaseModule with PlayModule {
+  object playsingle extends TestRootModule with PlayModule {
     override val moduleDir = os.temp() // workaround problem in `SingleModule`
     override def playVersion = Task { testPlay28 }
     override def scalaVersion = Task { sys.props.getOrElse("TEST_SCALA_2_13_VERSION", ???) }