Skip to content

Commit 68d8300

Browse files
Fix jdk test logic
1 parent de157d0 commit 68d8300

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

compat/src/test/scala/test/scala/collection/JdkVersionTest.scala

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,19 @@ class JdkVersionTest {
1010
val isOnCi = sys.env.get("CI").isDefined
1111
if (isOnCi) {
1212
val travisJdkVersion = sys.env("TRAVIS_JDK_VERSION")
13-
val jdkVersion = sys.props("java.specification.version")
13+
val obtained = sys.props("java.specification.version")
1414

1515
println(s"travisJdkVersion: $travisJdkVersion")
16-
println(s"jdkVersion: $jdkVersion")
16+
println(s"jdkVersion: $obtained")
1717

18-
if (travisJdkVersion == "openjdk6") {
19-
assertEquals(jdkVersion, "1.8")
20-
} else if (travisJdkVersion == "oraclejdk8") {
21-
assertEquals(jdkVersion, "1.6")
22-
} else {
23-
throw new Exception(s"Unknown CI jdk version: $travisJdkVersion")
18+
val expectedJdkVersion = Map(
19+
"openjdk6" -> "1.6",
20+
"oraclejdk8" -> "1.8"
21+
)
22+
23+
expectedJdkVersion.get(travisJdkVersion) match {
24+
case Some(expected) => assertEquals(obtained, expected)
25+
case None => throw new Exception(s"Unknown CI jdk version: $travisJdkVersion")
2426
}
2527
}
2628
}

0 commit comments

Comments
 (0)