Use Java 8 compatible file reads in integration tests

shai-almog · shai-almog · commit f829c6982e08 · 2025-12-28T13:16:17.000+02:00
diff --git a/vm/tests/src/test/java/com/codename1/tools/translator/ReadWriteLockIntegrationTest.java b/vm/tests/src/test/java/com/codename1/tools/translator/ReadWriteLockIntegrationTest.java
@@ -762,7 +762,7 @@ private void patchHashMapNativeMethods(Path srcRoot) throws java.io.IOException
             return;
         }
 
-        String content = Files.readString(nativeMethods);
+        String content = new String(Files.readAllBytes(nativeMethods), StandardCharsets.UTF_8);
 
         content = content.replaceFirst("#include \\\"java_lang_System.h\\\"\\n\\n",
                 "#include \"java_lang_System.h\"\n\nJAVA_OBJECT java_lang_Class_getName___R_java_lang_String(CODENAME_ONE_THREAD_STATE, JAVA_OBJECT cls);\nJAVA_OBJECT java_lang_Throwable_getStack___R_java_lang_String(CODENAME_ONE_THREAD_STATE, JAVA_OBJECT t);\n\n");
diff --git a/vm/tests/src/test/java/com/codename1/tools/translator/StampedLockIntegrationTest.java b/vm/tests/src/test/java/com/codename1/tools/translator/StampedLockIntegrationTest.java
@@ -733,7 +733,7 @@ private void patchHashMapNativeMethods(Path srcRoot) throws java.io.IOException
             return;
         }
 
-        String content = Files.readString(nativeMethods);
+        String content = new String(Files.readAllBytes(nativeMethods), StandardCharsets.UTF_8);
 
         content = content.replaceFirst("#include \\\"java_lang_System.h\\\"\\n\\n",
                 "#include \"java_lang_System.h\"\n\nJAVA_OBJECT java_lang_Class_getName___R_java_lang_String(CODENAME_ONE_THREAD_STATE, JAVA_OBJECT cls);\nJAVA_OBJECT java_lang_Throwable_getStack___R_java_lang_String(CODENAME_ONE_THREAD_STATE, JAVA_OBJECT t);\n\n");

Original file line number	Diff line number	Diff line change
`@@ -762,7 +762,7 @@ private void patchHashMapNativeMethods(Path srcRoot) throws java.io.IOException`
`762`	`762`	`return;`
`763`	`763`	`}`
`764`	`764`
`765`		`- String content = Files.readString(nativeMethods);`
	`765`	`+ String content = new String(Files.readAllBytes(nativeMethods), StandardCharsets.UTF_8);`
`766`	`766`
`767`	`767`	`content = content.replaceFirst("#include \\\"java_lang_System.h\\\"\\n\\n",`
`768`	`768`	`"#include \"java_lang_System.h\"\n\nJAVA_OBJECT java_lang_Class_getName___R_java_lang_String(CODENAME_ONE_THREAD_STATE, JAVA_OBJECT cls);\nJAVA_OBJECT java_lang_Throwable_getStack___R_java_lang_String(CODENAME_ONE_THREAD_STATE, JAVA_OBJECT t);\n\n");`
Original file line number	Diff line number	Diff line change
`@@ -733,7 +733,7 @@ private void patchHashMapNativeMethods(Path srcRoot) throws java.io.IOException`
`733`	`733`	`return;`
`734`	`734`	`}`
`735`	`735`
`736`		`- String content = Files.readString(nativeMethods);`
	`736`	`+ String content = new String(Files.readAllBytes(nativeMethods), StandardCharsets.UTF_8);`
`737`	`737`
`738`	`738`	`content = content.replaceFirst("#include \\\"java_lang_System.h\\\"\\n\\n",`
`739`	`739`	`"#include \"java_lang_System.h\"\n\nJAVA_OBJECT java_lang_Class_getName___R_java_lang_String(CODENAME_ONE_THREAD_STATE, JAVA_OBJECT cls);\nJAVA_OBJECT java_lang_Throwable_getStack___R_java_lang_String(CODENAME_ONE_THREAD_STATE, JAVA_OBJECT t);\n\n");`