From 06c0105543ccd98ecbf29dd402851aa54adc8a43 Mon Sep 17 00:00:00 2001 From: Heiko Klare Date: Thu, 28 Mar 2024 14:45:28 +0100 Subject: [PATCH] Correct native charset in TestWorkspaceEncodingExistingWorkspace #128 TestWorkspaceEncodingExistingWorkspace retrieves the expected native charset via the "file.encoding" system property, but with Java 21 this always returns UTF-8 and the native encoding can be retrieved via "native.encoding" since Java 17. This change adapts the test to properly run with Java 21. Fixes https://github.com/eclipse-platform/eclipse.platform/issues/128 --- .../session/TestWorkspaceEncodingExistingWorkspace.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestWorkspaceEncodingExistingWorkspace.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestWorkspaceEncodingExistingWorkspace.java index 5c5551a9c3e..c13c3108754 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestWorkspaceEncodingExistingWorkspace.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestWorkspaceEncodingExistingWorkspace.java @@ -48,7 +48,7 @@ public TestWorkspaceEncodingExistingWorkspace() { } public void testExpectedEncoding1() throws Exception { - String defaultValue = System.getProperty("file.encoding"); + String defaultValue = System.getProperty("native.encoding"); IWorkspace workspace = ResourcesPlugin.getWorkspace(); // Should be system default