use expect_setequal_() in expect_named()

Author: EmilHvitfeldt

R/expect-named.R

@@ -45,28 +45,11 @@ expect_named <- function(
   exp <- quasi_label(enquo(expected), arg = "expected")
 
   exp$val <- normalise_names(exp$val, ignore.order, ignore.case)
-  act$names <- normalise_names(act$names, ignore.order, ignore.case)
+  act_names <- normalise_names(act$names, ignore.order, ignore.case)
 
   if (ignore.order) {
-    act_miss <- unique(act$names[!act$names %in% exp$val])
-    exp_miss <- unique(exp$val[!exp$val %in% act$names])
-
-    if (length(exp_miss) != 0 || length(act_miss) != 0) {
-      msg <- paste0(
-        "Names of ",
-        act$lab,
-        " (`actual`) and ",
-        exp$lab,
-        " (`expected`) don't have the same values.\n",
-        if (length(act_miss)) {
-          paste0("* Only in `actual`: ", values(act_miss), "\n")
-        },
-        if (length(exp_miss)) {
-          paste0("* Only in `expected`: ", values(exp_miss), "\n")
-        }
-      )
-      return(fail(msg))
-    }
+    act <- labelled_value(act_names, act$lab)
+    return(expect_setequal_(act, exp))
   } else {
     if (!identical(act$names, exp$val)) {
       msg <- sprintf(

tests/testthat/_snaps/expect-named.md

@@ -1,18 +1,18 @@
 # provide useful feedback on failure
 
-    Names of c(a = 1) (`actual`) and c("a", "b") (`expected`) don't have the same values.
+    c(a = 1) (`actual`) and c("a", "b") (`expected`) don't have the same values.
     * Only in `expected`: "b"
 
 
 ---
 
-    Names of c(a = 1, b = 1) (`actual`) and c("a") (`expected`) don't have the same values.
+    c(a = 1, b = 1) (`actual`) and c("a") (`expected`) don't have the same values.
     * Only in `actual`: "b"
 
 
 ---
 
-    Names of c(a = 1) (`actual`) and c("b") (`expected`) don't have the same values.
+    c(a = 1) (`actual`) and c("b") (`expected`) don't have the same values.
     * Only in `actual`: "a"
     * Only in `expected`: "b"