Add tests for the directories-jni module

Running on both JDK 8 and 23 too

Author: alexarchambault

build.sc

@@ -90,6 +90,22 @@ object `directories-jni` extends JavaModule with DirectoriesPublishModule {
   def javacOptions = super.javacOptions() ++ Seq(
     "--release", "8"
   )
+
+  def localRepo = Task {
+    val dest = Task.dest
+
+    new LocalIvyPublisher(T.dest).publishLocal(
+      jar = jar().path,
+      sourcesJar = sourceJar().path,
+      docJar = docJar().path,
+      pom = pom().path,
+      ivy = ivy().path,
+      artifact = artifactMetadata(),
+      extras = extraPublish()
+    )
+
+    PathRef(dest)
+  }
 }
 
 object jdk23 extends JavaModule {
@@ -131,4 +147,38 @@ trait Tests extends Cross.Module[String] with JavaModule {
   }
 }
 
-object tests extends Cross[Tests]("8", "default")
+trait TestsJni extends Cross.Module[String] with JavaModule {
+  def zincWorker = crossValue match {
+    case "8" => ModuleRef(java8ZincWorker)
+    case "default" => super.zincWorker
+  }
+
+  def ivyDeps = Agg(
+    ivy"${`directories-jni`.pomSettings().organization}:directories-jni:${`directories-jni`.publishVersion()}"
+  )
+  def repositoriesTask = Task.Anon {
+    Seq(
+      coursier.parse.RepositoryParser.repository(
+        "ivy:" + directories.localRepo().path.toNIO.toUri.toASCIIString + "[defaultPattern]"
+      ).fold(err => throw new Exception(err), x => x),
+      coursier.parse.RepositoryParser.repository(
+        "ivy:" + `directories-jni`.localRepo().path.toNIO.toUri.toASCIIString + "[defaultPattern]"
+      ).fold(err => throw new Exception(err), x => x)
+    ) ++ super.repositoriesTask()
+  }
+
+  object test extends JavaTests {
+    def ivyDeps = super.ivyDeps() ++ Agg(
+      ivy"junit:junit:4.13",
+      ivy"com.novocode:junit-interface:0.11"
+    )
+    def testFramework = "com.novocode.junit.JUnitFramework"
+  }
+}
+
+object tests extends Cross[Tests]("8", "default")
+
+object `tests-jni` extends Cross[TestsJni](
+  if (Properties.isWin) Seq("8", "default")
+  else Seq.empty[String]
+)

directories-jni/src/dev/dirs/jni/WindowsJni.java

@@ -16,7 +16,13 @@ public String[] winDirs(String... folderIds) {
   }
 
   public static Supplier<Windows> getJdkAwareSupplier() {
-    int jdkVersion = Integer.parseInt(System.getProperty("java.version", "0"));
+    String javaVersion = System.getProperty("java.version", "0");
+    if (javaVersion.substring(0, "1.".length()).equals("1."))
+      javaVersion = javaVersion.substring("1.".length());
+    int dotIdx = javaVersion.indexOf('.');
+    if (dotIdx >= 0)
+      javaVersion = javaVersion.substring(0, dotIdx);
+    int jdkVersion = Integer.parseInt(javaVersion);
     if (jdkVersion >= 23)
       return Windows.getDefaultSupplier();
     else

src/main/java/dev/dirs/BaseDirectories.java

@@ -4,6 +4,8 @@
 import dev.dirs.impl.Util;
 import dev.dirs.impl.Windows;
 
+import java.util.function.Supplier;
+
 /** {@code BaseDirectories} provides paths of user-invisible standard directories, following the conventions of the operating system the library is running on.
   * <p>
   * To compute the location of cache, config or data directories for individual projects or applications, use {@link ProjectDirectories} instead.
@@ -245,10 +247,14 @@ public final class BaseDirectories {
     * @return A new {@code BaseDirectories} instance.
     */
   public static BaseDirectories get() {
-    return new BaseDirectories();
+    return new BaseDirectories(Windows.getDefaultSupplier());
+  }
+
+  public static BaseDirectories get(Supplier<Windows> windows) {
+    return new BaseDirectories(windows);
   }
 
-  private BaseDirectories() {
+  private BaseDirectories(Supplier<Windows> windows) {
     switch (Constants.operatingSystem) {
       case Constants.LIN:
       case Constants.BSD:
@@ -275,7 +281,7 @@ private BaseDirectories() {
         runtimeDir    = null;
         break;
       case Constants.WIN:
-        String[] winDirs = Windows.getWinDirs("5E6C858F-0E22-4760-9AFE-EA3317B67173", "3EB685DB-65F9-4CF6-A03A-E3EF65729F3D", "F1B32785-6FBA-4FCF-9D55-7B8E7F157091");
+        String[] winDirs = windows.get().winDirs("5E6C858F-0E22-4760-9AFE-EA3317B67173", "3EB685DB-65F9-4CF6-A03A-E3EF65729F3D", "F1B32785-6FBA-4FCF-9D55-7B8E7F157091");
         homeDir       = winDirs[0];
         dataDir       = winDirs[1];
         dataLocalDir  = winDirs[2];

src/main/java/dev/dirs/UserDirectories.java

@@ -4,6 +4,8 @@
 import dev.dirs.impl.Util;
 import dev.dirs.impl.Windows;
 
+import java.util.function.Supplier;
+
 /** {@code UserDirectories} provides paths of user-facing standard directories, following the conventions of the operating system the library is running on.
   *
   * <h2>Examples</h2>
@@ -297,10 +299,14 @@ public final class UserDirectories {
     * @return A new {@code UserDirectories} instance.
     */
   public static UserDirectories get() {
-     return new UserDirectories();
+     return get(Windows.getDefaultSupplier());
+   }
+
+  public static UserDirectories get(Supplier<Windows> windows) {
+     return new UserDirectories(windows);
    }
 
-  private UserDirectories() {
+  private UserDirectories(Supplier<Windows> windows) {
     switch (Constants.operatingSystem) {
       case Constants.LIN:
       case Constants.BSD:
@@ -343,7 +349,7 @@ private UserDirectories() {
         videoDir      = homeDir + "/Movies";
         break;
       case Constants.WIN:
-        String[] winDirs = Windows.getWinDirs(
+        String[] winDirs = windows.get().winDirs(
             "5E6C858F-0E22-4760-9AFE-EA3317B67173",
             "4BD8D571-6D19-48D3-BE97-422220080E43",
             "B4BFCC3A-DB2C-424C-B029-7FE99A87C641",

tests-jni/test/src/dev/dirs/jni/DirectoriesJniTest.java

@@ -0,0 +1,25 @@
+package dev.dirs.jni;
+
+import dev.dirs.*;
+import org.junit.Test;
+
+public final class DirectoriesJniTest {
+
+  @Test
+  public void testBaseDirectories() {
+    BaseDirectories baseDirs = BaseDirectories.get(WindowsJni.getJdkAwareSupplier());
+    System.out.println(baseDirs);
+  }
+
+  @Test
+  public void testUserDirectories() {
+    UserDirectories userDirs = UserDirectories.get(WindowsJni.getJdkAwareSupplier());
+    System.out.println(userDirs);
+  }
+
+  @Test
+  public void testProjectDirectories() {
+    ProjectDirectories projDirs = ProjectDirectories.from("org" /*qualifier*/, "Baz Corp" /*organization*/, "Foo Bar-App" /*project*/, WindowsJni.getJdkAwareSupplier());
+    System.out.println(projDirs);
+  }
+}

tests-jni/test/src/dev/dirs/jni/UtilJniTest.java

@@ -0,0 +1,34 @@
+package dev.dirs.jni;
+
+import dev.dirs.Constants;
+import org.junit.Test;
+
+import static org.junit.Assert.assertNotNull;
+
+public final class UtilJniTest {
+
+  static {
+    System.out.println("Tests Java version: " + System.getProperty("java.version"));
+  }
+
+  @Test
+  public void testPowershellOne() {
+    if (Constants.operatingSystem == 'w') {
+      String[] winDirs = WindowsJni.getJdkAwareSupplier().get().winDirs("3EB685DB-65F9-4CF6-A03A-E3EF65729F3D");
+      for (String winDir : winDirs) {
+        assertNotNull(winDir);
+      }
+    }
+  }
+
+  @Test
+  public void testPowershell() {
+    if (Constants.operatingSystem == 'w') {
+      String[] winDirs = WindowsJni.getJdkAwareSupplier().get().winDirs("3EB685DB-65F9-4CF6-A03A-E3EF65729F3D", "F1B32785-6FBA-4FCF-9D55-7B8E7F157091");
+      for (String winDir : winDirs) {
+        assertNotNull(winDir);
+      }
+    }
+  }
+
+}