8000 Move the require-jdk15 tests to require-jdk17. · scala-js/scala-js@352df74 · GitHub
[go: up one dir, main page]
Skip to content

Commit 352df74

Browse files
sjrdsjrd
committed
Move the require-jdk15 tests to require-jdk17.
This way, we only have `require-jdk*` directories for JDK versions that we actually test in our CI. They also correspond to JDK LTS versions, so they are not arbitrary.
1 parent 62068f4 commit 352df74

File tree

5 files changed

+2
-3
lines changed

5 files changed

+2
-3
lines changed

‎project/Build.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2126,7 +2126,6 @@ object Build {
21262126
List(sharedTestDir / "scala", sharedTestDir / "require-scala2") :::
21272127
collectionsEraDependentDirectory(scalaV, sharedTestDir) ::
21282128
includeIf(sharedTestDir / "require-jdk11", javaV >= 11) :::
2129-
includeIf(sharedTestDir / "require-jdk15", javaV >= 15) :::
21302129
includeIf(sharedTestDir / "require-jdk17", javaV >= 17) :::
21312130
includeIf(sharedTestDir / "require-jdk21", javaV >= 21) :::
21322131
includeIf(testDir / "require-scala2", isJSTest)

‎test-suite/shared/src/test/require-jdk15/org/scalajs/testsuite/javalib/io/InputStreamTestOnJDK15.scala renamed to ‎test-suite/shared/src/test/require-jdk17/org/scalajs/testsuite/javalib/io/InputStreamTestOnJDK17.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import org.junit.Assume._
2121
import org.scalajs.testsuite.utils.AssertThrows.assertThrows
2222
import org.scalajs.testsuite.utils.Platform
2323

24-
class InputStreamTestOnJDK15 {
24+
class InputStreamTestOnJDK17 {
2525
/** InputStream that only ever skips max bytes at once */
2626
def lowSkipStream(max: Int, seq: Seq[Int]): InputStream = new SeqInputStreamForTest(seq) {
2727
require(max > 0)

‎test-suite/shared/src/test/require-jdk15/org/scalajs/testsuite/javalib/lang/ConstableTest.scala renamed to ‎test-suite/shared/src/test/require-jdk17/org/scalajs/testsuite/javalib/lang/ConstableTest.scala

File renamed without changes.

‎test-suite/shared/src/test/require-jdk15/org/scalajs/testsuite/javalib/lang/ConstantDescTest.scala renamed to ‎test-suite/shared/src/test/require-jdk17/org/scalajs/testsuite/javalib/lang/ConstantDescTest.scala

File renamed without changes.

‎test-suite/shared/src/test/require-jdk15/org/scalajs/testsuite/javalib/lang/StringTestOnJDK15.scala renamed to ‎test-suite/shared/src/test/require-jdk17/org/scalajs/testsuite/javalib/lang/StringTestOnJDK17.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import org.junit.Assert._
1717

1818
import org.scalajs.testsuite.utils.AssertThrows.assertThrows
1919

20-
class StringTestOnJDK15 {
20+
class StringTestOnJDK17 {
2121

2222
// indent and transform are available since JDK 12 but we're not testing them separately
2323

0 commit comments

Comments
 (0)
0