Skip to content

Commit 235d481

Browse files
alexander-yakushevalexander-yakushev
committed
Fix broken tests
1 parent 2f4f32b commit 235d481

File tree

2 files changed

+94
-91
lines changed

2 files changed

+94
-91
lines changed

‎test/clj/cider/nrepl/middleware/inspect_test.clj‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -598,18 +598,19 @@
598598

599599
(deftest inspect-print-current-value-test
600600
(testing "inspect-print-current-value returns the currently inspected value as a printed string"
601-
(is (= [(str/join "\n" ["{:a -1,"
602-
" :bb \"111\","
603-
" :ccc (1),"
604-
" :d"
605-
" ({:a 0, :bb \"000\", :ccc ()}"
606-
" {:a -1, :bb \"111\", :ccc (1)}"
607-
" {:a -2, :bb \"222\", :ccc (2 1)}"
608-
" {:a -3, :bb \"333\", :ccc (3 2 1)}"
609-
" {:a -4, :bb \"444\", :ccc (4 3 2 1)})}"])]
610-
(:value (do
611-
(session/message {:op "eval"
612-
:code "(def test-val
601+
(is+ {:value ["{:a -1,
602+
:bb \"111\",
603+
:ccc (1),
604+
:d
605+
({:a 0, :bb \"000\", :ccc ()}
606+
{:a -1, :bb \"111\", :ccc (1)}
607+
{:a -2, :bb \"222\", :ccc (2 1)}
608+
{:a -3, :bb \"333\", :ccc (3 2 1)}
609+
{:a -4, :bb \"444\", :ccc (4 3 2 1)})}
610+
"]}
611+
(do
612+
(session/message {:op "eval"
613+
:code "(def test-val
613614
(for [i (range 2)]
614615
{:a (- i)
615616
:bb (str i i i)
@@ -618,13 +619,14 @@
618619
{:a (- i)
619620
:bb (str i i i)
620621
:ccc (range i 0 -1)})}))"})
621-
(session/message {:op "eval"
622-
:inspect "true"
623-
:code "test-val"})
624-
(session/message {:op "inspect-push"
625-
:idx 2})
626-
(session/message {:op "inspect-print-current-value"
627-
:nrepl.middleware.print/print "cider.nrepl.pprint/pprint"})))))))
622+
(session/message {:op "eval"
623+
:inspect "true"
624+
:code "test-val"})
625+
(session/message {:op "inspect-push"
626+
:idx 2})
627+
(session/message {:op "inspect-print-current-value"
628+
:nrepl.middleware.print/buffer-size 2048
629+
:nrepl.middleware.print/print "cider.nrepl.pprint/orchard-pprint"})))))
628630

629631
(deftest inspect-print-current-value-no-value-test
630632
(testing "inspect-print-current-value returns nil if nothing has been inspected yet"

‎test/clj/cider/nrepl/middleware/refresh_test.clj‎

Lines changed: 73 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
[cider.nrepl.middleware.refresh :as r]
44
[cider.nrepl.middleware.util.reload :as reload-utils]
55
[cider.nrepl.test-session :as session]
6-
[clojure.test :refer :all]))
6+
[cider.test-helpers :refer :all]
7+
[clojure.test :refer :all]
8+
[matcher-combinators.matchers :as mc]))
79

810
(use-fixtures :each session/session-fixture)
911

@@ -30,99 +32,98 @@
3032

3133
(deftest refresh-op-test
3234
(testing "refresh op works"
33-
(let [response (session/message {:op "refresh"
34-
:dirs dirs-to-reload})]
35-
(is (:reloading response))
36-
(is (= #{"done" "ok"} (:status response)))))
35+
(is+ {:reloading some?
36+
:status #{"done" "ok"}}
37+
(session/message {:op "refresh"
38+
:dirs dirs-to-reload})))
3739

3840
(testing "nothing to refresh after refreshing"
39-
(let [response (session/message {:op "refresh"
40-
:dirs dirs-to-reload})]
41-
(is (= [] (:reloading response)))
42-
(is (= #{"done" "ok"} (:status response))))))
41+
(is+ {:reloading []
42+
:status #{"done" "ok"}}
43+
(session/message {:op "refresh"
44+
:dirs dirs-to-reload}))))
4345

4446
(deftest before-fn-test
4547
(testing "before fn works"
46-
(let [response (session/message {:op "refresh"
47-
:dirs dirs-to-reload
48-
:before "cider.nrepl.middleware.refresh-test/before-fn"})]
49-
(is (:reloading response))
50-
(is (= #{"done" "invoked-before" "invoking-before" "ok"} (:status response)))
51-
(is (= "before-fn invoked\n" (:out response)))))
48+
(is+ {:reloading some?
49+
:status #{"done" "invoked-before" "invoking-before" "ok"}
50+
:out "before-fn invoked\n"}
51+
(session/message {:op "refresh"
52+
:dirs dirs-to-reload
53+
:before "cider.nrepl.middleware.refresh-test/before-fn"})))
5254

5355
(testing "bad before fn results in not resolved response"
54-
(let [response (session/message {:op "refresh"
55-
:dirs dirs-to-reload
56-
:before "foo"})]
57-
(is (= #{"done" "invoked-not-resolved" "ok" "invoking-before"} (:status response))))
58-
59-
(let [response (session/message {:op "refresh"
60-
:dirs dirs-to-reload
61-
:before "clojure.core/seq"})]
62-
(is (= #{"done" "error" "invoking-before"} (:status response)))
63-
(is (:err response))
64-
(is (:error response)))
65-
66-
(let [response (session/message {:op "refresh"
67-
:dirs dirs-to-reload
68-
:before "java.lang.Thread"})]
69-
(is (= #{"done" "invoked-not-resolved" "invoking-before" "ok"}
70-
(:status response))))))
56+
(is+ {:status #{"done" "invoked-not-resolved" "ok" "invoking-before"}}
57+
(session/message {:op "refresh"
58+
:dirs dirs-to-reload
59+
:before "non-existent/foo"}))
60+
61+
(is+ {:status #{"done" "error" "invoking-before"}
62+
:err some?
63+
:error some?}
64+
(session/message {:op "refresh"
65+
:dirs dirs-to-reload
66+
:before "clojure.core/seq"}))
67+
68+
(is+ {:status #{"done" "invoked-not-resolved" "invoking-before" "ok"}}
69+
(session/message {:op "refresh"
70+
:dirs dirs-to-reload
71+
:before "java.lang.Thread"}))))
7172

7273
(deftest after-fn-test
7374
(testing "after fn with zero arity works"
74-
(let [response (session/message {:op "refresh"
75-
:dirs dirs-to-reload
76-
:after "cider.nrepl.middleware.refresh-test/after-fn"})]
77-
(is (:reloading response))
78-
(is (= #{"done" "invoked-after" "invoking-after" "ok"} (:status response)))
79-
(is (= "after-fn invoked\n" (:out response)))))
75+
(is+ {:reloading some?
76+
:status #{"done" "invoked-after" "invoking-after" "ok"}
77+
:out "after-fn invoked\n"}
78+
(session/message {:op "refresh"
79+
:dirs dirs-to-reload
80+
:after "cider.nrepl.middleware.refresh-test/after-fn"})))
8081

8182
(testing "after fn with optional arg works"
82-
(let [response (session/message {:op "refresh"
83-
:dirs dirs-to-reload
84-
:after "cider.nrepl.middleware.refresh-test/after-fn-optional-arg"})]
85-
(is (:reloading response))
86-
(is (= #{"done" "invoked-after" "invoking-after" "ok"} (:status response)))
87-
(is (= "after with optional argument works\n" (:out response)))))
83+
(is+ {:reloading some?
84+
:status #{"done" "invoked-after" "invoking-after" "ok"}
85+
:out "after with optional argument works\n"}
86+
(session/message {:op "refresh"
87+
:dirs dirs-to-reload
88+
:after "cider.nrepl.middleware.refresh-test/after-fn-optional-arg"})))
8889

8990
(testing "bad after fn results in error"
90-
(let [response (session/message {:op "refresh"
91-
:dirs dirs-to-reload
92-
:after "foo"})]
93-
(is (= #{"done" "invoked-not-resolved" "invoking-after" "ok"} (:status response))))
94-
95-
(let [response (session/message {:op "refresh"
96-
:dirs dirs-to-reload
97-
:after "clojure.core/seq"})]
98-
(is (= #{"done" "error" "invoking-after" "ok"} (:status response)))
99-
(is (:error response))
100-
(is (:err response)))
101-
102-
(let [response (session/message {:op "refresh"
103-
:dirs dirs-to-reload
104-
:after "java.lang.Thread"})]
105-
(is (= #{"done" "invoked-not-resolved" "invoking-after" "ok"} (:status response))))))
91+
(is+ {:status #{"done" "invoked-not-resolved" "invoking-after" "ok"}}
92+
(session/message {:op "refresh"
93+
:dirs dirs-to-reload
94+
:after "non-existent/foo"}))
95+
96+
(is+ {:status #{"done" "error" "invoking-after" "ok"}
97+
:err some?
98+
:error some?}
99+
(session/message {:op "refresh"
100+
:dirs dirs-to-reload
101+
:after "clojure.core/seq"}))
102+
103+
(is+ {:status #{"done" "invoked-not-resolved" "invoking-after" "ok"}}
104+
(session/message {:op "refresh"
105+
:dirs dirs-to-reload
106+
:after "java.lang.Thread"}))))
106107

107108
(deftest refresh-all-op-test
108109
(testing "refresh-all op works"
109-
(let [response (session/message {:op "refresh-all"
110-
:dirs dirs-to-reload})]
111-
(is (seq (:reloading response)))
112-
(is (= #{"done" "ok"} (:status response))))))
110+
(is+ {:reloading not-empty
111+
:status #{"done" "ok"}}
112+
(session/message {:op "refresh-all"
113+
:dirs dirs-to-reload}))))
113114

114115
(deftest refresh-clear-op-test
115116
(testing "refresh-clear op works"
116-
(let [_ (session/message {:op "refresh"
117-
:dirs dirs-to-reload})
118-
response (session/message {:op "refresh-clear"})]
119-
(is (= #{"done"} (:status response)))))
117+
(is+ {:status #{"done"}}
118+
(do (session/message {:op "refresh"
119+
:dirs dirs-to-reload})
120+
(session/message {:op "refresh-clear"}))))
120121

121122
(testing "refresh op works after refresh clear"
122-
(let [response (session/message {:op "refresh"
123-
:dirs dirs-to-reload})]
124-
(is (seq (:reloading response)))
125-
(is (= #{"done" "ok"} (:status response))))))
123+
(is+ {:reloading not-empty
124+
:status #{"done" "ok"}}
125+
(session/message {:op "refresh"
126+
:dirs dirs-to-reload}))))
126127

127128
(deftest user-refresh-dirs-test
128129
(testing "returns nil if clojure.tools.namespace isn't loaded"

0 commit comments

Comments
 (0)