Update to Java commit b25992a (2017.04.25): Fix TNS-47: ensure file paths are canonical.

THis is a no-op for CLR, just updating the source files and then commenting out the new stuff.

Author: dmiller

src/clojure/tools/namespace/dir.clj

@@ -22,8 +22,10 @@
 (defn- find-files [dirs platform]
   (->> dirs
        (map make-dir-info)                         ;;; (map io/file)
+       ;;;                                         ;;; I have no idea if this is necessary. (map #(.getCanonicalFile ^File %))
        (filter #(.Exists ^DirectoryInfo %))             ;;; #(.exists ^File %)
-       (mapcat #(find/find-sources-in-dir % platform))))
+       (mapcat #(find/find-sources-in-dir % platform))
+       ))                                          ;;; ditto:  (map #(.getCanonicalFile ^File %))
 
 (defn- modified-files [tracker files]
   (filter #(DateTime/op_LessThan ^DateTime (::time tracker 0) (.LastWriteTimeUTC ^FileSystemInfo %)) files))         ;;; (.lastModified ^File %)

test/clojure/tools/namespace/dir_test.clj

@@ -0,0 +1,37 @@
+(ns clojure.tools.namespace.dir-test
+  (:require [clojure.test :refer [deftest is]]
+            [clojure.tools.namespace.test-helpers :as help]
+            [clojure.tools.namespace.dir :as dir])
+  #_(:import
+   (java.io File)))
+;;; I don't know what the equivalent test would be for .Net.
+#_(defn- make-symbolic-link
+  "Reflectively calls java.nio.file.Files/createSymbolicLink on two
+  java.io.File arguments, to avoid a compile-time dependency on
+  java.nio.file.Files. Returns a java.io.File."
+  [^File link ^File target]
+  (let [path-class (Class/forName "java.nio.file.Path")
+        attr-class (Class/forName "java.nio.file.attribute.FileAttribute")
+        attr-array (make-array attr-class 0)
+        attr-array-class (.getClass attr-array)
+        to-path (.getMethod java.io.File "toPath" (into-array Class []))
+        to-file (.getMethod path-class "toFile" (into-array Class []))
+        create-link (.getMethod (Class/forName "java.nio.file.Files")
+                                "createSymbolicLink"
+                                (into-array Class [path-class path-class attr-array-class]))
+        link-path (.invoke to-path link (object-array 0))
+        target-path (.invoke to-path target (object-array 0))
+        link (.invoke create-link path-class (object-array [link-path target-path attr-array]))]
+    (.invoke to-file link (object-array 0))))
+
+;; Only run this test on Java 1.7+, where java.nio.file.Files is available.
+#_(when (Class/forName "java.nio.file.Files")
+  (deftest t-scan-by-canonical-path
+    (let [dir (help/create-temp-dir "t-scan-by-canonical-path")
+          main-clj (help/create-source dir 'example.main :clj '[example.one])
+          one-cljc (help/create-source dir 'example.one :clj)
+          other-dir (help/create-temp-dir "t-scan-by-canonical-path-other")
+          link (File. other-dir "link")]
+      (make-symbolic-link link dir)
+      (is (= (::dir/files (dir/scan-dirs {} [dir]))
+             (::dir/files (dir/scan-dirs {} [link])))))))

test/clojure/tools/namespace/track_test.clj

@@ -18,7 +18,7 @@
   (let [y (add (tracker) '{ a #{b} b #{c d}})
         w (add y '{a #{c} b #{e} d #{f g}})]
 	(is (equal-dep-map? y '(b a) '(a b) '{b #{c d}, a #{b}} '{d #{b}, c #{b}, b #{a}}))                  ;;; ordering diff on unload: '(b a)
-	(is (equal-dep-map? w '(a d b) '(a b d) '{d #{f g}, b #{e}, a #{c}} '{g #{d}, f #{d}, e #{b}, d #{b}, c #{b a}, b #{a}}))))
+	(is (equal-dep-map? w '(a b d) '(a b d) '{d #{f g}, b #{e}, a #{c}} '{g #{d}, f #{d}, e #{b}, d #{b}, c #{b a}, b #{a}}))))  ;; ordering diff on unload: '(a d b))
 
 (deftest t-remove
   (let [y (add (tracker) '{ a #{b} b #{c d}})