Cleanup of scalalib.test files (#5750)

lefou · web-flow · commit 4eac927a33c8 · 2025-08-26T22:51:01.000+02:00
Fixed package declarations, Scala 2 wildcards, missing empty lines between import and class. Pull request: #5750
diff --git a/libs/scalalib/test/src/mill/scalalib/CoursierMirrorTests.scala b/libs/scalalib/test/src/mill/scalalib/CoursierMirrorTests.scala
@@ -2,10 +2,9 @@ package mill.scalalib
 
 // import coursier.cache.FileCache
 import mill.api.Discover
-import mill.testkit.UnitTester
-import mill.testkit.TestRootModule
+import mill.testkit.{TestRootModule, UnitTester}
+import mill.util.TokenReaders.*
 import utest.*
-import mill.util.TokenReaders._
 
 object CoursierMirrorTests extends TestSuite {
 
diff --git a/libs/scalalib/test/src/mill/scalalib/CoursierParametersTests.scala b/libs/scalalib/test/src/mill/scalalib/CoursierParametersTests.scala
@@ -1,9 +1,8 @@
 package mill.scalalib
 
 import mill.api.{Discover, Task}
-import mill.testkit.UnitTester
-import mill.testkit.TestRootModule
-import mill.util.TokenReaders._
+import mill.testkit.{TestRootModule, UnitTester}
+import mill.util.TokenReaders.*
 import utest.*
 
 object CoursierParametersTests extends TestSuite {
diff --git a/libs/scalalib/test/src/mill/scalalib/CycleTests.scala b/libs/scalalib/test/src/mill/scalalib/CycleTests.scala
@@ -1,10 +1,9 @@
 package mill.scalalib
 
 import mill.api.Discover
-import mill.testkit.UnitTester
-import mill.testkit.TestRootModule
+import mill.testkit.{TestRootModule, UnitTester}
+import mill.util.TokenReaders.*
 import utest.{TestSuite, Tests, assert, assertThrows, test}
-import mill.util.TokenReaders._
 
 object CycleTests extends TestSuite {
 
diff --git a/libs/scalalib/test/src/mill/scalalib/JavaHomeTests.scala b/libs/scalalib/test/src/mill/scalalib/JavaHomeTests.scala
@@ -1,4 +1,4 @@
-package mill.javalib
+package mill.scalalib
 
 import mill.api.daemon.ExecResult
 import mill.api.{Discover, Task}
diff --git a/libs/scalalib/test/src/mill/scalalib/ScalaAssemblyAppendTests.scala b/libs/scalalib/test/src/mill/scalalib/ScalaAssemblyAppendTests.scala
@@ -1,15 +1,14 @@
 package mill.scalalib
 
 import mill.*
+import mill.api.Task
+import mill.scalalib.HelloWorldTests.*
 import mill.testkit.UnitTester
 import utest.*
-import java.util.jar.JarFile
 
+import java.util.jar.JarFile
 import scala.util.Using
 
-import HelloWorldTests.*
-import mill.api.Task
-
 object ScalaAssemblyAppendTests extends TestSuite with ScalaAssemblyTestUtils {
   def tests: Tests = Tests {
     def checkAppend[M <: mill.testkit.TestRootModule](module: M, task: Task.Simple[PathRef]) =
diff --git a/libs/scalalib/test/src/mill/scalalib/ScalaAssemblyExcludeTests.scala b/libs/scalalib/test/src/mill/scalalib/ScalaAssemblyExcludeTests.scala
@@ -1,14 +1,14 @@
 package mill.scalalib
 
 import mill.*
+import mill.api.Task
+import mill.scalalib.HelloWorldTests.*
 import mill.testkit.UnitTester
 import utest.*
-import java.util.jar.JarFile
 
+import java.util.jar.JarFile
 import scala.util.Using
 
-import HelloWorldTests.*
-import mill.api.Task
 object ScalaAssemblyExcludeTests extends TestSuite with ScalaAssemblyTestUtils {
   def tests: Tests = Tests {
     def checkExclude[M <: mill.testkit.TestRootModule](
diff --git a/libs/scalalib/test/src/mill/scalalib/ScalaAssemblyTestUtils.scala b/libs/scalalib/test/src/mill/scalalib/ScalaAssemblyTestUtils.scala
@@ -1,10 +1,11 @@
 package mill.scalalib
 
 import mill.*
-import mill.testkit.TestRootModule
-import mill.util.TokenReaders._
-import HelloWorldTests.*
 import mill.api.Discover
+import mill.scalalib.HelloWorldTests.*
+import mill.testkit.TestRootModule
+import mill.util.TokenReaders.*
+
 trait ScalaAssemblyTestUtils {
 
   val akkaHttpDeps = Seq(mvn"com.typesafe.akka::akka-http:10.0.13")
diff --git a/libs/scalalib/test/src/mill/scalalib/ScalaAssemblyTests.scala b/libs/scalalib/test/src/mill/scalalib/ScalaAssemblyTests.scala
@@ -1,11 +1,12 @@
 package mill.scalalib
 
-import mill._
+import mill.*
+import mill.scalalib.HelloWorldTests.*
 import mill.testkit.UnitTester
-import utest._
+import utest.*
 
 import java.util.jar.JarFile
-import HelloWorldTests._
+
 object ScalaAssemblyTests extends TestSuite with ScalaAssemblyTestUtils {
 
   def tests: Tests = Tests {
diff --git a/libs/scalalib/test/src/mill/scalalib/ScalaColorOutputTests.scala b/libs/scalalib/test/src/mill/scalalib/ScalaColorOutputTests.scala
@@ -1,13 +1,13 @@
 package mill.scalalib
 
-import mill.api.ExecResult
+import mill.api.{Discover, ExecResult}
+import mill.scalalib.HelloWorldTests.*
 import mill.testkit.{TestRootModule, UnitTester}
+import mill.util.TokenReaders.*
 import utest.*
 
 import java.io.{ByteArrayOutputStream, PrintStream}
-import HelloWorldTests.*
-import mill.api.Discover
-import mill.util.TokenReaders._
+
 object ScalaColorOutputTests extends TestSuite {
 
   object HelloWorldColorOutput extends TestRootModule {
diff --git a/libs/scalalib/test/src/mill/scalalib/ScalaFlagsTests.scala b/libs/scalalib/test/src/mill/scalalib/ScalaFlagsTests.scala
@@ -1,10 +1,10 @@
 package mill.scalalib
 
+import mill.api.Discover
+import mill.scalalib.HelloWorldTests.*
 import mill.testkit.{TestRootModule, UnitTester}
+import mill.util.TokenReaders.*
 import utest.*
-import HelloWorldTests.*
-import mill.api.Discover
-import mill.util.TokenReaders._
 
 object ScalaFlagsTests extends TestSuite {
 
diff --git a/libs/scalalib/test/src/mill/scalalib/ScalaMacrosTests.scala b/libs/scalalib/test/src/mill/scalalib/ScalaMacrosTests.scala
@@ -6,6 +6,7 @@ import utest.*
 
 import HelloWorldTests.*
 import mill.api.Discover
+
 object ScalaMacrosTests extends TestSuite {
 
   object HelloWorldMacros213 extends TestRootModule {
diff --git a/libs/scalalib/test/src/mill/scalalib/ScalaMixedProjectSemanticDbTests.scala b/libs/scalalib/test/src/mill/scalalib/ScalaMixedProjectSemanticDbTests.scala
@@ -1,9 +1,9 @@
 package mill.scalalib
 
+import mill.api.Discover
 import mill.testkit.{TestRootModule, UnitTester}
+import mill.util.TokenReaders.*
 import utest.*
-import mill.api.Discover
-import mill.util.TokenReaders._
 
 object ScalaMixedProjectSemanticDbTests extends TestSuite {
 
diff --git a/libs/scalalib/test/src/mill/scalalib/ScalaMultiModuleClasspathsTests.scala b/libs/scalalib/test/src/mill/scalalib/ScalaMultiModuleClasspathsTests.scala
@@ -1,11 +1,12 @@
 package mill.scalalib
 
-import mill._
-import mill.testkit.{TestRootModule, UnitTester}
-import utest._
+import mill.*
 import mill.api.Discover
-import mill.util.TokenReaders._
-import HelloWorldTests._
+import mill.scalalib.HelloWorldTests.*
+import mill.testkit.{TestRootModule, UnitTester}
+import mill.util.TokenReaders.*
+import utest.*
+
 object ScalaMultiModuleClasspathsTests extends TestSuite {
 
   object MultiModuleClasspaths extends TestRootModule {
diff --git a/libs/scalalib/test/src/mill/scalalib/ScalaMvnDepsTests.scala b/libs/scalalib/test/src/mill/scalalib/ScalaMvnDepsTests.scala
@@ -5,6 +5,7 @@ import mill.testkit.{TestRootModule, UnitTester}
 import utest.*
 import HelloWorldTests.*
 import mill.api.Discover
+
 object ScalaMvnDepsTests extends TestSuite {
 
   object HelloWorldMvnDeps extends TestRootModule {
diff --git a/libs/scalalib/test/src/mill/scalalib/ScalaRunTests.scala b/libs/scalalib/test/src/mill/scalalib/ScalaRunTests.scala
@@ -6,6 +6,7 @@ import mill.testkit.{TestRootModule, UnitTester}
 import utest.*
 import HelloWorldTests.*
 import mill.api.Discover
+
 object ScalaRunTests extends TestSuite {
 
   object HelloWorldDefaultMain extends TestRootModule {
diff --git a/libs/scalalib/test/src/mill/scalalib/ScalaScalacheckTests.scala b/libs/scalalib/test/src/mill/scalalib/ScalaScalacheckTests.scala
@@ -5,6 +5,7 @@ import mill.testkit.{TestRootModule, UnitTester}
 import utest.*
 import HelloWorldTests.*
 import mill.api.Discover
+
 object ScalaScalacheckTests extends TestSuite {
 
   object HelloScalacheck extends TestRootModule {
diff --git a/libs/scalalib/test/src/mill/scalalib/ScalaScaladocTests.scala b/libs/scalalib/test/src/mill/scalalib/ScalaScaladocTests.scala
@@ -6,6 +6,7 @@ import mill.testkit.{TestRootModule, UnitTester}
 import utest.*
 import HelloWorldTests.*
 import mill.api.Discover
+
 object ScalaScaladocTests extends TestSuite {
 
   object HelloWorldWithDocVersion extends TestRootModule {
diff --git a/libs/scalalib/test/src/mill/scalalib/ScalaSemanticDbTests.scala b/libs/scalalib/test/src/mill/scalalib/ScalaSemanticDbTests.scala
@@ -1,10 +1,10 @@
 package mill.scalalib
 
+import mill.api.Discover
+import mill.scalalib.HelloWorldTests.*
 import mill.testkit.{TestRootModule, UnitTester}
+import mill.util.TokenReaders.*
 import utest.*
-import HelloWorldTests.*
-import mill.api.Discover
-import mill.util.TokenReaders._
 
 object ScalaSemanticDbTests extends TestSuite {
 
diff --git a/libs/scalalib/test/src/mill/scalalib/ScalaTypeLevelTests.scala b/libs/scalalib/test/src/mill/scalalib/ScalaTypeLevelTests.scala
@@ -5,6 +5,7 @@ import mill.testkit.{TestRootModule, UnitTester}
 import utest.*
 import HelloWorldTests.*
 import mill.api.Discover
+
 object ScalaTypeLevelTests extends TestSuite {
 
   object HelloWorldTypeLevel extends TestRootModule {
diff --git a/libs/scalalib/test/src/mill/scalalib/ScalaValidatedPathRefTests.scala b/libs/scalalib/test/src/mill/scalalib/ScalaValidatedPathRefTests.scala
@@ -5,6 +5,7 @@ import mill.api.{Discover, Task}
 import mill.testkit.UnitTester
 import mill.testkit.TestRootModule
 import utest.*
+
 object ScalaValidatedPathRefTests extends TestSuite {
 
   object ValidatedTarget extends TestRootModule {
diff --git a/libs/scalalib/test/src/mill/scalalib/ScalaVersionsRangesTests.scala b/libs/scalalib/test/src/mill/scalalib/ScalaVersionsRangesTests.scala
@@ -7,6 +7,7 @@ import mill.testkit.TestRootModule
 import utest.*
 
 object ScalaVersionsRangesTests extends TestSuite {
+
   object ScalaVersionsRanges extends TestRootModule {
     object core extends Cross[CoreCrossModule]("2.12.13", "2.13.5", "3.3.3")
     trait CoreCrossModule extends CrossScalaModule
diff --git a/libs/scalalib/test/src/mill/scalalib/TestClassLoaderTests.scala b/libs/scalalib/test/src/mill/scalalib/TestClassLoaderTests.scala
@@ -7,6 +7,7 @@ import mill.util.TokenReaders.*
 import utest.*
 
 object TestClassLoaderTests extends TestSuite {
+
   object testclassloader extends TestRootModule with ScalaModule {
     def scalaVersion = sys.props.getOrElse("TEST_SCALA_2_13_VERSION", ???)
 
diff --git a/libs/scalalib/test/src/mill/scalalib/TestRunnerParallelismTests.scala b/libs/scalalib/test/src/mill/scalalib/TestRunnerParallelismTests.scala
@@ -7,6 +7,7 @@ import utest.*
 import mill.util.TokenReaders.*
 
 object TestRunnerParallelismTests extends TestSuite {
+
   object utestSingleTest extends TestRootModule with ScalaModule with TestModule.Utest {
     override def scalaVersion: T[String] = sys.props.getOrElse("TEST_SCALA_2_13_VERSION", ???)
 
diff --git a/libs/scalalib/test/src/mill/scalalib/TestRunnerScalatestTests.scala b/libs/scalalib/test/src/mill/scalalib/TestRunnerScalatestTests.scala
@@ -3,10 +3,10 @@ package mill.scalalib
 import mill.api.ExecResult
 import mill.testkit.UnitTester
 import sbt.testing.Status
-import utest._
+import utest.*
 
 object TestRunnerScalatestTests extends TestSuite {
-  import TestRunnerTestUtils._
+  import TestRunnerTestUtils.*
   override def tests: Tests = Tests {
     test("test") - UnitTester(testrunner, resourcePath).scoped { eval =>
       val Right(result) = eval(testrunner.scalatest.testForked()): @unchecked
diff --git a/libs/scalalib/test/src/mill/scalalib/TestRunnerTestUtils.scala b/libs/scalalib/test/src/mill/scalalib/TestRunnerTestUtils.scala
@@ -1,12 +1,9 @@
 package mill.scalalib
 
-import mill.api.Result
-import mill.api.Discover
-import mill.testkit.UnitTester
-import mill.testkit.TestRootModule
-import mill.util.TokenReaders._
-import mill.Task
-import mill.T
+import mill.{T, Task}
+import mill.api.{Discover, Result}
+import mill.testkit.{TestRootModule, UnitTester}
+import mill.util.TokenReaders.*
 import os.Path
 import sbt.testing.Status
 import utest.*
diff --git a/libs/scalalib/test/src/mill/scalalib/TestRunnerTests.scala b/libs/scalalib/test/src/mill/scalalib/TestRunnerTests.scala
@@ -3,12 +3,13 @@ package mill.scalalib
 import mill.api.ExecResult
 import mill.testkit.UnitTester
 import sbt.testing.Status
-import utest._
+import utest.*
 
 import java.io.{ByteArrayOutputStream, PrintStream}
 
 object TestRunnerTests extends TestSuite {
-  import TestRunnerTestUtils._
+  import TestRunnerTestUtils.*
+
   override def tests: Tests = Tests {
 
     test("doneMessage") {
diff --git a/libs/scalalib/test/src/mill/scalalib/TestRunnerUtestTests.scala b/libs/scalalib/test/src/mill/scalalib/TestRunnerUtestTests.scala
@@ -7,7 +7,7 @@ import sbt.testing.Status
 import utest.*
 
 object TestRunnerUtestTests extends TestSuite {
-  import TestRunnerTestUtils._
+  import TestRunnerTestUtils.*
   override def tests: Tests = Tests {
     test("test case lookup") - UnitTester(testrunner, resourcePath).scoped { eval =>
       val Right(result) = eval.apply(testrunner.utest.testForked()): @unchecked
diff --git a/libs/scalalib/test/src/mill/scalalib/TestRunnerZiotestTests.scala b/libs/scalalib/test/src/mill/scalalib/TestRunnerZiotestTests.scala
@@ -2,10 +2,10 @@ package mill.scalalib
 
 import mill.testkit.UnitTester
 import sbt.testing.Status
-import utest._
+import utest.*
 
 object TestRunnerZiotestTests extends TestSuite {
-  import TestRunnerTestUtils._
+  import TestRunnerTestUtils.*
   override def tests: Tests = Tests {
     test("test") - UnitTester(testrunner, resourcePath).scoped { eval =>
       val Right(result) = eval(testrunner.ziotest.testForked()): @unchecked
diff --git a/libs/scalalib/test/src/mill/scalalib/UnidocTests.scala b/libs/scalalib/test/src/mill/scalalib/UnidocTests.scala
@@ -8,6 +8,7 @@ import mill.testkit.TestRootModule
 import scala.util.Properties
 
 object UnidocTests extends TestSuite {
+
   trait UnidocTestRootModule(scalaVersion: String) extends TestRootModule { self =>
     object foo extends ScalaModule {
       def scalaVersion = self.scalaVersion
diff --git a/libs/scalalib/test/src/mill/scalalib/bsp/BspModuleTests.scala b/libs/scalalib/test/src/mill/scalalib/bsp/BspModuleTests.scala
@@ -1,4 +1,4 @@
-package mill.javalib.bsp
+package mill.scalalib.bsp
 
 import mill.api.{Cross, Discover}
 import mill.api.ExecutionPaths

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package mill.javalib`
	`1`	`+package mill.scalalib`
`2`	`2`
`3`	`3`	`import mill.api.daemon.ExecResult`
`4`	`4`	`import mill.api.{Discover, Task}`