Address test failure, fix some reflection warnings.

Author: plexus

src/refactor_nrepl/ns/clean_ns.clj

@@ -37,9 +37,10 @@
   ns-form)
 
 (defn clean-ns [{:keys [path relative-path]}]
-  {:pre [(seq path) (string? path) (core/source-file? path)]}
+  {:pre [(seq path) (string? path)]}
   ;; Try first the absolute, then the relative path
   (let [path (first (filter #(some-> % io/file .exists) [path relative-path]))]
+    (assert (core/source-file? path))
     ;; Prefix notation not supported in cljs.
     ;; We also turn it off for cljc for reasons of symmetry
     (config/with-config {:prefix-rewriting (if (or (core/cljs-file? path)

src/refactor_nrepl/ns/pprint.clj

@@ -156,6 +156,6 @@
                       (form-is? form :import) (pprint-import-form form)
                       :else (pprint form))))
             forms)))
-        (.replaceAll "\r" "")
+        (str/replace "\r" "")
         fmt/reformat-string
-        (.replaceAll (Pattern/quote "#? @") "#?@"))))
+        (str/replace (Pattern/quote "#? @") "#?@"))))

test/refactor_nrepl/ns/clean_ns_test.clj

@@ -3,7 +3,8 @@
             [refactor-nrepl.config :as config]
             [refactor-nrepl.core :as core]
             [refactor-nrepl.ns.clean-ns :refer [clean-ns]]
-            [refactor-nrepl.ns.pprint :refer [pprint-ns]])
+            [refactor-nrepl.ns.pprint :refer [pprint-ns]]
+            [clojure.string :as str])
   (:import java.io.File))
 
 (defn- absolute-path [^String path]
@@ -49,7 +50,7 @@
 
 (def ns-using-dollar (clean-msg "test/resources/ns_using_dollar.clj"))
 
-(def ns1-relative-path {:path "I do not exist"
+(def ns1-relative-path {:path "I do not exist.clj"
                         :relative-path "test/resources/ns1.clj"})
 
 (deftest combines-requires
@@ -59,7 +60,7 @@
 
 (deftest meta-preserved
   (let [cleaned (pprint-ns (clean-ns ns2-meta))]
-    (is (.contains cleaned "^{:author \"Trurl and Klapaucius\"
+    (is (str/includes? cleaned "^{:author \"Trurl and Klapaucius\"
       :doc \"test ns with meta\"}"))))
 
 (deftest rewrites-use-to-require