Skip to content

Commit b956e1c

Browse files
committed
Return false by default from scheduled-for?
1 parent 9bfbd72 commit b956e1c

2 files changed

Lines changed: 26 additions & 25 deletions

File tree

src/commands/schedule_tasks.janet

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
(string "on " formatted-date) true
3333
"every last day" (date/last-day-of-month? date)
3434
"every last weekday" (date/last-weekday-of-month? date)
35-
"every last Friday" (date/last-friday-of-month? date)))
35+
"every last Friday" (date/last-friday-of-month? date)
36+
false))
3637

3738
(defn- missed-on-day [plan task date]
3839
(find (fn [day] (and (scheduled-for? task (day :date))

test/commands/schedule_tasks_test.janet

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@
1212
(deftest "every Monday"
1313
(def task (task/build-scheduled-task 42 "Weekly meeting" "every Monday"))
1414
(test (scheduled-for? task (d/date 2022 1 24)) true)
15-
(test (not (scheduled-for? task (d/date 2022 1 25))) true))
15+
(test (scheduled-for? task (d/date 2022 1 25)) false))
1616

1717
(deftest "every Tuesday"
1818
(def task (task/build-scheduled-task 42 "Weekly meeting" "every Tuesday"))
19-
(test (not (scheduled-for? task (d/date 2022 1 24))) true)
19+
(test (scheduled-for? task (d/date 2022 1 24)) false)
2020
(test (scheduled-for? task (d/date 2022 1 25)) true))
2121

2222
(deftest "every month"
2323
(def task (task/build-scheduled-task 42 "Review logs" "every month"))
2424
(test (scheduled-for? task (d/date 2022 1 1)) true)
25-
(test (not (scheduled-for? task (d/date 2022 1 2))) true)
25+
(test (scheduled-for? task (d/date 2022 1 2)) false)
2626
(test (scheduled-for? task (d/date 2022 6 1)) true)
27-
(test (not (scheduled-for? task (d/date 2022 6 15))) true))
27+
(test (scheduled-for? task (d/date 2022 6 15)) false))
2828

2929
(deftest "every 3 months"
3030
(def task (task/build-scheduled-task 42 "Review logs" "every 3 months"))
3131
(test (scheduled-for? task (d/date 2022 1 1)) true)
32-
(test (not (scheduled-for? task (d/date 2022 2 1))) true)
33-
(test (not (scheduled-for? task (d/date 2022 3 1))) true)
32+
(test (scheduled-for? task (d/date 2022 2 1)) false)
33+
(test (scheduled-for? task (d/date 2022 3 1)) false)
3434
(test (scheduled-for? task (d/date 2022 4 1)) true)
35-
(test (not (scheduled-for? task (d/date 2022 5 1))) true)
36-
(test (not (scheduled-for? task (d/date 2022 6 1))) true)
35+
(test (scheduled-for? task (d/date 2022 5 1)) false)
36+
(test (scheduled-for? task (d/date 2022 6 1)) false)
3737
(test (scheduled-for? task (d/date 2022 7 1)) true)
38-
(test (not (scheduled-for? task (d/date 2022 8 1))) true)
39-
(test (not (scheduled-for? task (d/date 2022 9 1))) true)
38+
(test (scheduled-for? task (d/date 2022 8 1)) false)
39+
(test (scheduled-for? task (d/date 2022 9 1)) false)
4040
(test (scheduled-for? task (d/date 2022 10 1)) true))
4141

4242
(deftest "every weekday"
@@ -46,33 +46,33 @@
4646
(test (scheduled-for? task (d/date 2022 1 26)) true) # Wednesday
4747
(test (scheduled-for? task (d/date 2022 1 27)) true) # Thursday
4848
(test (scheduled-for? task (d/date 2022 1 28)) true) # Friday
49-
(test (not (scheduled-for? task (d/date 2022 1 29))) true) # Saturday
50-
(test (not (scheduled-for? task (d/date 2022 1 30))) true)) # Sunday
49+
(test (scheduled-for? task (d/date 2022 1 29)) false) # Saturday
50+
(test (scheduled-for? task (d/date 2022 1 30)) false)) # Sunday
5151

5252
(deftest "every month on some date"
5353
(def task (task/build-scheduled-task 42 "Review logs" "every month on 15"))
5454
(test (scheduled-for? task (d/date 2022 1 15)) true)
5555
(test (scheduled-for? task (d/date 2022 2 15)) true)
5656
(test (scheduled-for? task (d/date 2022 10 15)) true)
57-
(test (not (scheduled-for? task (d/date 2022 1 14))) true)
58-
(test (not (scheduled-for? task (d/date 2022 1 16))) true))
57+
(test (scheduled-for? task (d/date 2022 1 14)) false)
58+
(test (scheduled-for? task (d/date 2022 1 16)) false))
5959

6060
(deftest "every year on some date"
6161
(def task (task/build-scheduled-task 42 "Review logs" "every year on 01-27"))
6262
(test (scheduled-for? task (d/date 2022 1 27)) true)
6363
(test (scheduled-for? task (d/date 2023 1 27)) true)
6464
(test (scheduled-for? task (d/date 2024 1 27)) true)
65-
(test (not (scheduled-for? task (d/date 2022 1 26))) true)
66-
(test (not (scheduled-for? task (d/date 2022 1 28))) true)
67-
(test (not (scheduled-for? task (d/date 2022 2 1))) true))
65+
(test (scheduled-for? task (d/date 2022 1 26)) false)
66+
(test (scheduled-for? task (d/date 2022 1 28)) false)
67+
(test (scheduled-for? task (d/date 2022 2 1)) false))
6868

6969
(deftest "on some date"
7070
(def task (task/build-scheduled-task 42 "Review logs" "on 2022-01-27"))
7171
(test (scheduled-for? task (d/date 2022 1 27)) true)
72-
(test (not (scheduled-for? task (d/date 2022 1 26))) true)
73-
(test (not (scheduled-for? task (d/date 2022 1 28))) true)
74-
(test (not (scheduled-for? task (d/date 2022 2 1))) true)
75-
(test (not (scheduled-for? task (d/date 2023 1 27))) true))
72+
(test (scheduled-for? task (d/date 2022 1 26)) false)
73+
(test (scheduled-for? task (d/date 2022 1 28)) false)
74+
(test (scheduled-for? task (d/date 2022 2 1)) false)
75+
(test (scheduled-for? task (d/date 2023 1 27)) false))
7676

7777
(deftest "every last day"
7878
(def task (task/build-scheduled-task 42 "Review logs" "every last day"))
@@ -89,7 +89,7 @@
8989
(test (scheduled-for? task (d/date 2022 11 30)) true)
9090
(test (scheduled-for? task (d/date 2022 12 31)) true)
9191
(test (scheduled-for? task (d/date 2023 1 31)) true)
92-
(test (not (scheduled-for? task (d/date 2022 1 30))) true))
92+
(test (scheduled-for? task (d/date 2022 1 30)) false))
9393

9494
(deftest "every last weekday"
9595
(def task (task/build-scheduled-task 42 "Review logs" "every last weekday"))
@@ -105,7 +105,7 @@
105105
(test (scheduled-for? task (d/date 2022 10 31)) true)
106106
(test (scheduled-for? task (d/date 2022 11 30)) true)
107107
(test (scheduled-for? task (d/date 2022 12 30)) true)
108-
(test (not (scheduled-for? task (d/date 2022 1 30))) true))
108+
(test (scheduled-for? task (d/date 2022 1 30)) false))
109109

110110
(deftest "every last Friday"
111111
(def task (task/build-scheduled-task 42 "Review logs" "every last Friday"))
@@ -114,7 +114,7 @@
114114
(test (scheduled-for? task (d/date 2022 3 25)) true)
115115
(test (scheduled-for? task (d/date 2022 4 29)) true)
116116
(test (scheduled-for? task (d/date 2022 5 27)) true)
117-
(test (not (scheduled-for? task (d/date 2022 1 31))) true))
117+
(test (scheduled-for? task (d/date 2022 1 31)) false))
118118

119119
## —————————————————————————————————————————————————————————————————————————————————————————————————
120120
## Test missed?

0 commit comments

Comments
 (0)