Add file stream stubs to clean translator tests

Author: shai-almog

vm/tests/src/test/java/com/codename1/tools/translator/CleanTargetIntegrationTest.java

@@ -268,7 +268,9 @@ static void patchFileHeader(Path srcRoot) throws IOException {
         String content = new String(Files.readAllBytes(fileHeader), StandardCharsets.UTF_8);
         String updated = content
                 .replace("get_static_java_io_File_separator();", "get_static_java_io_File_separator(CODENAME_ONE_THREAD_STATE);")
-                .replace("get_static_java_io_File_separatorChar();", "get_static_java_io_File_separatorChar(CODENAME_ONE_THREAD_STATE);");
+                .replace("get_static_java_io_File_separatorChar();", "get_static_java_io_File_separatorChar(CODENAME_ONE_THREAD_STATE);")
+                .replace("get_static_java_io_File_pathSeparator();", "get_static_java_io_File_pathSeparator(CODENAME_ONE_THREAD_STATE);")
+                .replace("get_static_java_io_File_pathSeparatorChar();", "get_static_java_io_File_pathSeparatorChar(CODENAME_ONE_THREAD_STATE);");
         if (!updated.equals(content)) {
             Files.write(fileHeader, updated.getBytes(StandardCharsets.UTF_8));
         }

vm/tests/src/test/java/com/codename1/tools/translator/ReadWriteLockIntegrationTest.java

@@ -143,6 +143,9 @@ private void writeMockJavaClasses(Path sourceDir) throws Exception {
                 "    public final native Class<?> getClass();\n" +
                 "}\n").getBytes(StandardCharsets.UTF_8));
 
+        // java.lang.AutoCloseable
+        Files.write(lang.resolve("AutoCloseable.java"), "package java.lang; public interface AutoCloseable { void close() throws java.io.IOException; }".getBytes(StandardCharsets.UTF_8));
+
         // java.lang.String
         Files.write(lang.resolve("String.java"), ("package java.lang;\n" +
                 "public class String {\n" +
@@ -296,6 +299,90 @@ private void writeMockJavaClasses(Path sourceDir) throws Exception {
         // java.io.Serializable
         Files.write(io.resolve("Serializable.java"), "package java.io; public interface Serializable {}".getBytes(StandardCharsets.UTF_8));
 
+        // java.io.IOException
+        Files.write(io.resolve("IOException.java"), "package java.io; public class IOException extends Exception { public IOException() {} public IOException(String s) { super(s); } }".getBytes(StandardCharsets.UTF_8));
+
+        // java.io.InputStream
+        Files.write(io.resolve("InputStream.java"), ("package java.io;\n" +
+                "public class InputStream implements java.lang.AutoCloseable {\n" +
+                "    public InputStream() {}\n" +
+                "    public int available() throws IOException { return 0; }\n" +
+                "    public int read() throws IOException { return -1; }\n" +
+                "    public int read(byte[] b, int off, int len) throws IOException { return read(); }\n" +
+                "    public long skip(long n) throws IOException { return 0; }\n" +
+                "    public void close() throws IOException {}\n" +
+                "    public synchronized void mark(int readlimit) {}\n" +
+                "    public void reset() throws IOException { throw new IOException(); }\n" +
+                "    public boolean markSupported() { return false; }\n" +
+                "}\n").getBytes(StandardCharsets.UTF_8));
+
+        // java.io.OutputStream
+        Files.write(io.resolve("OutputStream.java"), ("package java.io;\n" +
+                "public class OutputStream implements java.lang.AutoCloseable {\n" +
+                "    public OutputStream() {}\n" +
+                "    public void write(int b) throws IOException {}\n" +
+                "    public void write(byte[] b, int off, int len) throws IOException {\n" +
+                "        for (int i = 0; i < len; i++) { write(b[off + i]); }\n" +
+                "    }\n" +
+                "    public void flush() throws IOException {}\n" +
+                "    public void close() throws IOException {}\n" +
+                "}\n").getBytes(StandardCharsets.UTF_8));
+
+        // java.io.File streams
+        Files.write(io.resolve("FileInputStream.java"), ("package java.io;\n" +
+                "public class FileInputStream extends InputStream {\n" +
+                "    private long handle;\n" +
+                "    private boolean closed;\n" +
+                "    public FileInputStream(String name) throws IOException { this(name == null ? null : new File(name)); }\n" +
+                "    public FileInputStream(File file) throws IOException {\n" +
+                "        if (file == null) throw new NullPointerException();\n" +
+                "        this.handle = openImpl(file.getPath());\n" +
+                "        if (this.handle == 0) throw new IOException();\n" +
+                "    }\n" +
+                "    public int read() throws IOException { byte[] b = new byte[1]; int c = read(b,0,1); return c <= 0 ? -1 : b[0] & 0xff; }\n" +
+                "    public int read(byte[] b, int off, int len) throws IOException { if (closed) throw new IOException(); return readImpl(handle, b, off, len); }\n" +
+                "    public long skip(long n) throws IOException { if (closed) throw new IOException(); return skipImpl(handle, n); }\n" +
+                "    public int available() throws IOException { if (closed) throw new IOException(); return availableImpl(handle); }\n" +
+                "    public void close() throws IOException { if (!closed) { closed = true; closeImpl(handle); handle = 0; } }\n" +
+                "    private static native long openImpl(String path) throws IOException;\n" +
+                "    private static native int readImpl(long handle, byte[] b, int off, int len) throws IOException;\n" +
+                "    private static native long skipImpl(long handle, long n) throws IOException;\n" +
+                "    private static native int availableImpl(long handle) throws IOException;\n" +
+                "    private static native void closeImpl(long handle) throws IOException;\n" +
+                "}\n").getBytes(StandardCharsets.UTF_8));
+
+        Files.write(io.resolve("FileOutputStream.java"), ("package java.io;\n" +
+                "public class FileOutputStream extends OutputStream {\n" +
+                "    private long handle;\n" +
+                "    private boolean closed;\n" +
+                "    public FileOutputStream(String name) throws IOException { this(name, false); }\n" +
+                "    public FileOutputStream(String name, boolean append) throws IOException { this(name == null ? null : new File(name), append); }\n" +
+                "    public FileOutputStream(File file) throws IOException { this(file, false); }\n" +
+                "    public FileOutputStream(File file, boolean append) throws IOException {\n" +
+                "        if (file == null) throw new NullPointerException();\n" +
+                "        this.handle = openImpl(file.getPath(), append);\n" +
+                "        if (this.handle == 0) throw new IOException();\n" +
+                "    }\n" +
+                "    public void write(int b) throws IOException { byte[] tmp = new byte[]{(byte)b}; write(tmp,0,1); }\n" +
+                "    public void write(byte[] b, int off, int len) throws IOException { if (closed) throw new IOException(); writeImpl(handle, b, off, len); }\n" +
+                "    public void flush() throws IOException { if (closed) throw new IOException(); flushImpl(handle); }\n" +
+                "    public void close() throws IOException { if (!closed) { closed = true; flushImpl(handle); closeImpl(handle); handle = 0; } }\n" +
+                "    private static native long openImpl(String path, boolean append) throws IOException;\n" +
+                "    private static native void writeImpl(long handle, byte[] b, int off, int len) throws IOException;\n" +
+                "    private static native void flushImpl(long handle) throws IOException;\n" +
+                "    private static native void closeImpl(long handle) throws IOException;\n" +
+                "}\n").getBytes(StandardCharsets.UTF_8));
+
+        Files.write(io.resolve("FileWriter.java"), ("package java.io;\n" +
+                "public class FileWriter {\n" +
+                "    private final FileOutputStream out;\n" +
+                "    public FileWriter(String name) throws IOException { this.out = new FileOutputStream(name); }\n" +
+                "    public FileWriter(File file) throws IOException { this.out = new FileOutputStream(file); }\n" +
+                "    public void write(String s) throws IOException { if (s == null) return; byte[] data = s.getBytes(); out.write(data, 0, data.length); }\n" +
+                "    public void flush() throws IOException { out.flush(); }\n" +
+                "    public void close() throws IOException { out.close(); }\n" +
+                "}\n").getBytes(StandardCharsets.UTF_8));
+
         // Minimal java.io.File to satisfy translator native headers
         Files.write(io.resolve("File.java"), ("package java.io;\n" +
                 "public class File {\n" +

vm/tests/src/test/java/com/codename1/tools/translator/StampedLockIntegrationTest.java

@@ -152,6 +152,9 @@ private void writeMockJavaClasses(Path sourceDir) throws Exception {
                 "    public final native Class<?> getClass();\n" +
                 "}\n").getBytes(StandardCharsets.UTF_8));
 
+        // java.lang.AutoCloseable
+        Files.write(lang.resolve("AutoCloseable.java"), "package java.lang; public interface AutoCloseable { void close() throws java.io.IOException; }".getBytes(StandardCharsets.UTF_8));
+
         // java.lang.String
         Files.write(lang.resolve("String.java"), ("package java.lang;\n" +
                 "public class String {\n" +
@@ -286,6 +289,35 @@ private void writeMockJavaClasses(Path sourceDir) throws Exception {
         // java.io.Serializable
         Files.write(io.resolve("Serializable.java"), "package java.io; public interface Serializable {}".getBytes(StandardCharsets.UTF_8));
 
+        // java.io.IOException
+        Files.write(io.resolve("IOException.java"), "package java.io; public class IOException extends Exception { public IOException() {} public IOException(String s) { super(s); } }".getBytes(StandardCharsets.UTF_8));
+
+        // java.io.InputStream
+        Files.write(io.resolve("InputStream.java"), ("package java.io;\n" +
+                "public class InputStream implements java.lang.AutoCloseable {\n" +
+                "    public InputStream() {}\n" +
+                "    public int available() throws IOException { return 0; }\n" +
+                "    public int read() throws IOException { return -1; }\n" +
+                "    public int read(byte[] b, int off, int len) throws IOException { return read(); }\n" +
+                "    public long skip(long n) throws IOException { return 0; }\n" +
+                "    public void close() throws IOException {}\n" +
+                "    public synchronized void mark(int readlimit) {}\n" +
+                "    public void reset() throws IOException { throw new IOException(); }\n" +
+                "    public boolean markSupported() { return false; }\n" +
+                "}\n").getBytes(StandardCharsets.UTF_8));
+
+        // java.io.OutputStream
+        Files.write(io.resolve("OutputStream.java"), ("package java.io;\n" +
+                "public class OutputStream implements java.lang.AutoCloseable {\n" +
+                "    public OutputStream() {}\n" +
+                "    public void write(int b) throws IOException {}\n" +
+                "    public void write(byte[] b, int off, int len) throws IOException {\n" +
+                "        for (int i = 0; i < len; i++) { write(b[off + i]); }\n" +
+                "    }\n" +
+                "    public void flush() throws IOException {}\n" +
+                "    public void close() throws IOException {}\n" +
+                "}\n").getBytes(StandardCharsets.UTF_8));
+
         // Minimal java.io.File to satisfy translator native headers
         Files.write(io.resolve("File.java"), ("package java.io;\n" +
                 "public class File {\n" +
@@ -341,29 +373,47 @@ private void writeMockJavaClasses(Path sourceDir) throws Exception {
                 "}\n").getBytes(StandardCharsets.UTF_8));
 
         Files.write(io.resolve("FileInputStream.java"), ("package java.io;\n" +
-                "public class FileInputStream {\n" +
-                "    public FileInputStream(String name) { open(name); }\n" +
-                "    public FileInputStream(File file) { open(file); }\n" +
-                "    public native int read();\n" +
-                "    public native int read(byte[] b, int off, int len);\n" +
-                "    public native long skip(long n);\n" +
-                "    public native int available();\n" +
-                "    public native void close();\n" +
-                "    private native void open(String name);\n" +
-                "    private native void open(File file);\n" +
+                "public class FileInputStream extends InputStream {\n" +
+                "    private long handle;\n" +
+                "    private boolean closed;\n" +
+                "    public FileInputStream(String name) throws IOException { this(name == null ? null : new File(name)); }\n" +
+                "    public FileInputStream(File file) throws IOException {\n" +
+                "        if (file == null) throw new NullPointerException();\n" +
+                "        this.handle = openImpl(file.getPath());\n" +
+                "        if (this.handle == 0) throw new IOException();\n" +
+                "    }\n" +
+                "    public int read() throws IOException { byte[] b = new byte[1]; int c = read(b,0,1); return c <= 0 ? -1 : b[0] & 0xff; }\n" +
+                "    public int read(byte[] b, int off, int len) throws IOException { if (closed) throw new IOException(); return readImpl(handle, b, off, len); }\n" +
+                "    public long skip(long n) throws IOException { if (closed) throw new IOException(); return skipImpl(handle, n); }\n" +
+                "    public int available() throws IOException { if (closed) throw new IOException(); return availableImpl(handle); }\n" +
+                "    public void close() throws IOException { if (!closed) { closed = true; closeImpl(handle); handle = 0; } }\n" +
+                "    private static native long openImpl(String path) throws IOException;\n" +
+                "    private static native int readImpl(long handle, byte[] b, int off, int len) throws IOException;\n" +
+                "    private static native long skipImpl(long handle, long n) throws IOException;\n" +
+                "    private static native int availableImpl(long handle) throws IOException;\n" +
+                "    private static native void closeImpl(long handle) throws IOException;\n" +
                 "}\n").getBytes(StandardCharsets.UTF_8));
 
         Files.write(io.resolve("FileOutputStream.java"), ("package java.io;\n" +
-                "public class FileOutputStream {\n" +
-                "    public FileOutputStream(String name) { open(name, false); }\n" +
-                "    public FileOutputStream(String name, boolean append) { open(name, append); }\n" +
-                "    public FileOutputStream(File file) { open(file.getPath(), false); }\n" +
-                "    public FileOutputStream(File file, boolean append) { open(file.getPath(), append); }\n" +
-                "    public native void write(int b);\n" +
-                "    public native void write(byte[] b, int off, int len);\n" +
-                "    public native void flush();\n" +
-                "    public native void close();\n" +
-                "    private native void open(String name, boolean append);\n" +
+                "public class FileOutputStream extends OutputStream {\n" +
+                "    private long handle;\n" +
+                "    private boolean closed;\n" +
+                "    public FileOutputStream(String name) throws IOException { this(name, false); }\n" +
+                "    public FileOutputStream(String name, boolean append) throws IOException { this(name == null ? null : new File(name), append); }\n" +
+                "    public FileOutputStream(File file) throws IOException { this(file, false); }\n" +
+                "    public FileOutputStream(File file, boolean append) throws IOException {\n" +
+                "        if (file == null) throw new NullPointerException();\n" +
+                "        this.handle = openImpl(file.getPath(), append);\n" +
+                "        if (this.handle == 0) throw new IOException();\n" +
+                "    }\n" +
+                "    public void write(int b) throws IOException { byte[] tmp = new byte[]{(byte)b}; write(tmp,0,1); }\n" +
+                "    public void write(byte[] b, int off, int len) throws IOException { if (closed) throw new IOException(); writeImpl(handle, b, off, len); }\n" +
+                "    public void flush() throws IOException { if (closed) throw new IOException(); flushImpl(handle); }\n" +
+                "    public void close() throws IOException { if (!closed) { closed = true; flushImpl(handle); closeImpl(handle); handle = 0; } }\n" +
+                "    private static native long openImpl(String path, boolean append) throws IOException;\n" +
+                "    private static native void writeImpl(long handle, byte[] b, int off, int len) throws IOException;\n" +
+                "    private static native void flushImpl(long handle) throws IOException;\n" +
+                "    private static native void closeImpl(long handle) throws IOException;\n" +
                 "}\n").getBytes(StandardCharsets.UTF_8));
 
         Files.write(io.resolve("FileWriter.java"), ("package java.io;\n" +