Skip to content

Commit 8f3c2e9

Browse files
committed
Move some test code to utils class
1 parent 9635628 commit 8f3c2e9

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

modules/build/src/test/scala/scala/build/input/InputsComposerTest.scala renamed to modules/build/src/test/scala/scala/build/input/compose/InputsComposerTest.scala

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package scala.build.input
1+
package scala.build.input.compose
22

33
import scala.build.Build
44
import scala.build.bsp.buildtargets.ProjectName
55
import scala.build.errors.BuildException
6+
import scala.build.input.ModuleInputs
67
import scala.build.input.compose.InputsComposer
78
import scala.build.internal.Constants
89
import scala.build.options.BuildOptions
@@ -51,16 +52,11 @@ class InputsComposerTest extends TestUtil.ScalaCliBuildSuite {
5152
)
5253

5354
testInputs.fromRoot { root =>
54-
val argsToInputs: (Seq[String], Option[ProjectName]) => Either[BuildException, ModuleInputs] =
55-
(args, projectNameOpt) => {
56-
assert(projectNameOpt.isDefined)
57-
val emptyInputs = ModuleInputs.empty(projectNameOpt.get.name)
58-
Right(Build.updateInputs(emptyInputs, BuildOptions()))
59-
}
55+
val argsToInputs = InputsComposerUtils.argsToEmptyModules
6056
val modules = InputsComposer(Seq(root.toString), root, argsToInputs, true)
6157
.getInputs
6258
.toSeq
63-
.flatten
59+
.head.modules
6460

6561
assert(modules.nonEmpty)
6662
assert(
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package scala.build.input.compose
2+
3+
import scala.build.Build
4+
import scala.build.options.BuildOptions
5+
import scala.build.bsp.buildtargets.ProjectName
6+
import scala.build.errors.BuildException
7+
import scala.build.input.ModuleInputs
8+
9+
object InputsComposerUtils {
10+
def argsToEmptyModules(args: Seq[String], projectNameOpt: Option[ProjectName]): Either[BuildException, ModuleInputs] = {
11+
assert(projectNameOpt.isDefined)
12+
val emptyInputs = ModuleInputs.empty(projectNameOpt.get.name)
13+
Right(Build.updateInputs(emptyInputs, BuildOptions()))
14+
}
15+
}

0 commit comments

Comments
 (0)