Skip to content

Commit d42abe8

Browse files
committed
fixed tests broken by is-approx=, is-data-approx=, or the new random. Also updated all tests to use t/ instead of :refer :all.
1 parent 327f36e commit d42abe8

File tree

5 files changed

+254
-253
lines changed

5 files changed

+254
-253
lines changed

bin/kaocha

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env bash
22

3-
clojure -M:test:test-clj-runner "$@"
3+
clojure -M:local:test:test-clj-runner "$@"

date.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
<orderEntry type="library" name="Deps: orchestra:2021.01.01-1" level="project" />
2323
<orderEntry type="library" name="Deps: org.clojure/tools.reader:1.5.0" level="project" />
2424
<orderEntry type="library" name="Deps: org.clojure/test.check:1.1.2" level="project" />
25-
<orderEntry type="library" name="Deps: provisdom/test:07d497" level="project" />
2625
<orderEntry type="library" name="Deps: org.clojure/core.memoize:1.1.266" level="project" />
2726
<orderEntry type="library" name="Deps: org.clojure/data.priority-map:1.2.0" level="project" />
2827
<orderEntry type="library" name="Deps: org.clojure/core.cache:1.1.234" level="project" />
2928
<orderEntry type="library" name="Deps: org.clojure/core.async:1.8.741" level="project" />
3029
<orderEntry type="module" module-name="utility-belt" />
3130
<orderEntry type="module" module-name="math" />
31+
<orderEntry type="module" module-name="test" />
3232
</component>
3333
</module>

deps.edn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
provisdom/utility-belt {:git/url "https://github.com/Provisdom/utility-belt.git"
66
:sha "c4bcc1478fa8d866baff56ec1bf5c4bb353c5353"}}
77
:aliases {:local {:override-deps {provisdom/math {:local/root "../math"}
8+
provisdom/test {:local/root "../test"}
89
provisdom/utility-belt {:local/root "../utility-belt"}}}
910
:test {:extra-paths ["test"]
1011
:extra-deps {orchestra/orchestra {:mvn/version "2021.01.01-1"}

test/provisdom/date/instant_test.clj

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[orchestra.spec.test :as ost]
66
[provisdom.date.instant :as instant]
77
[provisdom.math.core :as m]
8-
[provisdom.test.core :refer :all]))
8+
[provisdom.test.core :as t]))
99

1010
;2 seconds
1111

@@ -15,109 +15,109 @@
1515

1616
;;;LEAP YEARS
1717
(deftest leap-year?-test
18-
(is (spec-check instant/leap-year?))
18+
(is (t/spec-check instant/leap-year?))
1919
(is (instant/leap-year? 2000))
20-
(is-not (instant/leap-year? 2001))
20+
(t/is-not (instant/leap-year? 2001))
2121
(is (instant/leap-year? 2004)))
2222

2323
(deftest days-in-month-test
24-
(is (spec-check instant/days-in-month))
25-
(is= 31 (instant/days-in-month [2014 3]))
26-
(is= 28 (instant/days-in-month [2014 2]))
27-
(is= 31 (instant/days-in-month [2014 1]))
28-
(is= 29 (instant/days-in-month [2004 2])))
24+
(is (t/spec-check instant/days-in-month))
25+
(t/is= 31 (instant/days-in-month [2014 3]))
26+
(t/is= 28 (instant/days-in-month [2014 2]))
27+
(t/is= 31 (instant/days-in-month [2014 1]))
28+
(t/is= 29 (instant/days-in-month [2004 2])))
2929

3030
(deftest days-until-month-test
31-
(is (spec-check instant/days-until-month))
32-
(is= 59 (instant/days-until-month [2014 3]))
33-
(is= 31 (instant/days-until-month [2014 2]))
31+
(is (t/spec-check instant/days-until-month))
32+
(t/is= 59 (instant/days-until-month [2014 3]))
33+
(t/is= 31 (instant/days-until-month [2014 2]))
3434
(is (zero? (instant/days-until-month [2014 1])))
35-
(is= 31 (instant/days-until-month [2004 2])))
35+
(t/is= 31 (instant/days-until-month [2004 2])))
3636

3737
(deftest passed-leap-days-test
38-
(is (spec-check instant/passed-leap-days))
39-
(is= 2425 (instant/passed-leap-days [0 1] [9999 12]))
40-
(is= -2425 (instant/passed-leap-days [9999 12] [0 1]))
41-
(is= 124 (instant/passed-leap-days [1814 1] [2325 12]))
42-
(is= -124 (instant/passed-leap-days [2325 12] [1814 1]))
43-
(is= -13 (instant/passed-leap-days [2070 1] [2016 3]))
44-
(is= -14 (instant/passed-leap-days [2070 1] [2014 2]))
45-
(is= 2 (instant/passed-leap-days [2014 2] [2020 9]))
38+
(is (t/spec-check instant/passed-leap-days))
39+
(t/is= 2425 (instant/passed-leap-days [0 1] [9999 12]))
40+
(t/is= -2425 (instant/passed-leap-days [9999 12] [0 1]))
41+
(t/is= 124 (instant/passed-leap-days [1814 1] [2325 12]))
42+
(t/is= -124 (instant/passed-leap-days [2325 12] [1814 1]))
43+
(t/is= -13 (instant/passed-leap-days [2070 1] [2016 3]))
44+
(t/is= -14 (instant/passed-leap-days [2070 1] [2014 2]))
45+
(t/is= 2 (instant/passed-leap-days [2014 2] [2020 9]))
4646
(is (zero? (instant/passed-leap-days [2014 2] [2014 5])))
47-
(is= 1 (instant/passed-leap-days [2000 1] [2000 3]))
48-
(is= 1 (instant/passed-leap-days [2000 1] [2004 1]))
49-
(is= 2 (instant/passed-leap-days [2000 1] [2004 3]))
50-
(is= 2 (instant/passed-leap-days [2000 1] [2005 1]))
51-
(is= 25 (instant/passed-leap-days [2000 1] [2100 1]))
52-
(is= 25 (instant/passed-leap-days [2000 1] [2100 3]))
47+
(t/is= 1 (instant/passed-leap-days [2000 1] [2000 3]))
48+
(t/is= 1 (instant/passed-leap-days [2000 1] [2004 1]))
49+
(t/is= 2 (instant/passed-leap-days [2000 1] [2004 3]))
50+
(t/is= 2 (instant/passed-leap-days [2000 1] [2005 1]))
51+
(t/is= 25 (instant/passed-leap-days [2000 1] [2100 1]))
52+
(t/is= 25 (instant/passed-leap-days [2000 1] [2100 3]))
5353
(is (zero? (instant/passed-leap-days [2000 1] [1996 3])))
54-
(is= -1 (instant/passed-leap-days [2000 1] [1996 1]))
55-
(is= -24 (instant/passed-leap-days [2000 1] [1900 3]))
56-
(is= -24 (instant/passed-leap-days [2000 1] [1900 1])))
54+
(t/is= -1 (instant/passed-leap-days [2000 1] [1996 1]))
55+
(t/is= -24 (instant/passed-leap-days [2000 1] [1900 3]))
56+
(t/is= -24 (instant/passed-leap-days [2000 1] [1900 1])))
5757

5858
;;;INST
5959
#_(deftest inst$-test
60-
(is (spec-check instant/inst$))
61-
(is= #inst "2020-05-05T20:57:50.661-00:00"
60+
(is (t/spec-check instant/inst$))
61+
(t/is= #inst "2020-05-05T20:57:50.661-00:00"
6262
(instant/inst$)))
6363

6464
(deftest inst->in-ms-test
65-
(is (spec-check instant/inst->in-ms))
66-
(is= 3155760000000
65+
(is (t/spec-check instant/inst->in-ms))
66+
(t/is= 3155760000000
6767
(instant/inst->in-ms #inst"2070-01-01T00:00:00.000-00:00"))
68-
(is= 0
68+
(t/is= 0
6969
(instant/inst->in-ms #inst"1970-01-01T00:00:00.000-00:00"))
70-
(is= -62135769600000
70+
(t/is= -62135769600000
7171
(instant/inst->in-ms #inst"0001-01-01T00:00:00.000-00:00"))
72-
(is= 253402300799999
72+
(t/is= 253402300799999
7373
(instant/inst->in-ms #inst"9999-12-31T23:59:59.999-00:00")))
7474

7575
(deftest java-date->inst-by-bounding-test
76-
(is (spec-check instant/java-date->inst-by-bounding))
77-
(is= #inst"0000-01-01T00:00:00.000-00:00"
76+
(is (t/spec-check instant/java-date->inst-by-bounding))
77+
(t/is= #inst"0000-01-01T00:00:00.000-00:00"
7878
(instant/java-date->inst-by-bounding #inst"0000-01-01T00:00:00.000-00:00"))
79-
(is= #inst"9999-12-31T23:59:59.999-00:00"
79+
(t/is= #inst"9999-12-31T23:59:59.999-00:00"
8080
(instant/java-date->inst-by-bounding #inst"9999-12-31T23:59:59.999-00:00"))
81-
(is= #inst"2070-01-01T00:00:00.000-00:00"
81+
(t/is= #inst"2070-01-01T00:00:00.000-00:00"
8282
(instant/java-date->inst-by-bounding #inst"2070-01-01T00:00:00.000-00:00")))
8383

8484
;;;IN-MS
8585
#_(deftest in-ms$-test
86-
(is (spec-check instant/in-ms$))
87-
(is= 1588705104037 (instant/in-ms$)))
86+
(is (t/spec-check instant/in-ms$))
87+
(t/is= 1588705104037 (instant/in-ms$)))
8888

8989
(deftest in-ms->inst-test
90-
(is (spec-check instant/in-ms->inst))
91-
(is= #inst"2070-01-01T00:00:00.000-00:00"
90+
(is (t/spec-check instant/in-ms->inst))
91+
(t/is= #inst"2070-01-01T00:00:00.000-00:00"
9292
(instant/in-ms->inst 3155760000000))
93-
(is= #inst"1970-01-01T00:00:00.000-00:00"
93+
(t/is= #inst"1970-01-01T00:00:00.000-00:00"
9494
(instant/in-ms->inst 0))
95-
(is= #inst"0001-01-01T00:00:00.000-00:00"
95+
(t/is= #inst"0001-01-01T00:00:00.000-00:00"
9696
(instant/in-ms->inst -62135769600000))
97-
(is= #inst"9999-12-31T23:59:59.999-00:00"
97+
(t/is= #inst"9999-12-31T23:59:59.999-00:00"
9898
(instant/in-ms->inst 253402300799999)))
9999

100100
(deftest ms->in-ms-by-bounding-test
101-
(is (spec-check instant/ms->in-ms-by-bounding))
102-
(is= -62135769600000 (instant/ms->in-ms-by-bounding m/min-long))
103-
(is= 253402300799999 (instant/ms->in-ms-by-bounding m/max-long))
104-
(is= 0 (instant/ms->in-ms-by-bounding 0)))
101+
(is (t/spec-check instant/ms->in-ms-by-bounding))
102+
(t/is= -62135769600000 (instant/ms->in-ms-by-bounding m/min-long))
103+
(t/is= 253402300799999 (instant/ms->in-ms-by-bounding m/max-long))
104+
(t/is= 0 (instant/ms->in-ms-by-bounding 0)))
105105

106106
;;;AVERAGE YEARS
107107
(deftest in-ms->average-years-test
108-
(is (spec-check instant/in-ms->average-years))
109-
(is= 9.342597625683242
108+
(is (t/spec-check instant/in-ms->average-years))
109+
(t/is= 9.342597625683242
110110
(instant/in-ms->average-years 294823904829))
111-
(is= -7.839309068885994E-5
111+
(t/is= -7.839309068885994E-5
112112
(instant/in-ms->average-years -2473847)))
113113

114114
(deftest inst-interval->average-years-test
115-
(is (spec-check instant/inst-interval->average-years))
116-
(is= 3.901584981971643E-4
115+
(is (t/spec-check instant/inst-interval->average-years))
116+
(t/is= 3.901584981971643E-4
117117
(instant/inst-interval->average-years
118118
[(instant/in-ms->inst 29029)
119119
(instant/in-ms->inst 12341242)]))
120-
(is= 3.919982829773927E-4
120+
(t/is= 3.919982829773927E-4
121121
(instant/inst-interval->average-years
122122
[(instant/in-ms->inst -29029)
123123
(instant/in-ms->inst 12341242)])))

0 commit comments

Comments
 (0)