Skip to content

Commit 034b2b9

Browse files
committed
Adapt tests.
1 parent 4db2db7 commit 034b2b9

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

test/cats/labs/lens_spec.cljc

+17-15
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@
55
[clojure.test.check.generators :as gen :include-macros true]
66
[clojure.test.check.properties :as prop :include-macros true]
77
[cats.core :as m]
8-
[cats.labs.lens :as l])
8+
[cats.labs.lens :as l]
9+
[cats.labs.traversals :as tv])
910
:clj
1011
(:require [clojure.test :as t]
1112
[clojure.test.check]
1213
[clojure.test.check.clojure-test :refer [defspec]]
1314
[clojure.test.check.generators :as gen]
1415
[clojure.test.check.properties :as prop]
1516
[cats.core :as m]
16-
[cats.labs.lens :as l]))
17+
[cats.labs.lens :as l]
18+
[cats.labs.traversals :as tv]))
1719
#?(:cljs
1820
(:require-macros [clojure.test.check.clojure-test :refer (defspec)])))
1921

@@ -221,13 +223,13 @@
221223

222224
(defn first-traversal-law [{:keys [gen trav]}]
223225
(prop/for-all [s gen]
224-
(coll? (l/foci trav s))))
226+
(coll? (tv/foci trav s))))
225227

226228
;; it
227229

228230
(def it-traversal
229231
{:gen gen/any
230-
:trav l/it})
232+
:trav tv/it})
231233

232234
(defspec it-first-traversal-law 10
233235
(first-traversal-law it-traversal))
@@ -236,7 +238,7 @@
236238

237239
(def each-traversal
238240
{:gen gen/any
239-
:trav l/each})
241+
:trav tv/each})
240242

241243
(defspec each-first-traversal-law 10
242244
(first-traversal-law each-traversal))
@@ -245,7 +247,7 @@
245247

246248
(def filter-traversal
247249
{:gen gen/any
248-
:trav (l/filter identity)})
250+
:trav (tv/filter identity)})
249251

250252
(defspec filter-first-traversal-law 10
251253
(first-traversal-law filter-traversal))
@@ -254,7 +256,7 @@
254256

255257
(def only-traversal
256258
{:gen gen/any
257-
:trav (l/only identity)})
259+
:trav (tv/only identity)})
258260

259261
(defspec only-first-traversal-law 10
260262
(first-traversal-law only-traversal))
@@ -263,7 +265,7 @@
263265

264266
(def keys-traversal
265267
{:gen (gen/map gen/keyword gen/any)
266-
:trav l/keys})
268+
:trav tv/keys})
267269

268270
(defspec keys-first-traversal-law 10
269271
(first-traversal-law keys-traversal))
@@ -272,7 +274,7 @@
272274

273275
(def vals-traversal
274276
{:gen (gen/map gen/keyword gen/any)
275-
:trav l/vals})
277+
:trav tv/vals})
276278

277279
(defspec vals-first-traversal-law 10
278280
(first-traversal-law vals-traversal))
@@ -281,7 +283,7 @@
281283

282284
(def indexed-traversal
283285
{:gen (gen/vector gen/any)
284-
:trav l/indexed})
286+
:trav tv/indexed})
285287

286288
(defspec indexed-first-traversal-law 10
287289
(first-traversal-law indexed-traversal))
@@ -290,7 +292,7 @@
290292

291293
(def nothing-traversal
292294
{:gen gen/any
293-
:trav l/nothing})
295+
:trav tv/nothing})
294296

295297
(defspec nothing-first-traversal-law 10
296298
(first-traversal-law nothing-traversal))
@@ -299,7 +301,7 @@
299301

300302
(def both-traversal
301303
{:gen (gen/vector gen/int)
302-
:trav (l/both (filter odd?) (filter #(< % 5)))})
304+
:trav (tv/both (filter odd?) (filter #(< % 5)))})
303305

304306
(defspec both-first-traversal-law 10
305307
(first-traversal-law both-traversal))
@@ -308,7 +310,7 @@
308310

309311
(def lens->traversal
310312
{:gen (with-key :a)
311-
:trav (l/lens->traversal (l/key :a))})
313+
:trav (tv/lens->traversal (l/key :a))})
312314

313315
(defspec lens->traversal-first-traversal-law 10
314316
(first-traversal-law lens->traversal))
@@ -350,7 +352,7 @@
350352
(t/deftest foci-atom
351353
(t/testing "Reflects an atoms focused values"
352354
(let [source (atom [0 1 2 3 4 5])
353-
fsource (l/foci-atom (l/only odd?) source)]
355+
fsource (tv/foci-atom (tv/only odd?) source)]
354356
(t/is (= @fsource [1 3 5]))
355357

356358
(swap! source #(subvec % 2))
@@ -365,7 +367,7 @@
365367
(t/testing "Supports watches"
366368
(let [source (atom [1 2 3 4 5])
367369
watched (volatile! nil)
368-
fsource (l/foci-atom (l/only odd?) source)]
370+
fsource (tv/foci-atom (tv/only odd?) source)]
369371
(add-watch fsource :test (fn [key ref old new]
370372
(vreset! watched [ref old new])))
371373

0 commit comments

Comments
 (0)