Skip to content

Commit 4b13712

Browse files
authored
Use better wording in expect_setequal() output (#2318)
Fixes #2310.
1 parent 5e51377 commit 4b13712

4 files changed

Lines changed: 9 additions & 8 deletions

File tree

NEWS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# testthat (development version)
22

33
* `run_cpp_tests()` no longer accidentally reports that a test has been skipped (#2315).
4+
* `expect_setequal()` uses better wording in the results (@mcol, #2310).
45

56
# testthat 3.3.2
67

R/expect-setequal.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ expect_setequal_ <- function(msg, act, exp, trace_env = caller_env()) {
5050
msg_act <- c(
5151
sprintf("Actual: %s", values(act$val)),
5252
sprintf("Expected: %s", values(exp$val)),
53-
if (length(act_miss)) sprintf("Needs: %s", values(act_miss)),
53+
if (length(act_miss)) sprintf("Extra: %s", values(act_miss)),
5454
if (length(exp_miss)) sprintf("Absent: %s", values(exp_miss))
5555
)
5656
fail(c(msg_exp, msg_act), trace_env = trace_env)

tests/testthat/_snaps/expect-named.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
! Expected `x2` to have names "a".
3838
Actual: "a", "b"
3939
Expected: "a"
40-
Needs: "b"
40+
Extra: "b"
4141

4242
---
4343

@@ -48,7 +48,7 @@
4848
! Expected `x1` to have names "b".
4949
Actual: "a"
5050
Expected: "b"
51-
Needs: "a"
51+
Extra: "a"
5252
Absent: "b"
5353

5454
---

tests/testthat/_snaps/expect-setequal.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
! Expected "actual" to have the same values as "expected".
3939
Actual: "actual"
4040
Expected: "expected"
41-
Needs: "actual"
41+
Extra: "actual"
4242
Absent: "expected"
4343

4444
---
@@ -50,7 +50,7 @@
5050
! Expected `x` to have the same values as `y`.
5151
Actual: 1, 2
5252
Expected: 2
53-
Needs: 1
53+
Extra: 1
5454

5555
---
5656

@@ -72,7 +72,7 @@
7272
! Expected `x` to have the same values as `y`.
7373
Actual: 1, 2
7474
Expected: 2, 3
75-
Needs: 1
75+
Extra: 1
7676
Absent: 3
7777

7878
---
@@ -84,7 +84,7 @@
8484
! Expected `x` to have the same values as `y`.
8585
Actual: "a", "a"
8686
Expected: "b", "b", "b"
87-
Needs: "a"
87+
Extra: "a"
8888
Absent: "b"
8989

9090
---
@@ -118,7 +118,7 @@
118118
! Expected `x` to have the same names as `y`.
119119
Actual: "a", "b"
120120
Expected: "a"
121-
Needs: "b"
121+
Extra: "b"
122122

123123
---
124124

0 commit comments

Comments
 (0)