Skip to content

Commit 62715a4

Browse files
committed
fix BuildToolDispatcherTest
1 parent 554a3e2 commit 62715a4

File tree

1 file changed

+36
-39
lines changed

1 file changed

+36
-39
lines changed

modules/core/src/test/scala/org/scalasteward/core/buildtool/BuildToolDispatcherTest.scala

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import org.scalasteward.core.mock.MockState.TraceEntry.{Cmd, Log}
1010
import org.scalasteward.core.repoconfig.{BuildRootConfig, RepoConfig}
1111
import org.scalasteward.core.scalafmt
1212
import org.scalasteward.core.scalafmt.scalafmtConfName
13+
import org.scalasteward.core.buildtool.scalacli.ScalaCliAlg
1314

1415
class BuildToolDispatcherTest extends FunSuite {
1516
test("getDependencies") {
@@ -28,37 +29,33 @@ class BuildToolDispatcherTest extends FunSuite {
2829
val (state, deps) =
2930
buildToolDispatcher.getDependencies(repo, repoConfig).runSA(initial).unsafeRunSync()
3031

32+
val allGreps = ScalaCliAlg.directives.map { search =>
33+
Cmd.git(
34+
repoDir,
35+
"grep",
36+
"-I",
37+
"--fixed-strings",
38+
"--files-with-matches",
39+
search
40+
)
41+
}
42+
3143
val expectedState = initial.copy(trace =
32-
Vector(
33-
Cmd("test", "-f", s"$repoDir/pom.xml"),
34-
Cmd("test", "-f", s"$repoDir/build.sc"),
35-
Cmd("test", "-f", s"$repoDir/build.sbt"),
36-
Cmd.git(
37-
repoDir,
38-
"grep",
39-
"-I",
40-
"--fixed-strings",
41-
"--files-with-matches",
42-
"//> using lib "
43-
),
44-
Cmd("test", "-f", s"$repoDir/mvn-build/pom.xml"),
45-
Cmd("test", "-f", s"$repoDir/mvn-build/build.sc"),
46-
Cmd("test", "-f", s"$repoDir/mvn-build/build.sbt"),
47-
Cmd.git(
48-
repoDir,
49-
"grep",
50-
"-I",
51-
"--fixed-strings",
52-
"--files-with-matches",
53-
"//> using lib "
54-
),
55-
Log("Get dependencies in . from sbt"),
56-
Cmd("read", s"$repoDir/project/build.properties"),
57-
Cmd("test", "-d", s"$repoDir/project"),
58-
Cmd("test", "-d", s"$repoDir/project/project"),
59-
Cmd("read", "classpath:StewardPlugin_1_0_0.scala"),
60-
Cmd("write", s"$repoDir/project/scala-steward-StewardPlugin_1_0_0.scala"),
61-
Cmd("write", s"$repoDir/project/project/scala-steward-StewardPlugin_1_0_0.scala"),
44+
Cmd("test", "-f", s"$repoDir/pom.xml") +:
45+
Cmd("test", "-f", s"$repoDir/build.sc") +:
46+
Cmd("test", "-f", s"$repoDir/build.sbt") +:
47+
allGreps ++:
48+
Cmd("test", "-f", s"$repoDir/mvn-build/pom.xml") +:
49+
Cmd("test", "-f", s"$repoDir/mvn-build/build.sc") +:
50+
Cmd("test", "-f", s"$repoDir/mvn-build/build.sbt") +:
51+
allGreps ++:
52+
Log("Get dependencies in . from sbt") +:
53+
Cmd("read", s"$repoDir/project/build.properties") +:
54+
Cmd("test", "-d", s"$repoDir/project") +:
55+
Cmd("test", "-d", s"$repoDir/project/project") +:
56+
Cmd("read", "classpath:StewardPlugin_1_0_0.scala") +:
57+
Cmd("write", s"$repoDir/project/scala-steward-StewardPlugin_1_0_0.scala") +:
58+
Cmd("write", s"$repoDir/project/project/scala-steward-StewardPlugin_1_0_0.scala") +:
6259
Cmd.execSandboxed(
6360
repoDir,
6461
"sbt",
@@ -67,26 +64,26 @@ class BuildToolDispatcherTest extends FunSuite {
6764
"-Dsbt.supershell=false",
6865
"-Dsbt.server.forcestart=true",
6966
s";$crossStewardDependencies;$reloadPlugins;$stewardDependencies"
70-
),
71-
Cmd("rm", "-rf", s"$repoDir/project/project/scala-steward-StewardPlugin_1_0_0.scala"),
72-
Cmd("rm", "-rf", s"$repoDir/project/scala-steward-StewardPlugin_1_0_0.scala"),
73-
Cmd("read", s"$repoDir/$scalafmtConfName"),
74-
Log("Get dependencies in mvn-build from Maven"),
67+
) +:
68+
Cmd("rm", "-rf", s"$repoDir/project/project/scala-steward-StewardPlugin_1_0_0.scala") +:
69+
Cmd("rm", "-rf", s"$repoDir/project/scala-steward-StewardPlugin_1_0_0.scala") +:
70+
Cmd("read", s"$repoDir/$scalafmtConfName") +:
71+
Log("Get dependencies in mvn-build from Maven") +:
7572
Cmd.execSandboxed(
7673
repoDir / "mvn-build",
7774
"mvn",
7875
maven.args.batchMode,
7976
maven.command.listDependencies,
8077
maven.args.excludeTransitive
81-
),
78+
) +:
8279
Cmd.execSandboxed(
8380
repoDir / "mvn-build",
8481
"mvn",
8582
maven.args.batchMode,
8683
maven.command.listRepositories
87-
),
88-
Cmd("read", s"$repoDir/mvn-build/$scalafmtConfName")
89-
)
84+
) +:
85+
Cmd("read", s"$repoDir/mvn-build/$scalafmtConfName") +:
86+
Vector.empty[MockState.TraceEntry]
9087
)
9188

9289
assertEquals(state, expectedState)

0 commit comments

Comments
 (0)