Align Path signatures and harden native VM integration test

Author: shai-almog

vm/JavaAPI/src/java/nio/file/Path.java

@@ -7,7 +7,7 @@
 import java.net.URI;
 import java.util.Iterator;
 
-public interface Path extends Comparable<Path>, Iterable<Path> {
+public interface Path extends Comparable<Path>, Iterable<Path>, Watchable {
 
     FileSystem getFileSystem();
 
@@ -53,9 +53,9 @@ public interface Path extends Comparable<Path>, Iterable<Path> {
 
     File toFile();
 
-    Path register(WatchService watcher, WatchEvent.Kind<?>[] events, WatchEvent.Modifier... modifiers) throws java.io.IOException;
+    WatchKey register(WatchService watcher, WatchEvent.Kind<?>[] events, WatchEvent.Modifier... modifiers) throws java.io.IOException;
 
-    Path register(WatchService watcher, WatchEvent.Kind<?>... events) throws java.io.IOException;
+    WatchKey register(WatchService watcher, WatchEvent.Kind<?>... events) throws java.io.IOException;
 
     Iterator<Path> iterator();
 

vm/JavaAPI/src/java/nio/file/Paths.java

@@ -219,11 +219,11 @@ public java.io.File toFile() {
             return new java.io.File(rawPath);
         }
 
-        public Path register(WatchService watcher, WatchEvent.Kind<?>[] events, WatchEvent.Modifier... modifiers) throws java.io.IOException {
+        public WatchKey register(WatchService watcher, WatchEvent.Kind<?>[] events, WatchEvent.Modifier... modifiers) throws java.io.IOException {
             throw new java.io.IOException("WatchService not supported in JavaAPI");
         }
 
-        public Path register(WatchService watcher, WatchEvent.Kind<?>... events) throws java.io.IOException {
+        public WatchKey register(WatchService watcher, WatchEvent.Kind<?>... events) throws java.io.IOException {
             throw new java.io.IOException("WatchService not supported in JavaAPI");
         }
 

vm/JavaAPI/src/java/nio/file/WatchEvent.java

@@ -0,0 +1,16 @@
+package java.nio.file;
+
+public interface WatchEvent<T> {
+    Kind<T> kind();
+    int count();
+    T context();
+
+    interface Kind<T> {
+        String name();
+        Class<T> type();
+    }
+
+    interface Modifier {
+        String name();
+    }
+}

vm/JavaAPI/src/java/nio/file/WatchKey.java

@@ -0,0 +1,12 @@
+package java.nio.file;
+
+import java.nio.file.WatchEvent.Kind;
+import java.util.List;
+
+public interface WatchKey {
+    boolean isValid();
+    List<WatchEvent<?>> pollEvents();
+    boolean reset();
+    void cancel();
+    Watchable watchable();
+}

vm/JavaAPI/src/java/nio/file/WatchService.java

@@ -0,0 +1,12 @@
+package java.nio.file;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+public interface WatchService extends Closeable {
+    WatchKey poll();
+    WatchKey poll(long timeout, TimeUnit unit) throws InterruptedException;
+    WatchKey take() throws InterruptedException;
+    void close() throws IOException;
+}

vm/JavaAPI/src/java/nio/file/Watchable.java

@@ -0,0 +1,8 @@
+package java.nio.file;
+
+import java.io.IOException;
+
+public interface Watchable {
+    WatchKey register(WatchService watcher, WatchEvent.Kind<?>[] events, WatchEvent.Modifier... modifiers) throws IOException;
+    WatchKey register(WatchService watcher, WatchEvent.Kind<?>... events) throws IOException;
+}

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

@@ -188,6 +188,12 @@ static void replaceLibraryWithExecutableTarget(Path cmakeLists, String sourceDir
         Files.write(cmakeLists, replacement.getBytes(StandardCharsets.UTF_8));
     }
 
+    static void stripObjectiveC(Path cmakeLists) throws IOException {
+        String content = new String(Files.readAllBytes(cmakeLists), StandardCharsets.UTF_8);
+        content = content.replace(" OBJC", "");
+        Files.write(cmakeLists, content.getBytes(StandardCharsets.UTF_8));
+    }
+
     static String runCommand(List<String> command, Path workingDir) throws Exception {
         ProcessBuilder builder = new ProcessBuilder(command);
         builder.directory(workingDir.toFile());

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

@@ -50,6 +50,7 @@ void nativeVmCreatesFilesAndDirectories() throws Exception {
         CleanTargetIntegrationTest.patchCn1Globals(srcRoot);
         CleanTargetIntegrationTest.writeRuntimeStubs(srcRoot);
         CleanTargetIntegrationTest.replaceLibraryWithExecutableTarget(cmakeLists, srcRoot.getFileName().toString());
+        CleanTargetIntegrationTest.stripObjectiveC(cmakeLists);
 
         Path buildDir = distDir.resolve("build");
         Files.createDirectories(buildDir);