Skip to content

Commit f05ebd9

Browse files
NoahTheDukeNoahTheDuke
committed
Switch to lazytest v1.0.0
1 parent f1e447c commit f05ebd9

File tree

11 files changed

+69
-64
lines changed

11 files changed

+69
-64
lines changed

‎deps.edn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"-f" "rebel-readline.main/-main"]}
3535
:test {:extra-paths ["test"]
3636
:extra-deps {nubank/matcher-combinators {:mvn/version "3.9.1"}
37-
io.github.noahtheduke/lazytest {:mvn/version "0.5.0"}}}
37+
io.github.noahtheduke/lazytest {:mvn/version "1.0.0"}}}
3838
:runner {:main-opts ["-m" "lazytest.main" "--output" "dots"]}
3939
:profile {:extra-deps {com.clojure-goes-fast/clj-async-profiler {:mvn/version "1.2.2"}
4040
com.clojure-goes-fast/clj-memory-meter {:mvn/version "0.3.0"}}

‎test/noahtheduke/splint/clj_kondo_test.clj‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -81,21 +81,22 @@
8181
style/when-not-do 1})
8282

8383
(defdescribe ^:integration clj-kondo-test
84-
(let [clj-kondo (gl/procure "https://github.com/clj-kondo/clj-kondo.git" 'clj-kondo/clj-kondo "v2023.05.26")
85-
results (run-impl [{:path clj-kondo}]
86-
{:config-override
87-
(-> all-enabled-config
88-
(assoc :silent true)
89-
(assoc :parallel false)
90-
#_(assoc :autocorrect true)
91-
(assoc :clojure-version *clojure-version*))})
92-
diagnostics (->> results
93-
:diagnostics
94-
(group-by :rule-name))]
84+
(let [clj-kondo (delay (gl/procure "https://github.com/clj-kondo/clj-kondo.git" 'clj-kondo/clj-kondo "v2023.05.26"))
85+
results (delay
86+
(run-impl [{:path @clj-kondo}]
87+
{:config-override
88+
(-> all-enabled-config
89+
(assoc :silent true)
90+
(assoc :parallel false)
91+
#_(assoc :autocorrect true)
92+
(assoc :clojure-version *clojure-version*))}))
93+
diagnostics (delay (->> @results
94+
:diagnostics
95+
(group-by :rule-name)))]
9596
(it "has the right diagnostics"
9697
(expect
9798
(match?
9899
(m/equals clj-kondo-diagnostics)
99-
(update-vals diagnostics count))))
100+
(update-vals @diagnostics count))))
100101
(it "sums correctly"
101-
(expect (= 1325 (count (:diagnostics results)))))))
102+
(expect (= 1325 (count (:diagnostics @results)))))))

‎test/noahtheduke/splint/config_test.clj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
(ns noahtheduke.splint.config-test
66
(:require
7-
[lazytest.core :refer [defdescribe it expect describe given]]
7+
[lazytest.core :refer [defdescribe it expect describe]]
88
[lazytest.extensions.matcher-combinators :refer [match?]]
99
[noahtheduke.splint.config :as sut]
1010
[noahtheduke.splint.path-matcher :refer [->matcher]]
@@ -40,7 +40,7 @@
4040

4141
(defdescribe disable-genre-test
4242
(describe ":enable"
43-
(given [config (update-vals @sut/default-config #(assoc % :enabled true))]
43+
(let [config (update-vals @sut/default-config #(assoc % :enabled true))]
4444
(it "can disable a whole genre"
4545
(doseq [c (->> (sut/merge-config config {'style {:enabled false}})
4646
(vals)

‎test/noahtheduke/splint/default_config_test.clj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
[clojure.java.io :as io]
99
[clojure.spec.alpha :as s]
1010
[clojure.string :as str]
11-
[lazytest.core :refer [defdescribe it given expect]]))
11+
[lazytest.core :refer [defdescribe expect it]]))
1212

1313
(set! *warn-on-reflection* true)
1414

@@ -38,6 +38,7 @@
3838
(s/map-of ::config-key ::config-opts))
3939

4040
(defdescribe default-config-spec-test
41-
(given [default-config (edn/read-string (slurp (io/resource "config/default.edn")))]
42-
(it "conforms to spec"
43-
(expect ::default-config default-config))))
41+
(it "conforms to spec"
42+
(expect (s/valid? ::default-config (->> (io/resource "config/default.edn")
43+
(slurp)
44+
(edn/read-string))))))

‎test/noahtheduke/splint/netrunner_test.clj‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,22 +79,23 @@
7979
style/when-not-empty? 13})
8080

8181
(defdescribe ^:integration netrunner-test
82-
(let [netrunner (gl/procure "https://github.com/mtgred/netrunner.git" 'mtgred/netrunner "v134")
83-
results (run-impl [{:path netrunner}]
82+
(let [netrunner (delay (gl/procure "https://github.com/mtgred/netrunner.git" 'mtgred/netrunner "v134"))
83+
results (delay
84+
(run-impl [{:path @netrunner}]
8485
{:config-override
8586
(-> all-enabled-config
8687
(assoc :silent true)
8788
(assoc :parallel false)
88-
(assoc :clojure-version *clojure-version*))})
89-
diagnostics (->> results
90-
:diagnostics
91-
(group-by :rule-name))]
89+
(assoc :clojure-version *clojure-version*))}))
90+
diagnostics (delay (->> @results
91+
:diagnostics
92+
(group-by :rule-name)))]
9293
(it "has the right diagnostics"
9394
(expect
9495
(match?
9596
(m/equals netrunner-diagnostics)
96-
(update-vals diagnostics count))))
97+
(update-vals @diagnostics count))))
9798
(it "sums correctly"
98-
(expect (= 3710 (count (:diagnostics results)))))
99+
(expect (= 3710 (count (:diagnostics @results)))))
99100
(it "checks the correct number of files"
100-
(expect (= 242 (count (:checked-files results)))))))
101+
(expect (= 242 (count (:checked-files @results)))))))

‎test/noahtheduke/splint/parser_test.clj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
(ns noahtheduke.splint.parser-test
66
(:require
7-
[lazytest.core :refer [defdescribe describe expect given it]]
7+
[lazytest.core :refer [defdescribe describe expect it]]
88
[lazytest.extensions.matcher-combinators :refer [match?]]
99
[matcher-combinators.matchers :refer [absent]]
1010
[noahtheduke.splint.parser.defn :refer [parse-defn]]
@@ -58,7 +58,7 @@
5858
(meta (parse-string "(defn-partial abc (+ 1 2 3))"))))))
5959

6060
(describe "Clojure 1.12 :param-tags"
61-
(given [ret (parse-string "(map ^[int] Integer/hash (range 10))")]
61+
(let [ret (parse-string "(map ^[int] Integer/hash (range 10))")]
6262
(it "returns the list as data"
6363
(expect '(map Integer/hash (range 10)) ret))
6464
(it "attaches the :param-tags as metadata"

‎test/noahtheduke/splint/printer_test.cljc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
(:require
77
[clojure.java.io :as io]
88
[clojure.string :as str]
9-
[lazytest.core :refer [defdescribe expect given it describe]]
9+
[lazytest.core :refer [defdescribe describe expect it]]
1010
[lazytest.extensions.matcher-combinators :refer [match?]]
1111
[noahtheduke.splint.parser :as parser]
1212
[noahtheduke.splint.printer :as sut :refer [*fipp-width*]]
@@ -267,9 +267,9 @@
267267
(print-result-lines "edn-pretty"))))))
268268

269269
(defdescribe print-form-test
270-
(given [f (slurp (io/file "corpus" "special_characters.clj"))
270+
(it "prints all special characters"
271+
(let [f (slurp (io/file "corpus" "special_characters.clj"))
271272
parsed (parser/parse-file {:contents f :ext :clj})]
272-
(it "prints all special characters"
273273
(expect (= (format "[%s]"
274274
(->> ["@a"
275275
"@(a)"

‎test/noahtheduke/splint/re_frame_test.clj‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
(ns noahtheduke.splint.re-frame-test
66
(:require
77
[clojure.tools.gitlibs :as gl]
8-
[lazytest.core :refer [defdescribe it expect given]]
8+
[lazytest.core :refer [defdescribe expect it]]
99
[lazytest.extensions.matcher-combinators :refer [match?]]
1010
[matcher-combinators.matchers :as m]
1111
[noahtheduke.splint.config :refer [default-config]]
@@ -41,20 +41,21 @@
4141

4242
(defdescribe re-frame-test
4343
{:integration true}
44-
(given [re-frame (gl/procure "https://github.com/day8/re-frame.git" 'day8/re-frame "v1.3.0")
45-
results (run-impl [{:path re-frame}]
44+
(let [re-frame (delay (gl/procure "https://github.com/day8/re-frame.git" 'day8/re-frame "v1.3.0"))
45+
results (delay
46+
(run-impl [{:path @re-frame}]
4647
{:config-override
4748
(-> all-enabled-config
4849
(assoc :silent true)
4950
(assoc :parallel false)
50-
(assoc :clojure-version *clojure-version*))})]
51+
(assoc :clojure-version *clojure-version*))}))
52+
diagnostics (delay (->> @results
53+
:diagnostics
54+
(group-by :rule-name)))]
5155
(it "has the right diagnostics"
5256
(expect
5357
(match?
5458
(m/equals re-frame-diagnostics)
55-
(->> results
56-
:diagnostics
57-
(group-by :rule-name)
58-
(#(update-vals % count))))))
59+
(update-vals @diagnostics count))))
5960
(it "sums correctly"
60-
(expect (= 72 (count (:diagnostics results)))))))
61+
(expect (= 72 (count (:diagnostics @results)))))))

‎test/noahtheduke/splint/rules/metrics/fn_length_test.clj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
(ns noahtheduke.splint.rules.metrics.fn-length-test
66
(:require
7-
[lazytest.core :refer [defdescribe describe given it]]
7+
[lazytest.core :refer [defdescribe describe it]]
88
[noahtheduke.splint.test-helpers :refer [expect-match single-rule-config]]))
99

1010
(set! *warn-on-reflection* true)
@@ -16,7 +16,7 @@
1616
(defdescribe fn-length-defn-test
1717

1818
(describe "chosen style"
19-
(given [config (config {:chosen-style :defn})]
19+
(let [config (config {:chosen-style :defn})]
2020
(it :defn
2121
(expect-match nil "(defn n\n[]\n1 2 3)" config)
2222
(expect-match
@@ -44,7 +44,7 @@
4444
:end-column 5}]
4545
"(defn n\n([] 1 2 3)\n([arg1]\na\nb\nc\nd\n5\n6\n7\n8\n9\n10\n11))"
4646
config)))
47-
(given [config (config {:chosen-style :body})]
47+
(let [config (config {:chosen-style :body})]
4848
(it :body
4949
(expect-match nil "(defn n\n[]\n1 2 3)" config)
5050
(expect-match
@@ -74,7 +74,7 @@
7474
config))))
7575

7676
(describe "config length"
77-
(given [config (config {:length 5})]
77+
(let [config (config {:length 5})]
7878
(it "custom length"
7979
(expect-match nil "(defn n\n[]\n0\n1\n2\n3)" config)
8080
(expect-match

‎test/noahtheduke/splint/runner_test.clj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
(:require
77
[clojure.java.io :as io]
88
[clojure.string :as str]
9-
[lazytest.core :refer [defdescribe expect it given]]
9+
[lazytest.core :refer [defdescribe expect it]]
1010
[lazytest.extensions.matcher-combinators :refer [match?]]
1111
[noahtheduke.splint.dev :as dev]
1212
[noahtheduke.splint.rules :refer [global-rules]]
1313
[noahtheduke.splint.runner :as sut]
1414
[noahtheduke.splint.test-helpers :refer [expect-match print-to-file!
15-
with-temp-files with-out-str-data-map]]))
15+
with-out-str-data-map
16+
with-temp-files]]))
1617

1718
(set! *warn-on-reflection* true)
1819

@@ -131,7 +132,7 @@
131132
(sut/prepare-rules config rules))))))
132133

133134
(defdescribe update-rules-test
134-
(given [config (into {} (select-keys @dev/dev-config
135+
(let [config (into {} (select-keys @dev/dev-config
135136
['lint/if-else-nil
136137
'naming/lisp-case
137138
'lint/warn-on-reflection]))
@@ -288,7 +289,7 @@
288289
(sut/auto-gen-config [(io/file "corpus" "printer_test.clj")] {:clojure-version {:major 1 :minor 11}}))))))
289290

290291
(defdescribe only-flag-test
291-
(given [only-test-file (io/file "corpus" "only_test.clj")]
292+
(let [only-test-file (io/file "corpus" "only_test.clj")]
292293
(it "can select a single rule"
293294
(expect
294295
(match?

0 commit comments

Comments
 (0)