CLJS-2304: Fix compiler infrastructure tests on Windows

Author: anmonteiro

src/main/clojure/cljs/closure.clj

@@ -1571,7 +1571,8 @@
     (util/ns->relpath (first provides) "js")
     (if (.endsWith lib-path ".js")
       (util/get-name url)
-      (let [path (util/path url)]
+      (let [path (util/path url)
+            lib-path (util/normalize-path lib-path)]
         (subs path (+ (inc (.lastIndexOf path lib-path)) (.length lib-path)))))))
 
 (defn ^String rel-output-path

src/main/clojure/cljs/module_graph.cljc

@@ -292,7 +292,9 @@
             (cond->> rel-path
               asset-path (str asset-path)))
           (get-rel-path* [output-dir file]
-            (string/replace (.. (io/file file) getAbsoluteFile getPath) output-dir ""))]
+            (-> (.. (io/file file) getAbsoluteFile getPath)
+                (string/replace output-dir "")
+                (string/replace #"[\\/]" "/")))]
     (let [get-rel-path (partial get-rel-path*
                          (.. (io/file output-dir)
                            getAbsoluteFile getPath))]

src/main/clojure/cljs/util.cljc

@@ -108,6 +108,9 @@
    {:pre [(or (nil? opts) (map? opts))]}
    (or (:output-dir opts) default)))
 
+(def windows?
+  (.startsWith (.toLowerCase (System/getProperty "os.name")) "windows"))
+
 (defn file? [f]
   (instance? File f))
 
@@ -117,10 +120,21 @@
 (defn ^String filename [^File f]
   (.getName f))
 
+;; on Windows, URLs end up having forward slashes like
+;; /C:/Users/... - Antonio
+(defn ^String normalize-path [^String x]
+  (-> (cond-> x
+        windows? (string/replace #"^[\\/]" ""))
+    (string/replace "\\" File/separator)
+    (string/replace "/" File/separator)))
+
 (defn ^String path [x]
   (cond
     (file? x) (.getAbsolutePath ^File x)
-    (url? x) (.getPath ^URL x)
+    (url? x) (if windows?
+               (let [f (URLDecoder/decode (.getFile x))]
+                 (normalize-path f))
+               (.getPath ^URL x))
     (string? x) x
     :else (throw (Exception. (str "Expected file, url, or string. Got " (pr-str x))))))
 
@@ -140,10 +154,7 @@
   {:pre [(or (file? x) (url? x))]}
   (if (file? x)
     (filename x)
-    (last (string/split (path x) #"\/"))))
-
-(def windows?
-  (.startsWith (.toLowerCase (System/getProperty "os.name")) "windows"))
+    (last (string/split (path x) #"[\\\/]"))))
 
 (defn ^String relative-name
   "Given a file return a path relative to the working directory. Given a
@@ -152,12 +163,7 @@
   {:pre [(or (file? x) (url? x))]}
   (letfn [(strip-user-dir [s]
             (let [user-dir (System/getProperty "user.dir")
-                  ;; on Windows, URLs end up having forward slashes like
-                  ;; /C:/Users/... - Antonio
-                  s (-> (cond-> s
-                          windows? (string/replace #"^[\\/]" ""))
-                      (string/replace "\\" File/separator)
-                      (string/replace "/" File/separator))
+                  s (normalize-path s)
                   user-path (cond-> user-dir
                               (not (.endsWith user-dir File/separator))
                               (str File/separator))]

src/test/clojure/cljs/build_api_tests.clj

@@ -197,21 +197,21 @@
 (deftest cljs-2077-test-loader
   (let [out (.getPath (io/file (test/tmp-dir) "loader-test-out"))]
     (test/delete-out-files out)
-    (let [{:keys [inputs opts]} (merge-with merge (loader-test-project out))
+    (let [{:keys [inputs opts]} (loader-test-project out)
           loader (io/file out "cljs" "loader.js")]
-      (build/build (build/inputs (io/file inputs "bar.cljs") (io/file inputs "foo.cljs")) opts)
+      (build/build (build/inputs inputs) opts)
       (is (.exists loader))
       (is (not (nil? (re-find #"[\\/]loader_test[\\/]foo\.js" (slurp loader))))))
     (test/delete-out-files out)
-    (let [project (merge-with merge (loader-test-project out)
-                    {:opts {:optimizations :advanced
-                            :source-map true}})]
-      (build/build (build/inputs (:inputs project)) (:opts project)))
+    (let [{:keys [inputs opts]} (merge-with merge (loader-test-project out)
+                                  {:opts {:optimizations :advanced
+                                          :source-map true}})]
+      (build/build (build/inputs inputs) opts))
     (testing "string inputs in modules"
       (test/delete-out-files out)
-      (let [project (merge-with merge (loader-test-project out)
-                      {:opts {:optimizations :whitespace}})]
-        (build/build (build/inputs (:inputs project)) (:opts project))))))
+      (let [{:keys [inputs opts]} (merge-with merge (loader-test-project out)
+                                    {:opts {:optimizations :whitespace}})]
+        (build/build (build/inputs inputs) opts)))))
 
 (deftest test-npm-deps
   (test/delete-node-modules)

src/test/clojure/cljs/closure_tests.clj

@@ -66,7 +66,9 @@
         (.add module (closure/js-source-file nil (io/file out file))))
       (.sortInputsByDeps module compiler)
       (is (= (->> (.getInputs module)
-                  (map #(string/replace (.getName %) (str out File/separator) "")))
+                  (map #(string/replace
+                          (.getName %)
+                          (str (string/replace out #"[\\\/]" "/") "/") "")))
              ["cljs/core.js"
               "cljs/core/constants.js"
               "module_test/modules/a.js"])))))

src/test/clojure/cljs/util_tests.clj

@@ -41,3 +41,7 @@
       (is (= (util/relative-name (io/file "/Users/user/clojurescript/out/index.js")) "out/index.js"))
       (is (= (util/relative-name (io/as-url (io/file "/Users/user/clojurescript/out/index.js"))) "out/index.js"))
       (System/setProperty "user.dir" initial))))
+
+(deftest test-path
+  (is (= (.getAbsolutePath (io/file "src/main/clojure/cljs/closure.clj"))
+         (util/path (io/as-url (io/file "src/main/clojure/cljs/closure.clj"))))))