samepath: default non-java

Author: scivision

+stdlib/samepath.m

@@ -1,4 +1,4 @@
-function issame = samepath(path1, path2)
+function issame = samepath(path1, path2, use_java)
 %% samepath(path1, path)
 % true if inputs resolve to same path
 % files need not exist
@@ -10,13 +10,15 @@
 arguments
   path1 (1,1) string
   path2 (1,1) string
+  use_java (1,1) logical = false
 end
 
 issame = false;
 if ~stdlib.exists(path1) || ~stdlib.exists(path2)
   return
 end
 
+if use_java
 % needs absolute
 path1 = stdlib.absolute(path1, string.empty, false, true);
 path2 = stdlib.absolute(path2, string.empty, false, true);
@@ -28,4 +30,8 @@
 % alternative, lower-level method is lexical only (not suitable for us):
 % https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/io/File.html#equals(java.lang.Object)
 
+else
+  issame = stdlib.canonical(path1, false, false) == stdlib.canonical(path2, false, false);
+end
+
 end

test/TestFileImpure.m

@@ -79,33 +79,6 @@ function test_null_file(tc)
 end
 
 
-function test_is_regular_file(tc)
-import matlab.unittest.constraints.IsFile
-tc.assumeTrue(stdlib.has_java)
-if ~ispc
-  tc.assumeThat(stdlib.null_file, IsFile)
-end
-tc.verifyFalse(stdlib.is_regular_file(stdlib.null_file), "null file is not a regular file")
-
-end
-
-
-function test_touch_modtime(tc)
-tc.assumeTrue(stdlib.has_java)
-fn = tempname;
-tc.verifyTrue(stdlib.touch(fn))
-t0 = stdlib.get_modtime(fn);
-
-pause(1.)  % empirical to avoid failing >=.  0.4 failed intermittantly
-tc.verifyTrue(stdlib.set_modtime(fn))
-t1 = stdlib.get_modtime(fn);
-
-tc.verifyGreaterThanOrEqual(t1, t0)
-
-end
-
-
-
 function test_makedir(tc)
 import matlab.unittest.constraints.IsFolder
 d = tempname;
@@ -115,7 +88,6 @@ function test_makedir(tc)
 
 %%
 function test_samepath(tc, in_same, other_same, ref_same)
-tc.assumeTrue(stdlib.has_java)
 tc.verifyEqual(stdlib.samepath(in_same, other_same), ref_same)
 end
 

test/TestJava.m

@@ -64,24 +64,52 @@ function test_hard_link_count(tc)
 tc.verifyEmpty(stdlib.hard_link_count(tempname))
 end
 
+
 function test_is_parallel(tc)
 import matlab.unittest.constraints.IsOfClass
 tc.verifyThat(stdlib.is_parallel_worker, IsOfClass('logical'))
 end
 
+
 function test_ram(tc)
 tc.verifyGreaterThan(stdlib.ram_total(), 0)
 tc.verifyGreaterThan(stdlib.ram_free(), 0)
 end
 
+
 function test_cpu_count(tc)
 tc.verifyGreaterThan(stdlib.cpu_count(), 0)
 end
 
+
 function test_cpu_load(tc)
 tc.verifyGreaterThanOrEqual(stdlib.cpu_load(), 0)
 end
 
+
+function test_is_regular_file(tc)
+import matlab.unittest.constraints.IsFile
+if ~ispc
+  tc.assumeThat(stdlib.null_file, IsFile)
+end
+tc.verifyFalse(stdlib.is_regular_file(stdlib.null_file), "null file is not a regular file")
+
+end
+
+
+function test_touch_modtime(tc)
+fn = tempname;
+tc.verifyTrue(stdlib.touch(fn))
+t0 = stdlib.get_modtime(fn);
+
+pause(1.)  % empirical to avoid failing >=.  0.4 failed intermittantly
+tc.verifyTrue(stdlib.set_modtime(fn))
+t1 = stdlib.get_modtime(fn);
+
+tc.verifyGreaterThanOrEqual(t1, t0)
+end
+
+
 end
 
 end