Skip to content

Commit ecd5029

Browse files
hadleyhadley
committed
Bring back expect_waldo_constant_ 
1 parent 8e09c6e commit ecd5029

12 files changed

+84
-59
lines changed

‎R/expect-constant.R‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ NULL
3131
expect_true <- function(object, info = NULL, label = NULL) {
3232
act <- quasi_label(enquo(object), label)
3333
exp <- labelled_value(TRUE, "TRUE")
34-
expect_waldo_equal_("equal", act, exp, info = info, ignore_attr = TRUE)
34+
expect_waldo_constant_(act, exp, info = info, ignore_attr = TRUE)
3535
}
3636

3737
#' @export
3838
#' @rdname logical-expectations
3939
expect_false <- function(object, info = NULL, label = NULL) {
4040
act <- quasi_label(enquo(object), label)
4141
exp <- labelled_value(FALSE, "FALSE")
42-
expect_waldo_equal_("equal", act, exp, info = info, ignore_attr = TRUE)
42+
expect_waldo_constant_(act, exp, info = info, ignore_attr = TRUE)
4343
}
4444

4545
#' Do you expect `NULL`?
@@ -59,5 +59,30 @@ expect_false <- function(object, info = NULL, label = NULL) {
5959
expect_null <- function(object, info = NULL, label = NULL) {
6060
act <- quasi_label(enquo(object), label)
6161
exp <- labelled_value(NULL, "FALSE")
62-
expect_waldo_equal_("equal", act, exp, info = info)
62+
expect_waldo_constant_(act, exp, info = info)
63+
}
64+
65+
expect_waldo_constant_ <- function(
66+
act,
67+
exp,
68+
...,
69+
info = NULL,
70+
trace_env = caller_env()
71+
) {
72+
comp <- waldo_compare(
73+
act$val,
74+
exp$val,
75+
...,
76+
x_arg = "actual",
77+
y_arg = "expected"
78+
)
79+
if (length(comp) != 0) {
80+
msg <- c(
81+
sprintf("Expected %s to be %s.", act$lab, exp$lab),
82+
"Differences:",
83+
paste0(comp, collpase = "\n")
84+
)
85+
return(fail(msg, info = info, trace_env = trace_env))
86+
}
87+
pass(act$val)
6388
}

‎tests/testthat/_snaps/expect-constant.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
expect_true(df)
55
Condition
66
Error:
7-
! Expected `df` to be equal to TRUE.
7+
! Expected `df` to be TRUE.
88
Differences:
99
`actual` is an S3 object of class <data.frame>, a list
1010
`expected` is a logical vector (TRUE)
@@ -15,7 +15,7 @@
1515
expect_false(df)
1616
Condition
1717
Error:
18-
! Expected `df` to be equal to FALSE.
18+
! Expected `df` to be FALSE.
1919
Differences:
2020
`actual` is an S3 object of class <data.frame>, a list
2121
`expected` is a logical vector (FALSE)
@@ -26,7 +26,7 @@
2626
expect_true(FALSE, "NOPE")
2727
Condition
2828
Error:
29-
! Expected FALSE to be equal to TRUE.
29+
! Expected FALSE to be TRUE.
3030
Differences:
3131
`actual`: FALSE
3232
`expected`: TRUE
@@ -39,7 +39,7 @@
3939
expect_false(TRUE, "YUP")
4040
Condition
4141
Error:
42-
! Expected TRUE to be equal to FALSE.
42+
! Expected TRUE to be FALSE.
4343
Differences:
4444
`actual`: TRUE
4545
`expected`: FALSE
@@ -52,7 +52,7 @@
5252
expect_null(df)
5353
Condition
5454
Error:
55-
! Expected `df` to be equal to FALSE.
55+
! Expected `df` to be FALSE.
5656
Differences:
5757
`actual` is an S3 object of class <data.frame>, a list
5858
`expected` is NULL

‎tests/testthat/_snaps/expect-self-test.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
show_failure(expect_true(FALSE))
103103
Output
104104
Failed expectation:
105-
Expected FALSE to be equal to TRUE.
105+
Expected FALSE to be TRUE.
106106
Differences:
107107
`actual`: FALSE
108108
`expected`: TRUE

‎tests/testthat/_snaps/reporter-check.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515

1616
== Failed tests ================================================================
1717
-- Failure ('reporters/tests.R:12:3'): Failure:1 -------------------------------
18-
Expected FALSE to be equal to TRUE.
18+
Expected FALSE to be TRUE.
1919
Differences:
2020
`actual`: FALSE
2121
`expected`: TRUE
2222

2323
-- Failure ('reporters/tests.R:16:8'): Failure:2a ------------------------------
24-
Expected FALSE to be equal to TRUE.
24+
Expected FALSE to be TRUE.
2525
Differences:
2626
`actual`: FALSE
2727
`expected`: TRUE
@@ -73,13 +73,13 @@
7373

7474
== Failed tests ================================================================
7575
-- Failure ('reporters/tests.R:12:3'): Failure:1 -------------------------------
76-
Expected FALSE to be equal to TRUE.
76+
Expected FALSE to be TRUE.
7777
Differences:
7878
`actual`: FALSE
7979
`expected`: TRUE
8080

8181
-- Failure ('reporters/tests.R:16:8'): Failure:2a ------------------------------
82-
Expected FALSE to be equal to TRUE.
82+
Expected FALSE to be TRUE.
8383
Differences:
8484
`actual`: FALSE
8585
`expected`: TRUE

‎tests/testthat/_snaps/reporter-debug.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# produces consistent output
22

33
1: expect_true(FALSE)
4-
2: expect_waldo_equal_("equal", act, exp, info = info, ignore_attr = TRUE)
4+
2: expect_waldo_constant_(act, exp, info = info, ignore_attr = TRUE)
55
3: fail(msg, info = info, trace_env = trace_env)
66

77
1: f()
88
2: expect_true(FALSE)
9-
3: expect_waldo_equal_("equal", act, exp, info = info, ignore_attr = TRUE)
9+
3: expect_waldo_constant_(act, exp, info = info, ignore_attr = TRUE)
1010
4: fail(msg, info = info, trace_env = trace_env)
1111

1212
1: stop("stop")

‎tests/testthat/_snaps/reporter-junit.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
</testsuite>
88
<testsuite name="Failures" timestamp="1999:12:31 23:59:59" hostname="nodename" tests="2" skipped="0" failures="2" errors="0" time="0">
99
<testcase time="0" classname="Failures" name="Failure_1">
10-
<failure type="failure" message="Expected FALSE to be equal to TRUE. ('reporters/tests.R:12:3')">Expected FALSE to be equal to TRUE.
10+
<failure type="failure" message="Expected FALSE to be TRUE. ('reporters/tests.R:12:3')">Expected FALSE to be TRUE.
1111
Differences:
1212
`actual`: FALSE
1313
`expected`: TRUE
1414
</failure>
1515
</testcase>
1616
<testcase time="0" classname="Failures" name="Failure_2a">
17-
<failure type="failure" message="Expected FALSE to be equal to TRUE. ('reporters/tests.R:16:8')">Expected FALSE to be equal to TRUE.
17+
<failure type="failure" message="Expected FALSE to be TRUE. ('reporters/tests.R:16:8')">Expected FALSE to be TRUE.
1818
Differences:
1919
`actual`: FALSE
2020
`expected`: TRUE

‎tests/testthat/_snaps/reporter-progress.md‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -66,77 +66,77 @@
6666
x | 11 0 | reporters/fail-many
6767
--------------------------------------------------------------------------------
6868
Failure ('reporters/fail-many.R:3:5'): Example
69-
Expected FALSE to be equal to TRUE.
69+
Expected FALSE to be TRUE.
7070
Differences:
7171
`actual`: FALSE
7272
`expected`: TRUE
7373

7474

7575
Failure ('reporters/fail-many.R:3:5'): Example
76-
Expected FALSE to be equal to TRUE.
76+
Expected FALSE to be TRUE.
7777
Differences:
7878
`actual`: FALSE
7979
`expected`: TRUE
8080

8181

8282
Failure ('reporters/fail-many.R:3:5'): Example
83-
Expected FALSE to be equal to TRUE.
83+
Expected FALSE to be TRUE.
8484
Differences:
8585
`actual`: FALSE
8686
`expected`: TRUE
8787

8888

8989
Failure ('reporters/fail-many.R:3:5'): Example
90-
Expected FALSE to be equal to TRUE.
90+
Expected FALSE to be TRUE.
9191
Differences:
9292
`actual`: FALSE
9393
`expected`: TRUE
9494

9595

9696
Failure ('reporters/fail-many.R:3:5'): Example
97-
Expected FALSE to be equal to TRUE.
97+
Expected FALSE to be TRUE.
9898
Differences:
9999
`actual`: FALSE
100100
`expected`: TRUE
101101

102102

103103
Failure ('reporters/fail-many.R:3:5'): Example
104-
Expected FALSE to be equal to TRUE.
104+
Expected FALSE to be TRUE.
105105
Differences:
106106
`actual`: FALSE
107107
`expected`: TRUE
108108

109109

110110
Failure ('reporters/fail-many.R:3:5'): Example
111-
Expected FALSE to be equal to TRUE.
111+
Expected FALSE to be TRUE.
112112
Differences:
113113
`actual`: FALSE
114114
`expected`: TRUE
115115

116116

117117
Failure ('reporters/fail-many.R:3:5'): Example
118-
Expected FALSE to be equal to TRUE.
118+
Expected FALSE to be TRUE.
119119
Differences:
120120
`actual`: FALSE
121121
`expected`: TRUE
122122

123123

124124
Failure ('reporters/fail-many.R:3:5'): Example
125-
Expected FALSE to be equal to TRUE.
125+
Expected FALSE to be TRUE.
126126
Differences:
127127
`actual`: FALSE
128128
`expected`: TRUE
129129

130130

131131
Failure ('reporters/fail-many.R:3:5'): Example
132-
Expected FALSE to be equal to TRUE.
132+
Expected FALSE to be TRUE.
133133
Differences:
134134
`actual`: FALSE
135135
`expected`: TRUE
136136

137137

138138
Failure ('reporters/fail-many.R:3:5'): Example
139-
Expected FALSE to be equal to TRUE.
139+
Expected FALSE to be TRUE.
140140
Differences:
141141
`actual`: FALSE
142142
`expected`: TRUE
@@ -294,7 +294,7 @@
294294
26. \-f(x - 1)
295295

296296
Failure ('reporters/backtraces.R:62:6'): (code run outside of `test_that()`)
297-
Expected FALSE to be equal to TRUE.
297+
Expected FALSE to be TRUE.
298298
Differences:
299299
`actual`: FALSE
300300
`expected`: TRUE
@@ -307,7 +307,7 @@
307307
4. \-testthat::expect_true(FALSE)
308308

309309
Failure ('reporters/backtraces.R:67:3'): nested expectations get backtraces
310-
Expected FALSE to be equal to TRUE.
310+
Expected FALSE to be TRUE.
311311
Differences:
312312
`actual`: FALSE
313313
`expected`: TRUE
@@ -416,7 +416,7 @@
416416
26. \-f(x - 1)
417417

418418
Failure ('reporters/backtraces.R:62:6'): (code run outside of `test_that()`)
419-
Expected FALSE to be equal to TRUE.
419+
Expected FALSE to be TRUE.
420420
Differences:
421421
`actual`: FALSE
422422
`expected`: TRUE
@@ -429,7 +429,7 @@
429429
4. \-testthat::expect_true(FALSE)
430430

431431
Failure ('reporters/backtraces.R:67:3'): nested expectations get backtraces
432-
Expected FALSE to be equal to TRUE.
432+
Expected FALSE to be TRUE.
433433
Differences:
434434
`actual`: FALSE
435435
`expected`: TRUE
@@ -476,14 +476,14 @@
476476
[ FAIL 2 | WARN 0 | SKIP 0 | PASS 1 ]
477477

478478
-- Failure ('reporters/tests.R:12:3'): Failure:1 -------------------------------
479-
Expected FALSE to be equal to TRUE.
479+
Expected FALSE to be TRUE.
480480
Differences:
481481
`actual`: FALSE
482482
`expected`: TRUE
483483

484484

485485
-- Failure ('reporters/tests.R:16:8'): Failure:2a ------------------------------
486-
Expected FALSE to be equal to TRUE.
486+
Expected FALSE to be TRUE.
487487
Differences:
488488
`actual`: FALSE
489489
`expected`: TRUE
@@ -576,77 +576,77 @@
576576
x | 11 0 | reporters/fail-many
577577
--------------------------------------------------------------------------------
578578
Failure ('reporters/fail-many.R:3:5'): Example
579-
Expected FALSE to be equal to TRUE.
579+
Expected FALSE to be TRUE.
580580
Differences:
581581
`actual`: FALSE
582582
`expected`: TRUE
583583

584584

585585
Failure ('reporters/fail-many.R:3:5'): Example
586-
Expected FALSE to be equal to TRUE.
586+
Expected FALSE to be TRUE.
587587
Differences:
588588
`actual`: FALSE
589589
`expected`: TRUE
590590

591591

592592
Failure ('reporters/fail-many.R:3:5'): Example
593-
Expected FALSE to be equal to TRUE.
593+
Expected FALSE to be TRUE.
594594
Differences:
595595
`actual`: FALSE
596596
`expected`: TRUE
597597

598598

599599
Failure ('reporters/fail-many.R:3:5'): Example
600-
Expected FALSE to be equal to TRUE.
600+
Expected FALSE to be TRUE.
601601
Differences:
602602
`actual`: FALSE
603603
`expected`: TRUE
604604

605605

606606
Failure ('reporters/fail-many.R:3:5'): Example
607-
Expected FALSE to be equal to TRUE.
607+
Expected FALSE to be TRUE.
608608
Differences:
609609
`actual`: FALSE
610610
`expected`: TRUE
611611

612612

613613
Failure ('reporters/fail-many.R:3:5'): Example
614-
Expected FALSE to be equal to TRUE.
614+
Expected FALSE to be TRUE.
615615
Differences:
616616
`actual`: FALSE
617617
`expected`: TRUE
618618

619619

620620
Failure ('reporters/fail-many.R:3:5'): Example
621-
Expected FALSE to be equal to TRUE.
621+
Expected FALSE to be TRUE.
622622
Differences:
623623
`actual`: FALSE
624624
`expected`: TRUE
625625

626626

627627
Failure ('reporters/fail-many.R:3:5'): Example
628-
Expected FALSE to be equal to TRUE.
628+
Expected FALSE to be TRUE.
629629
Differences:
630630
`actual`: FALSE
631631
`expected`: TRUE
632632

633633

634634
Failure ('reporters/fail-many.R:3:5'): Example
635-
Expected FALSE to be equal to TRUE.
635+
Expected FALSE to be TRUE.
636636
Differences:
637637
`actual`: FALSE
638638
`expected`: TRUE
639639

640640

641641
Failure ('reporters/fail-many.R:3:5'): Example
642-
Expected FALSE to be equal to TRUE.
642+
Expected FALSE to be TRUE.
643643
Differences:
644644
`actual`: FALSE
645645
`expected`: TRUE
646646

647647

648648
Failure ('reporters/fail-many.R:3:5'): Example
649-
Expected FALSE to be equal to TRUE.
649+
Expected FALSE to be TRUE.
650650
Differences:
651651
`actual`: FALSE
652652
`expected`: TRUE

0 commit comments

Comments
 (0)