Skip to content

Commit daff510

Browse files
GedochaoGedochao
committed
Run scalafix & fix misc warnings in build-module's unit tests
1 parent 8defad8 commit daff510

23 files changed

+180
-213
lines changed

‎build.mill.scala‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -716,8 +716,9 @@ trait Build extends ScalaCliCrossSbtModule
716716
override def repositoriesTask: Task[Seq[Repository]] =
717717
Task.Anon(super.repositoriesTask() ++ deps.customRepositories)
718718

719-
object test extends ScalaCliTests {
720-
override def ivyDeps: T[Loose.Agg[Dep]] = super.ivyDeps() ++ Agg(
719+
object test extends ScalaCliTests with ScalaCliScalafixModule {
720+
override def scalacOptions: T[Seq[String]] = super.scalacOptions() ++ Seq("-deprecation")
721+
override def ivyDeps: T[Loose.Agg[Dep]] = super.ivyDeps() ++ Agg(
721722
Deps.pprint,
722723
Deps.slf4jNop
723724
)

‎modules/build/src/test/scala/scala/build/options/publish/VcsParseTest.scala‎

Lines changed: 39 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ package scala.build.options.publish
33
import scala.build.Positioned
44
import scala.build.errors.{BuildException, MalformedInputError}
55

6-
import munit.Assertions.assertEquals
7-
86
class VcsParseTest extends munit.FunSuite {
97
test("valid GitHub") {
108
val actual = Vcs.parse(Positioned.none("github:VirtusLab/scala-cli"))
@@ -18,24 +16,33 @@ class VcsParseTest extends munit.FunSuite {
1816
}
1917

2018
test("invalid GitHub: missing /") {
21-
val actual = Vcs.parse(Positioned.none("github:scala-cli"))
22-
val expected =
19+
val actual: Either[BuildException, Vcs] = Vcs.parse(Positioned.none("github:scala-cli"))
20+
val expected =
2321
Left(new MalformedInputError("github-vcs", "github:scala-cli", "github:org/project", Nil))
24-
25-
assert(actual.isInstanceOf[Left[BuildException, Vcs]])
22+
assert {
23+
actual match {
24+
case Left(_: BuildException) => true
25+
case _ => sys.error("incorrect type")
26+
}
27+
}
2628
assertEquals(expected.toString, actual.toString)
2729
}
2830

2931
test("invalid GitHub: too many /") {
30-
val actual = Vcs.parse(Positioned.none("github:github.com/VirtusLab/scala-cli"))
32+
val actual: Either[BuildException, Vcs] =
33+
Vcs.parse(Positioned.none("github:github.com/VirtusLab/scala-cli"))
3134
val expected = Left(new MalformedInputError(
3235
"github-vcs",
3336
"github:github.com/VirtusLab/scala-cli",
3437
"github:org/project",
3538
Nil
3639
))
37-
38-
assert(actual.isInstanceOf[Left[BuildException, Vcs]])
40+
assert {
41+
actual match {
42+
case Left(_: BuildException) => true
43+
case _ => sys.error("incorrect type")
44+
}
45+
}
3946
assertEquals(expected.toString, actual.toString)
4047
}
4148

@@ -53,7 +60,7 @@ class VcsParseTest extends munit.FunSuite {
5360
}
5461

5562
test("invalid generic: missing |") {
56-
val actual = Vcs.parse(Positioned.none(
63+
val actual: Either[BuildException, Vcs] = Vcs.parse(Positioned.none(
5764
"https://github.com/VirtusLab/scala-cli|scm:git:github.com/VirtusLab/scala-cli.git"
5865
))
5966
val expected = Left(new MalformedInputError(
@@ -63,29 +70,44 @@ class VcsParseTest extends munit.FunSuite {
6370
Nil
6471
))
6572

66-
assert(actual.isInstanceOf[Left[BuildException, Vcs]])
73+
assert {
74+
actual match {
75+
case Left(_: BuildException) => true
76+
case _ => sys.error("incorrect type")
77+
}
78+
}
6779
assertEquals(expected.toString, actual.toString)
6880
}
6981

7082
test("invalid generic: extra |") {
71-
val actual = Vcs.parse(Positioned.none("a|b|c|d"))
72-
val expected =
83+
val actual: Either[BuildException, Vcs] = Vcs.parse(Positioned.none("a|b|c|d"))
84+
val expected =
7385
Left(new MalformedInputError("vcs", "a|b|c|d", "url|connection|developer-connection", Nil))
7486

75-
assert(actual.isInstanceOf[Left[BuildException, Vcs]])
87+
assert {
88+
actual match {
89+
case Left(_: BuildException) => true
90+
case _ => sys.error("incorrect type")
91+
}
92+
}
7693
assertEquals(expected.toString, actual.toString)
7794
}
7895

7996
test("invalid generic: gibberish") {
80-
val actual = Vcs.parse(Positioned.none("sfrgt pagdhn"))
81-
val expected = Left(new MalformedInputError(
97+
val actual: Either[BuildException, Vcs] = Vcs.parse(Positioned.none("sfrgt pagdhn"))
98+
val expected = Left(new MalformedInputError(
8299
"vcs",
83100
"sfrgt pagdhn",
84101
"url|connection|developer-connection",
85102
Nil
86103
))
87104

88-
assert(actual.isInstanceOf[Left[BuildException, Vcs]])
105+
assert {
106+
actual match {
107+
case Left(_: BuildException) => true
108+
case _ => sys.error("incorrect type")
109+
}
110+
}
89111
assertEquals(expected.toString, actual.toString)
90112
}
91113
}

‎modules/build/src/test/scala/scala/build/tests/ActionableDiagnosticTests.scala‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
package scala.build.tests
22

33
import com.eed3si9n.expecty.Expecty.expect
4+
import coursier.version.Version
45

5-
import scala.build.options.{BuildOptions, InternalOptions, SuppressWarningOptions}
66
import scala.build.Ops.*
7-
import scala.build.{BuildThreads, Directories, LocalRepo}
8-
import scala.build.actionable.ActionablePreprocessor
9-
import scala.build.actionable.ActionableDiagnostic.*
107
import scala.build.Position.File
11-
import coursier.core.Version
12-
13-
import scala.build.errors.{BuildException, CompositeBuildException}
8+
import scala.build.actionable.ActionableDiagnostic.*
9+
import scala.build.actionable.ActionablePreprocessor
10+
import scala.build.options.{BuildOptions, InternalOptions, SuppressWarningOptions}
11+
import scala.build.{BuildThreads, Directories, LocalRepo}
1412

1513
class ActionableDiagnosticTests extends TestUtil.ScalaCliBuildSuite {
1614

‎modules/build/src/test/scala/scala/build/tests/BspServerTests.scala‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package scala.build.tests
22

33
import com.eed3si9n.expecty.Expecty.expect
4-
import coursier.cache.CacheLogger
5-
import org.scalajs.logging.{NullLogger, Logger as ScalaJsLogger}
64

75
import java.util.concurrent.TimeUnit
6+
87
import scala.build.Ops.*
9-
import scala.build.{Build, BuildThreads, Directories, GeneratedSource, LocalRepo}
10-
import scala.build.options.{BuildOptions, InternalOptions, Scope}
118
import scala.build.bsp.{
129
BspServer,
1310
ScalaScriptBuildServer,
@@ -16,10 +13,10 @@ import scala.build.bsp.{
1613
WrappedSourcesParams,
1714
WrappedSourcesResult
1815
}
16+
import scala.build.options.{BuildOptions, InternalOptions, Scope}
17+
import scala.build.{Build, BuildThreads, Directories, GeneratedSource, LocalRepo}
1918
import scala.collection.mutable.ArrayBuffer
2019
import scala.jdk.CollectionConverters.*
21-
import scala.build.bsp.{WrappedSourcesItem, WrappedSourcesResult}
22-
import scala.build.internal.ClassCodeWrapper
2320

2421
class BspServerTests extends TestUtil.ScalaCliBuildSuite {
2522
val extraRepoTmpDir = os.temp.dir(prefix = "scala-cli-tests-bsp-server-")

‎modules/build/src/test/scala/scala/build/tests/BuildOptionsTests.scala‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,25 @@
11
package scala.build.tests
22

33
import com.eed3si9n.expecty.Expecty.assert as expect
4-
import coursier.{Repositories, Repository}
4+
import coursier.Repositories
55
import coursier.cache.FileCache
6-
import coursier.core.Version
76
import coursier.maven.MavenRepository
7+
import coursier.version.Version
88
import dependency.ScalaParameters
99

1010
import scala.build.Ops.*
1111
import scala.build.errors.{
1212
InvalidBinaryScalaVersionError,
1313
NoValidScalaVersionFoundError,
14+
ScalaVersionError,
1415
UnsupportedScalaVersionError
1516
}
1617
import scala.build.internal.Constants.*
17-
import scala.build.internal.Regexes.scala2NightlyRegex
18-
import scala.build.options.{
19-
BuildOptions,
20-
BuildRequirements,
21-
ClassPathOptions,
22-
InternalOptions,
23-
MaybeScalaVersion,
24-
ScalaOptions,
25-
ScalaVersionUtil,
26-
ScalacOpt,
27-
ShadowingSeq
28-
}
29-
import scala.build.{Build, BuildThreads, Directories, LocalRepo, Positioned, RepositoryUtils}
18+
import scala.build.internal.Regexes.{scala2NightlyRegex, scala3LtsRegex}
19+
import scala.build.options.*
3020
import scala.build.tests.util.BloopServer
21+
import scala.build.{Build, BuildThreads, Directories, LocalRepo, Positioned, RepositoryUtils}
3122
import scala.concurrent.duration.DurationInt
32-
import scala.build.internal.Regexes.scala3LtsRegex
33-
import scala.build.errors.ScalaVersionError
3423

3524
class BuildOptionsTests extends TestUtil.ScalaCliBuildSuite {
3625
override def munitFlakyOK: Boolean = TestUtil.isCI

‎modules/build/src/test/scala/scala/build/tests/BuildProjectTests.scala‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,16 @@ package scala.build.tests
33
import bloop.rifle.BloopRifleLogger
44
import com.eed3si9n.expecty.Expecty.expect
55
import coursier.cache.CacheLogger
6-
import org.scalajs.logging.{NullLogger, Logger as ScalaJsLogger}
6+
import org.scalajs.logging.{Logger as ScalaJsLogger, NullLogger}
77

88
import java.io.PrintStream
9+
910
import scala.build.Ops.*
10-
import scala.build.errors.{BuildException, Diagnostic, Severity}
11+
import scala.build.errors.{BuildException, Diagnostic}
1112
import scala.build.input.Inputs
1213
import scala.build.internals.FeatureType
13-
import scala.build.options.{
14-
BuildOptions,
15-
InternalOptions,
16-
JavaOptions,
17-
ScalaOptions,
18-
ScalacOpt,
19-
Scope,
20-
ShadowingSeq
21-
}
22-
import scala.build.{Build, LocalRepo, Logger, Position, Positioned, Sources}
14+
import scala.build.options.{BuildOptions, InternalOptions, Scope}
15+
import scala.build.{Build, LocalRepo, Logger, Sources}
2316

2417
class BuildProjectTests extends TestUtil.ScalaCliBuildSuite {
2518

‎modules/build/src/test/scala/scala/build/tests/BuildTests.scala‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,24 @@ import bloop.config.Config.LinkerMode
44
import ch.epfl.scala.bsp4j
55
import com.eed3si9n.expecty.Expecty.expect
66
import com.google.gson.Gson
7-
import coursier.cache.ArtifactError
87
import dependency.parser.DependencyParser
98

109
import java.io.IOException
10+
1111
import scala.build.Ops.*
1212
import scala.build.errors.{
1313
DependencyFormatError,
1414
InvalidBinaryScalaVersionError,
1515
ScalaNativeCompatibilityError
1616
}
17-
import scala.build.options.{
18-
BuildOptions,
19-
InternalOptions,
20-
JavaOpt,
21-
MaybeScalaVersion,
22-
ScalaJsMode,
23-
ScalacOpt,
24-
ScriptOptions,
25-
ShadowingSeq
26-
}
17+
import scala.build.options.*
2718
import scala.build.tastylib.TastyData
2819
import scala.build.tests.TestUtil.*
2920
import scala.build.tests.util.BloopServer
3021
import scala.build.{Build, BuildThreads, Directories, LocalRepo, Positioned}
22+
import scala.jdk.CollectionConverters.*
3123
import scala.meta.internal.semanticdb.TextDocuments
3224
import scala.util.Properties
33-
import scala.jdk.CollectionConverters.*
3425

3526
abstract class BuildTests(server: Boolean) extends TestUtil.ScalaCliBuildSuite {
3627
private def hasDiagnostics = server
@@ -966,7 +957,8 @@ abstract class BuildTests(server: Boolean) extends TestUtil.ScalaCliBuildSuite {
966957
|""".stripMargin
967958
}
968959

969-
val testInputs = TestInputs(mainInput +: additionalInputs: _*)
960+
val allInputs = mainInput +: additionalInputs
961+
val testInputs = TestInputs(allInputs*)
970962

971963
testInputs.withBuild(options, buildThreads, bloopConfigOpt) { (_, _, maybeBuild) =>
972964
expect(maybeBuild.exists(_.success))

‎modules/build/src/test/scala/scala/build/tests/DirectiveTests.scala‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@ package scala.build.tests
22

33
import com.eed3si9n.expecty.Expecty.expect
44

5-
import java.io.IOException
6-
import scala.build.{Build, BuildThreads, Directories, LocalRepo, Position, Positioned}
5+
import scala.build.Ops.EitherThrowOps
6+
import scala.build.errors.{
7+
CompositeBuildException,
8+
DependencyFormatError,
9+
FetchingDependenciesError,
10+
ToolkitDirectiveMissingVersionError
11+
}
712
import scala.build.options.{
813
BuildOptions,
914
InternalOptions,
@@ -13,15 +18,7 @@ import scala.build.options.{
1318
Scope
1419
}
1520
import scala.build.tests.util.BloopServer
16-
import build.Ops.EitherThrowOps
17-
import dependency.AnyDependency
18-
19-
import scala.build.errors.{
20-
CompositeBuildException,
21-
DependencyFormatError,
22-
FetchingDependenciesError,
23-
ToolkitDirectiveMissingVersionError
24-
}
21+
import scala.build.{Build, BuildThreads, Directories, LocalRepo, Position, Positioned}
2522

2623
class DirectiveTests extends TestUtil.ScalaCliBuildSuite {
2724

@@ -109,17 +106,17 @@ class DirectiveTests extends TestUtil.ScalaCliBuildSuite {
109106
)
110107
testInputs.withBuilds(baseOptions, buildThreads, bloopConfigOpt) {
111108
(_, _, maybeBuilds) =>
112-
val expectedVersion = "latest.release"
113-
val builds = maybeBuilds.orThrow
114-
val Some(mainBuild) = builds.get(Scope.Main)
115-
val Some(toolkitDep) =
116-
mainBuild.options.classPathOptions.extraDependencies.toSeq.headOption.map(_.value)
109+
val expectedVersion = "latest.release"
110+
val builds = maybeBuilds.orThrow
111+
val mainBuild = builds.get(Scope.Main).get
112+
val toolkitDep =
113+
mainBuild.options.classPathOptions.extraDependencies.toSeq.headOption.map(_.value).get
117114
expect(toolkitDep.organization == Constants.toolkitOrganization)
118115
expect(toolkitDep.name == Constants.toolkitName)
119116
expect(toolkitDep.version == expectedVersion)
120-
val Some(testBuild) = builds.get(Scope.Test)
121-
val Some(toolkitTestDep) =
122-
testBuild.options.classPathOptions.extraDependencies.toSeq.headOption.map(_.value)
117+
val testBuild = builds.get(Scope.Test).get
118+
val toolkitTestDep =
119+
testBuild.options.classPathOptions.extraDependencies.toSeq.headOption.map(_.value).get
123120
expect(toolkitTestDep.organization == Constants.toolkitOrganization)
124121
expect(toolkitTestDep.name == Constants.toolkitTestName)
125122
expect(toolkitTestDep.version == expectedVersion)
@@ -138,6 +135,7 @@ class DirectiveTests extends TestUtil.ScalaCliBuildSuite {
138135
maybeBuilds match
139136
case Left(ToolkitDirectiveMissingVersionError(_, errorKey)) =>
140137
expect(errorKey == toolkitDirectiveKey)
138+
case _ => sys.error("should not happen")
141139
}
142140
}
143141
for (scope <- Scope.all) {
@@ -350,10 +348,10 @@ class DirectiveTests extends TestUtil.ScalaCliBuildSuite {
350348
os.rel / dummySourcesJar -> "dummy-sources"
351349
).withBuild(baseOptions, buildThreads, bloopConfigOpt) {
352350
(root, _, maybeBuild) =>
353-
val build = maybeBuild.orThrow
354-
val Some(jar) = build.options.classPathOptions.extraClassPath.headOption
351+
val build = maybeBuild.orThrow
352+
val jar = build.options.classPathOptions.extraClassPath.head
355353
expect(jar == root / dummyJar)
356-
val Some(sourceJar) = build.options.classPathOptions.extraSourceJars.headOption
354+
val sourceJar = build.options.classPathOptions.extraSourceJars.head
357355
expect(sourceJar == root / dummySourcesJar)
358356
}
359357
}
@@ -466,7 +464,10 @@ class DirectiveTests extends TestUtil.ScalaCliBuildSuite {
466464
errors match {
467465
case error: CompositeBuildException =>
468466
expect(error.exceptions.length == 2)
469-
expect(error.exceptions.forall(_.isInstanceOf[FetchingDependenciesError]))
467+
expect(error.exceptions.forall {
468+
case _: FetchingDependenciesError => true
469+
case _ => false
470+
})
470471
expect(error.exceptions.forall(_.positions.length == 1))
471472

472473
{
@@ -516,7 +517,7 @@ class DirectiveTests extends TestUtil.ScalaCliBuildSuite {
516517
|""".stripMargin
517518
)
518519
testInputs.withBuild(Scala322Options, buildThreads, bloopConfigOpt, scope = Scope.Test) {
519-
(root, _, maybeBuild) => expect(maybeBuild.exists(_.success))
520+
(_, _, maybeBuild) => expect(maybeBuild.exists(_.success))
520521
}
521522
}
522523
}

0 commit comments

Comments
 (0)