BugFix File.listFiles

bastie · Sep 7, 2024 · 970a054 · 970a054
1 parent 5647965
commit 970a054
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/Sources/JavApi/io/File.swift b/Sources/JavApi/io/File.swift
@@ -181,7 +181,7 @@ extension java.io {
       if let directoryContents = try? FileManager.default.contentsOfDirectory(atPath: self.getAbsoluteFile().toString()) {
         var result : [java.io.File] = [java.io.File]()
         for nextFile in directoryContents {
-          result.append(java.io.File(nextFile))
+          result.append(java.io.File("\(self.file)\(java.io.File.separator)\(nextFile)"))
         }
         return result
       }

diff --git a/Tests/JavApiTests/JavApi_io_File_Tests.swift b/Tests/JavApiTests/JavApi_io_File_Tests.swift
@@ -73,4 +73,32 @@ final class JavApi_io_File_Tests: XCTestCase {
     // TODO: Test missing for java.io.File on other platforms
 #endif
   }
+
+  /// Test agains JavApi 0.12.0 bug.
+  func testListFiles () {
+    let absoluteDir = "/Applications"
+    let appDir = java.io.File(absoluteDir)
+    if let apps = appDir.listFiles() {
+      for app in apps {
+        XCTAssert(app.getAbsolutePath().startsWith(absoluteDir))
+      }
+    }
+  }
+  class AppFilter : java.io.FileFilter {
+    func accept(_ file: JavApi.java.io.File) -> Bool {
+      return file.getName().endsWith(".app") && file.isDirectory()
+    }
+    typealias FileFilter = AppFilter
+  }
+  /// Test agains JavApi 0.12.0 bug.
+  func testListFilesWithFileFilter () {
+    let absoluteDir = "/Applications"
+    let appDir = java.io.File(absoluteDir)
+    if let apps = appDir.listFiles (AppFilter()) {
+      for app in apps {
+        XCTAssert(app.getAbsolutePath().startsWith(absoluteDir))
+        XCTAssert(app.getAbsolutePath().hasSuffix(".app"))
+      }
+    }
+  }
 }