Polish expect_named()

Author: hadley

R/expect-named.R

@@ -44,14 +44,14 @@ expect_named <- function(
   exp <- quasi_label(enquo(expected), arg = "expected")
 
   exp$val <- normalise_names(exp$val, ignore.order, ignore.case)
-  act_names <- normalise_names(names(act$val), ignore.order, ignore.case)
-
+  act_names <- labelled_value(
+    normalise_names(names(act$val), ignore.order, ignore.case),
+    paste0("names of ", act$lab)
+  )
   if (ignore.order) {
-    act_names <- labelled_value(act_names, paste0("names(", act$lab, ")"))
     expect_setequal_(act_names, exp)
   } else {
-    act_name <- labelled_value(act_names, paste0("names(", act$lab, ")"))
-    expect_waldo_equal_("equal", act_name, exp)
+    expect_waldo_equal_("equal", act_names, exp)
   }
 
   invisible(act$val)

tests/testthat/_snaps/expect-named.md

@@ -12,7 +12,7 @@
       expect_named(x, "b")
     Condition
       Error:
-      ! Expected names(`x`) to be equal to "b".
+      ! Expected names of `x` to be equal to "b".
       Differences:
       `actual`:   "a"
       `expected`: "b"
@@ -23,7 +23,7 @@
       expect_named(x1, c("a", "b"), ignore.order = TRUE)
     Condition
       Error:
-      ! Expected names(`x1`) to have the same values as `c("a", "b")`.
+      ! Expected names of `x1` to have the same values as `c("a", "b")`.
       Actual: "a"
       Expected: "a", "b"
       Absent: "b"
@@ -34,7 +34,7 @@
       expect_named(x2, "a", ignore.order = TRUE)
     Condition
       Error:
-      ! Expected names(`x2`) to have the same values as "a".
+      ! Expected names of `x2` to have the same values as "a".
       Actual: "a", "b"
       Expected: "a"
       Needs: "b"
@@ -45,7 +45,7 @@
       expect_named(x1, "b", ignore.order = TRUE)
     Condition
       Error:
-      ! Expected names(`x1`) to have the same values as "b".
+      ! Expected names of `x1` to have the same values as "b".
       Actual: "a"
       Expected: "b"
       Needs: "a"
@@ -57,7 +57,7 @@
       expect_named(x1, c("a", "b"), ignore.order = FALSE)
     Condition
       Error:
-      ! Expected names(`x1`) to be equal to `c("a", "b")`.
+      ! Expected names of `x1` to be equal to `c("a", "b")`.
       Differences:
       `actual`:   "a"    
       `expected`: "a" "b"
@@ -68,18 +68,18 @@
       expect_named(x2, "a", ignore.order = FALSE)
     Condition
       Error:
-      ! Expected names(`x2`) to be equal to "a".
+      ! Expected names of `x2` to be equal to "a".
       Differences:
       `actual`:   "a" "b"
       `expected`: "a"    
 
 ---
 
     Code
-      expect_named(x1, c("b"), ignore.order = FALSE)
+      expect_named(x1, "b", ignore.order = FALSE)
     Condition
       Error:
-      ! Expected names(`x1`) to be equal to `c("b")`.
+      ! Expected names of `x1` to be equal to "b".
       Differences:
       `actual`:   "a"
       `expected`: "b"

tests/testthat/test-expect-named.R

@@ -35,7 +35,7 @@ test_that("provide useful feedback on failure", {
 
   expect_snapshot_failure(expect_named(x1, c("a", "b"), ignore.order = FALSE))
   expect_snapshot_failure(expect_named(x2, "a", ignore.order = FALSE))
-  expect_snapshot_failure(expect_named(x1, c("b"), ignore.order = FALSE))
+  expect_snapshot_failure(expect_named(x1, "b", ignore.order = FALSE))
 })
 
 test_that("expect_named validates its inputs", {