Skip to content

Commit 204f796

Browse files
Run publish tests for all Scala versions
1 parent 9b76b44 commit 204f796

File tree

4 files changed

+28
-9
lines changed

4 files changed

+28
-9
lines changed

modules/integration/src/test/scala/scala/cli/integration/PublishTests.scala renamed to modules/integration/src/test/scala/scala/cli/integration/PublishTestDefinitions.scala

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ import java.util.zip.ZipFile
77

88
import scala.jdk.CollectionConverters._
99

10-
class PublishTests extends munit.FunSuite {
10+
abstract class PublishTestDefinitions(val scalaVersionOpt: Option[String])
11+
extends munit.FunSuite with TestScalaVersionArgs {
1112

12-
private def extraOptions = TestUtil.extraOptions
13+
private def extraOptions = scalaVersionArgs ++ TestUtil.extraOptions
1314

1415
test("simple") {
1516
val inputs = TestInputs(
@@ -22,8 +23,6 @@ class PublishTests extends munit.FunSuite {
2223
|//> using publish.license "Apache 2.0:http://opensource.org/licenses/Apache-2.0"
2324
|//> using publish.developer "someone|Someone||https://github.com/someone"
2425
|
25-
|//> using scala "3.1.1"
26-
|
2726
|package foo
2827
|
2928
|object Hello {
@@ -41,12 +40,15 @@ class PublishTests extends munit.FunSuite {
4140
)
4241
)
4342

43+
val scalaSuffix =
44+
if (actualScalaVersion.startsWith("3.")) "_3"
45+
else "_" + actualScalaVersion.split('.').take(2).mkString(".")
4446
val expectedArtifactsDir =
45-
os.rel / "org" / "virtuslab" / "scalacli" / "test" / "simple_3" / "0.2.0-SNAPSHOT"
47+
os.rel / "org" / "virtuslab" / "scalacli" / "test" / s"simple$scalaSuffix" / "0.2.0-SNAPSHOT"
4648
val baseExpectedArtifacts = Seq(
47-
"simple_3-0.2.0-SNAPSHOT.pom",
48-
"simple_3-0.2.0-SNAPSHOT.jar",
49-
"simple_3-0.2.0-SNAPSHOT-sources.jar"
49+
s"simple$scalaSuffix-0.2.0-SNAPSHOT.pom",
50+
s"simple$scalaSuffix-0.2.0-SNAPSHOT.jar",
51+
s"simple$scalaSuffix-0.2.0-SNAPSHOT-sources.jar"
5052
)
5153
val expectedArtifacts = baseExpectedArtifacts
5254
.flatMap { n =>
@@ -113,7 +115,7 @@ class PublishTests extends munit.FunSuite {
113115

114116
val repoArgs =
115117
Seq[os.Shellable]("-r", "!central", "-r", (root / "test-repo").toNIO.toUri.toASCIIString)
116-
val dep = "org.virtuslab.scalacli.test:simple_3:0.2.0-SNAPSHOT"
118+
val dep = s"org.virtuslab.scalacli.test:simple$scalaSuffix:0.2.0-SNAPSHOT"
117119
val res = os.proc(TestUtil.cs, "launch", repoArgs, dep).call(cwd = root)
118120
val output = res.out.text().trim
119121
expect(output == "Hello")
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package scala.cli.integration
2+
3+
// format: off
4+
class PublishTests212 extends PublishTestDefinitions(
5+
scalaVersionOpt = Some(Constants.scala212)
6+
)
7+
// format: on
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package scala.cli.integration
2+
3+
// format: off
4+
class PublishTests213 extends PublishTestDefinitions(
5+
scalaVersionOpt = Some(Constants.scala213)
6+
)
7+
// format: on
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package scala.cli.integration
2+
3+
class PublishTestsDefault extends PublishTestDefinitions(scalaVersionOpt = None)

0 commit comments

Comments
 (0)