Skip to content

Commit cd42887

Browse files
authored
Enable and satisfy clj-kondo in test/ (#323)
1 parent ba5382b commit cd42887

15 files changed

+80
-82
lines changed

.clj-kondo/config.edn

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
{:linters {:unresolved-symbol {:exclude [(refactor-nrepl.ns.ns-parser/with-libspecs-from [libspecs])]}
1+
;; `nrepl.core/code` can contain intentionally broken code in the test suite, so we silence related resolution errors:
2+
{:lint-as {nrepl.core/code clojure.core/quote}
3+
:linters {:unresolved-symbol {:exclude [(refactor-nrepl.ns.ns-parser/with-libspecs-from [libspecs])]}
24
:unresolved-namespace {:exclude [clojure.main]}}}

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ eastwood:
1818
lein with-profile -user,+$(VERSION),+eastwood eastwood
1919

2020
kondo:
21-
lein with-profile -dev,+$(VERSION),+clj-kondo run -m clj-kondo.main --lint src
21+
lein with-profile -dev,+$(VERSION),+clj-kondo run -m clj-kondo.main --lint src test
2222

2323
# When releasing, the BUMP variable controls which field in the
2424
# version string will be incremented in the *next* snapshot

test/global_test_setup.clj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
(ns global-test-setup
22
"This namespace's contents will be automatically loaded by `lein test` (or any test runner).")
33

4-
(try
5-
(require '[refactor-nrepl.inlined-deps.toolsnamespace.v1v1v0.clojure.tools.namespace.repl :refer [set-refresh-dirs]])
6-
(catch Exception _
7-
(require
8-
'[clojure.tools.namespace.repl :refer [set-refresh-dirs]])))
4+
(def set-refresh-dirs
5+
(try
6+
(require '[refactor-nrepl.inlined-deps.toolsnamespace.v1v1v0.clojure.tools.namespace.repl :refer [set-refresh-dirs]])
7+
@(resolve 'refactor-nrepl.inlined-deps.toolsnamespace.v1v1v0.clojure.tools.namespace.repl/set-refresh-dirs)
8+
(catch Exception _
9+
(require '[clojure.tools.namespace.repl])
10+
@(resolve 'clojure.tools.namespace.repl/set-refresh-dirs))))
911

1012
(when (System/getenv "CI") ; don't alter local environments (which may also use clojure.tools.namespace.repl)
1113
;; Intentionally exclude the `lein-plugin/` source path:

test/refactor_nrepl/artifacts_test.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(ns refactor-nrepl.artifacts-test
22
(:require [clojure
33
[edn :as edn]
4-
[test :refer :all]]
4+
[test :refer [deftest is testing]]]
55
[clojure.java.io :as io]
66
[refactor-nrepl.artifacts :as artifacts]))
77

test/refactor_nrepl/client.clj

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
(ns refactor-nrepl.client
22
(:require [clojure
3-
[edn :as edn]
4-
[string :as str]]
3+
[edn :as edn]]
54
[nrepl.core :as nrepl])
6-
(:import java.io.File))
5+
(:import (java.io File)))
76

87
(def ^:private nrepl-port
9-
(when (.exists (java.io.File. ".nrepl-port"))
8+
(when (.exists (File. ".nrepl-port"))
109
(-> ".nrepl-port" slurp Integer/parseInt)))
1110

1211
(def ^:private transp (atom nil))
@@ -42,7 +41,7 @@
4241
(#(if file (assoc % :file file) %))
4342
(nrepl-message 60000 tr)
4443
(map (juxt :occurrence :count :error)))]
45-
(if-let [error (some last found-symbols)]
44+
(when-let [error (some last found-symbols)]
4645
(throw (IllegalStateException. (str error))))
4746
(->> found-symbols
4847
(map first)
@@ -51,7 +50,7 @@
5150
(map action)
5251
doall)))
5352

54-
(defn- prettify-found-symbol-result [{:keys [line-beg name file match]}]
53+
(defn- prettify-found-symbol-result [{:keys [line-beg _name file match]}]
5554
(->> match
5655
(str file " " "[" line-beg "]" ": ")))
5756

test/refactor_nrepl/config_test.clj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
(ns refactor-nrepl.config-test
2-
(:require [clojure.set :as set]
3-
[clojure.test :refer :all]
2+
(:require [clojure.test :refer [deftest is testing]]
43
[refactor-nrepl
54
[analyzer :as analyzer]
65
[config :as sut]]))

test/refactor_nrepl/core_test.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns refactor-nrepl.core-test
2-
(:require [clojure.test :refer :all]
2+
(:require [clojure.test :refer [deftest is testing]]
33
[refactor-nrepl.config :as config]
44
[refactor-nrepl.core :refer [ignore-dir-on-classpath?]]))
55

test/refactor_nrepl/extract_definition_test.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(ns refactor-nrepl.extract-definition-test
22
(:require [clojure.java.io :as io]
3-
[clojure.test :refer :all]
3+
[clojure.test :refer [deftest is]]
44
[refactor-nrepl.extract-definition :as sut]
55
[refactor-nrepl.unreadable-files :refer [ignore-errors-str]]))
66

test/refactor_nrepl/find/find_macros_test.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns refactor-nrepl.find.find-macros-test
2-
(:require [clojure.test :refer :all]
2+
(:require [clojure.test :refer [deftest is testing]]
33
[refactor-nrepl.find.find-macros :refer [find-macro]]
44
[refactor-nrepl.unreadable-files :refer [ignore-errors?]]))
55

test/refactor_nrepl/integration_tests.clj

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
(ns refactor-nrepl.integration-tests
2-
(:require [clojure.java.io :as io]
3-
[clojure.test :refer :all]
2+
(:require [clojure.test :refer [deftest is use-fixtures]]
43
[nrepl.server :as nrepl]
54
[refactor-nrepl middleware
65
[analyzer :as analyzer]
7-
[client :refer :all]
8-
[core :as core]]
9-
[clojure.string :as str])
10-
(:import java.io.File
11-
org.apache.commons.io.FileUtils))
6+
[client :refer [connect find-unbound find-usages resolve-missing version]]
7+
[core :as core]]))
128

139
(defn start-up-repl-server []
1410
(let [server

0 commit comments

Comments
 (0)