Skip to content
This repository was archived by the owner on May 30, 2023. It is now read-only.

Commit 9b4dfdf

Browse files
authored
Use cljs.test with consistent alias (#162)
* Use cljs.test with consistent alias * Throw JS error instead of Java exception
1 parent 9380793 commit 9b4dfdf

File tree

44 files changed

+167
-170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+167
-170
lines changed

exercises/practice/accumulate/test/accumulate_test.cljs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
(ns accumulate-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
3+
[clojure.string :refer [upper-case]]
34
accumulate))
45

56
(defn- square [n] (* n n))
@@ -15,7 +16,7 @@
1516
(deftest accumulate-upcases
1617
(is (= ["HELLO", "WORLD"]
1718
(->> ["hello" "world"]
18-
(accumulate/accumulate clojure.string/upper-case)
19+
(accumulate/accumulate upper-case)
1920
(map to-s)))))
2021

2122
(deftest accumulate-reversed-strings

exercises/practice/acronym/test/acronym_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns acronym-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
acronym))
44

55
(deftest test-acronym-empty-string

exercises/practice/all-your-base/test/all_your_base_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns all-your-base-test
2-
(:require [clojure.test :refer [deftest testing is]]
2+
(:require [cljs.test :refer [deftest is testing] :as t :include-macros true]
33
[all-your-base]))
44

55
(deftest test-single-bit-to-one-decimal

exercises/practice/atbash-cipher/test/atbash_cipher_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns atbash-cipher-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
atbash-cipher))
44

55
(deftest encode-no

exercises/practice/bank-account/test/bank_account_test.cljs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(ns bank-account-test
22
(:require
3-
[clojure.test :refer [deftest testing is use-fixtures]]
3+
[cljs.test :refer [deftest is testing] :as t :include-macros true]
44
[bank-account]))
55

66
(defn pcalls
@@ -11,8 +11,8 @@
1111
[& fns] (pmap #(%) fns))
1212

1313
#_(defn shutdown-agents-fixture [f]
14-
(f)
15-
(shutdown-agents))
14+
(f)
15+
(shutdown-agents))
1616

1717
;(use-fixtures :once shutdown-agents-fixture)
1818

exercises/practice/change/test/change_test.cljs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns change-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
[change :refer [issue]]))
44

55
(deftest single-coin-change
@@ -27,12 +27,12 @@
2727

2828
(deftest error-testing-for-change-smallet-than-the-smallest-coin
2929
(is (thrown? js/Error #"cannot change"
30-
(issue 3 #{5 10}))))
30+
(issue 3 #{5 10}))))
3131

3232
(deftest cannot-find-negative-change-values
3333
(is (thrown? js/Error #"cannot change"
34-
(issue -5 #{1 2 5}))))
34+
(issue -5 #{1 2 5}))))
3535

3636
(deftest error-testing-for-no-valid-change
3737
(is (thrown? js/Error #"cannot change"
38-
(issue 10 #{20 8 3}))))
38+
(issue 10 #{20 8 3}))))

exercises/practice/collatz-conjecture/test/collatz_conjecture_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns collatz-conjecture-test
2-
(:require [clojure.test :refer [deftest is testing]]
2+
(:require [cljs.test :refer [deftest is testing] :as t :include-macros true]
33
[collatz-conjecture :refer [collatz]]))
44

55
(deftest steps-for-1

exercises/practice/complex-numbers/test/complex_numbers_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns complex-numbers-test
2-
(:require [clojure.test :refer [deftest is testing]]
2+
(:require [cljs.test :refer [deftest is testing] :as t :include-macros true]
33
[complex-numbers :as c]))
44

55
;; Tests for Real Part

exercises/practice/crypto-square/test/crypto_square_test.cljs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns crypto-square-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
crypto-square))
44

55
(deftest normalize-splunk
@@ -45,4 +45,4 @@
4545
(crypto-square/normalize-ciphertext plaintext)))))
4646
(deftest cipher-6
4747
(is (= "imtgdvs fearwer mayoogo anouuio ntnnlvt wttddes aohghn sseoau "
48-
(crypto-square/normalize-ciphertext "If man was meant to stay on the ground, god would have given us roots."))))
48+
(crypto-square/normalize-ciphertext "If man was meant to stay on the ground, god would have given us roots."))))

exercises/practice/diamond/test/diamond_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns diamond-test
2-
(:require [clojure.test :refer [deftest is are]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
[diamond :refer [diamond]]))
44

55
(deftest single-a-row

exercises/practice/difference-of-squares/test/difference_of_squares_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns difference-of-squares-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
[difference-of-squares :as dos]))
44

55
(deftest square-of-sum-to-5

exercises/practice/etl/test/etl_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns etl-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
etl))
44

55
(deftest transform-one-value

exercises/practice/flatten-array/test/flatten_array_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns flatten-array-test
2-
(:require [clojure.test :refer [deftest is testing]]
2+
(:require [cljs.test :refer [deftest is testing] :as t :include-macros true]
33
[flatten-array]))
44

55
(deftest flattens-array-of-ints

exercises/practice/gigasecond/test/gigasecond_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns gigasecond-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
gigasecond))
44

55
(deftest from-apr-25-2011

exercises/practice/go-counting/test/go_counting_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns go-counting-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
[go-counting :as g]))
44

55
(def example

exercises/practice/grade-school/test/grade_school_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns grade-school-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
grade-school))
44

55
(def db {})

exercises/practice/grains/test/grains_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns grains-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
grains))
44

55
(deftest square-1

exercises/practice/kindergarten-garden/test/kindergarten_garden_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns kindergarten-garden-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
kindergarten-garden))
44

55
(deftest garden-test

exercises/practice/meetup/test/meetup_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns meetup-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
meetup))
44

55
(deftest monteenth-of-may-2013

exercises/practice/minesweeper/test/minesweeper_test.cljs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns minesweeper-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
[clojure.string :refer [join]]
44
[minesweeper :refer [draw]]))
55

@@ -59,4 +59,3 @@
5959
"*****"
6060
"25*52"
6161
" 2*2 "]))))
62-

exercises/practice/nth-prime/test/nth_prime_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns nth-prime-test
2-
(:require [clojure.test :refer [deftest testing is]]
2+
(:require [cljs.test :refer [deftest is testing] :as t :include-macros true]
33
nth-prime))
44

55
(deftest first-prime

exercises/practice/perfect-numbers/test/perfect_numbers_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(ns perfect-numbers-test
22
(:require
3-
[clojure.test :refer [deftest testing is]]
3+
[cljs.test :refer [deftest is testing] :as t :include-macros true]
44
[perfect-numbers]))
55

66
(deftest test-initialize-perfect-number

exercises/practice/pig-latin/test/pig_latin_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns pig-latin-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
pig-latin))
44

55
;; ay is added to words that start with vowels

exercises/practice/poker/test/poker_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns poker-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
[poker :refer [best-hands]]))
44

55
(defn f [xs ys] (= (sort (best-hands xs)) (sort ys)))

exercises/practice/pov/test/pov_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns pov-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
pov))
44

55
;;; Inputs.

exercises/practice/prime-factors/test/prime_factors_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns prime-factors-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
prime-factors))
44

55
(deftest one

exercises/practice/protein-translation/test/protein_translation_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns protein-translation-test
2-
(:require [clojure.test :refer [deftest is are]]
2+
(:require [cljs.test :refer [deftest is are] :as t :include-macros true]
33
protein-translation))
44

55
(deftest AUG-translates-to-Methionine
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
(ns proverb-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
[proverb :refer [recite]]
44
[clojure.string :as str]))
55

66
(deftest zero-pieces
77
(is (=
8-
(recite ())
9-
"")))
10-
8+
(recite ())
9+
"")))
10+
1111
(deftest one-piece
1212
(is (=
13-
(recite '("nail"))
14-
"And all for the want of a nail.")))
13+
(recite '("nail"))
14+
"And all for the want of a nail.")))
1515

1616
(deftest two-pieces
1717
(is (=
18-
(recite '("nail" "shoe"))
19-
(str/join "\n" ["For want of a nail the shoe was lost."
20-
"And all for the want of a nail."]))))
18+
(recite '("nail" "shoe"))
19+
(str/join "\n" ["For want of a nail the shoe was lost."
20+
"And all for the want of a nail."]))))
2121

2222
(deftest three-pieces
2323
(is (=
24-
(recite '("nail" "shoe" "horse"))
25-
(str/join "\n" ["For want of a nail the shoe was lost."
26-
"For want of a shoe the horse was lost."
27-
"And all for the want of a nail."]))))
24+
(recite '("nail" "shoe" "horse"))
25+
(str/join "\n" ["For want of a nail the shoe was lost."
26+
"For want of a shoe the horse was lost."
27+
"And all for the want of a nail."]))))
2828

2929
(deftest full-proverb
3030
(is (= (recite '("nail" "shoe" "horse" "rider" "message" "battle" "kingdom"))
@@ -38,8 +38,8 @@
3838

3939
(deftest four-pieces-modernized
4040
(is (=
41-
(recite '("pin" "gun" "soldier" "battle"))
42-
(str/join "\n" ["For want of a pin the gun was lost."
43-
"For want of a gun the soldier was lost."
44-
"For want of a soldier the battle was lost."
45-
"And all for the want of a pin."]))))
41+
(recite '("pin" "gun" "soldier" "battle"))
42+
(str/join "\n" ["For want of a pin the gun was lost."
43+
"For want of a gun the soldier was lost."
44+
"For want of a soldier the battle was lost."
45+
"And all for the want of a pin."]))))

exercises/practice/queen-attack/test/queen_attack_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns queen-attack-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
queen-attack))
44

55
(def empty-board
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
(ns robot-name-test
2-
(:require [clojure.test :refer [deftest is testing]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
robot-name))
44

55
(deftest robot-name
66
(let [a-robot (robot-name/robot)
77
its-name (robot-name/robot-name a-robot)]
8-
(is (re-seq #"[A-Z]{2}\d{3}" its-name))))
8+
(is (re-seq #"[A-Z]{2}\d{3}" its-name))))
99

1010
(deftest name-matches-pattern
11-
(let [a-robot (robot-name/robot)
12-
its-name (robot-name/robot-name a-robot)]
13-
(is (= its-name (robot-name/robot-name a-robot)))))
11+
(let [a-robot (robot-name/robot)
12+
its-name (robot-name/robot-name a-robot)]
13+
(is (= its-name (robot-name/robot-name a-robot)))))
1414

1515
(deftest different-robots-different-names
16-
(let [a-robot (robot-name/robot)
16+
(let [a-robot (robot-name/robot)
1717
its-name (robot-name/robot-name a-robot)]
18-
(is (not= its-name (-> (robot-name/robot) robot-name/robot-name)))))
18+
(is (not= its-name (-> (robot-name/robot) robot-name/robot-name)))))
1919

2020
(deftest new-name-matches
2121
(let [a-robot (robot-name/robot)
2222
its-original-name (robot-name/robot-name a-robot)
2323
its-new-name (do (robot-name/reset-name a-robot)
2424
(robot-name/robot-name a-robot))]
25-
(is (re-seq #"[A-Z]{2}\d{3}" its-new-name))))
25+
(is (re-seq #"[A-Z]{2}\d{3}" its-new-name))))
2626

2727
(deftest new-name-different
2828
(let [a-robot (robot-name/robot)
2929
its-original-name (robot-name/robot-name a-robot)
3030
its-new-name (do (robot-name/reset-name a-robot)
3131
(robot-name/robot-name a-robot))]
32-
(is (not= its-original-name its-new-name))))
32+
(is (not= its-original-name its-new-name))))
3333

3434
(deftest new-name-does-not-change-until-reset
3535
(let [a-robot (robot-name/robot)
3636
its-original-name (robot-name/robot-name a-robot)
3737
its-new-name (do (robot-name/reset-name a-robot)
3838
(robot-name/robot-name a-robot))]
39-
(is (= its-new-name (robot-name/robot-name a-robot)))))
39+
(is (= its-new-name (robot-name/robot-name a-robot)))))
4040

4141
(deftest new-names-different-each-time
4242
(let [a-robot (robot-name/robot)
4343
its-original-name (robot-name/robot-name a-robot)
4444
its-new-name (do (robot-name/reset-name a-robot)
4545
(robot-name/robot-name a-robot))]
46-
(is (not= its-new-name (do (robot-name/reset-name a-robot)
47-
(robot-name/robot-name a-robot))))))
46+
(is (not= its-new-name (do (robot-name/reset-name a-robot)
47+
(robot-name/robot-name a-robot))))))

exercises/practice/robot-simulator/test/robot_simulator_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns robot-simulator-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
robot-simulator))
44

55
(def robbie (robot-simulator/robot {:x -2 :y 1} :east))

exercises/practice/roman-numerals/test/roman_numerals_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns roman-numerals-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
roman-numerals))
44

55
(deftest one

exercises/practice/rotational-cipher/test/rotational_cipher_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns rotational-cipher-test
2-
(:require [clojure.test :refer [deftest is testing]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
rotational-cipher))
44

55
(deftest rotate-a-by-1

exercises/practice/say/test/say_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns say-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
say))
44

55
(deftest zero-test

exercises/practice/scrabble-score/test/scrabble_score_test.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(ns scrabble-score-test
2-
(:require [clojure.test :refer [deftest is]]
2+
(:require [cljs.test :refer [deftest is] :as t :include-macros true]
33
scrabble-score))
44

55
(deftest lower-case-letter

0 commit comments

Comments
 (0)