NIT convert some source JAR integration to unit tests

Author: Gedochao

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

@@ -290,4 +290,39 @@ class DirectiveTests extends munit.FunSuite {
  }
  }
 
+ def testSourceJar(getDirectives: (String, String) => String): Unit = {
+ val dummyJar = "Dummy.jar"
+ val dummySourcesJar = "Dummy-sources.jar"
+ TestInputs(
+ os.rel / "Main.scala" ->
+ s"""${getDirectives(dummyJar, dummySourcesJar)}
+ |object Main extends App {
+ | println("Hello")
+ |}
+ |""".stripMargin,
+ os.rel / dummyJar -> "dummy",
+ os.rel / dummySourcesJar -> "dummy-sources"
+ ).withBuild(baseOptions, buildThreads, bloopConfigOpt) {
+ (root, _, maybeBuild) =>
+ val build = maybeBuild.orThrow
+ val Some(jar) = build.options.classPathOptions.extraClassPath.headOption
+ expect(jar == root / dummyJar)
+ val Some(sourceJar) = build.options.classPathOptions.extraSourceJars.headOption
+ expect(sourceJar == root / dummySourcesJar)
+ }
+ }
+
+ test("source jar") {
+ testSourceJar((dummyJar, dummySourcesJar) =>
+ s"""//> using jar $dummyJar
+ |//> using sourceJar $dummySourcesJar""".stripMargin
+ )
+ }
+
+ test("assumed source jar") {
+ testSourceJar((dummyJar, dummySourcesJar) =>
+ s"//> using jars $dummyJar $dummySourcesJar"
+ )
+ }
+
 }

modules/integration/src/test/scala/scala/cli/integration/BspTestDefinitions.scala

@@ -1460,28 +1460,12 @@ abstract class BspTestDefinitions(val scalaVersionOpt: Option[String])
  testSourceJars(getBspOptions = sourceJarPath => List("--source-jar", sourceJarPath.toString))
  }
 
- test("source jars handled correctly from a using directive") {
- testSourceJars(directives =
- """//> using jar Message.jar
- |//> using sourceJar Message-sources.jar""".stripMargin
- )
- }
-
  test(
  "source jars handled correctly from the command line smartly assuming a *-sources.jar is a source jar"
  ) {
  testSourceJars(getBspOptions = sourceJarPath => List("--extra-jar", sourceJarPath.toString))
  }
 
- test(
- "source jars handled correctly from a using directive smartly assuming a *-sources.jar is a source jar"
- ) {
- testSourceJars(directives =
- """//> using jar Message.jar
- |//> using jar Message-sources.jar""".stripMargin
- )
- }
-
  test("source jars handled correctly from a test scope using directive") {
  testSourceJars(
  directives = """//> using jar Message.jar