KTOR-7846 Fix running tests against JDK 8 #4502
Merged
+646
−114
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
osipxd
force-pushed
the
osipxd/jdk-8-tests
branch
3 times, most recently
from
0cf9e9c
to
d146768
Compare
osipxd
commented
Nov 25, 2024
| * On Java 8 PropertyResourceBundle requires properties to be encoded in ISO-8859-1, | ||
| * while starting from Java 9 the default encoding is UTF-8. | ||
| */ | ||
| private fun String.fixJava8Encoding(): String = this.toByteArray(Charsets.ISO_8859_1).toString(Charsets.UTF_8) |
There was a problem hiding this comment.
Should this "fix" be applied inside i18n implementation? Or we assume that users know that bundles should be in a different encoding on Java 8?
osipxd
force-pushed
the
osipxd/jdk-8-tests
branch
from
d146768
to
3537e41
Compare
e5l
approved these changes
Nov 29, 2024
| // so we have to check the path is not empty to not get an `ArrayIndexOutOfBoundsException` | ||
| if (this.nameCount == 0) return normalized | ||
|
|
||
| return this.resolve(normalized) |
| * while starting from Java 9 the default encoding is UTF-8. | ||
| */ | ||
| private fun String.fixJava8Encoding(): String { | ||
| return if (System.getProperty("java.version").startsWith("1.8")) { |
There was a problem hiding this comment.
please consider extracting to the top level field
osipxd
force-pushed
the
osipxd/jdk-8-tests
branch
from
3537e41
to
dc57d34
Compare
osipxd
force-pushed
the
osipxd/jdk-8-tests
branch
from
dc57d34
to
67b7968
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Subsystem
Test Infrastructure
Motivation
KTOR-7846 Fix running tests against Java 8 on CI
Solution
Fix problems making tests incompatible with Java 8 and remove
testJdk.coerceAtLeast(11)from tests toolchain configuration.It is better to review commit-by-commit