Adjust set_equal and friends

Author: hadley

R/expect-setequal.R

@@ -138,11 +138,11 @@ expect_contains <- function(object, expected) {
   if (any(exp_miss)) {
     return(fail(paste0(
       act$lab,
-      " (`actual`) doesn't fully contain all the values in ",
+      " doesn't fully contain all the values in ",
       exp$lab,
-      " (`expected`).\n",
-      paste0("* Missing from `actual`: ", values(exp$val[exp_miss]), "\n"),
-      paste0("* Present in `actual`:   ", values(act$val), "\n")
+      ".\n",
+      paste0("* Missing from ", act$lab, ": ", values(exp$val[exp_miss]), "\n"),
+      paste0("* Present in ", act$lab, ":   ", values(act$val), "\n")
     )))
   }
 
@@ -164,11 +164,11 @@ expect_in <- function(object, expected) {
   if (any(act_miss)) {
     return(fail(paste0(
       act$lab,
-      " (`actual`) isn't fully contained within ",
+      " isn't fully contained within ",
       exp$lab,
-      " (`expected`).\n",
-      paste0("* Missing from `expected`: ", values(act$val[act_miss]), "\n"),
-      paste0("* Present in `expected`:   ", values(exp$val), "\n")
+      ".\n",
+      paste0("* Missing from ", act$lab, ": ", values(act$val[act_miss]), "\n"),
+      paste0("* Present in ", act$lab, ":   ", values(exp$val), "\n")
     )))
   }
 

tests/testthat/_snaps/expect-setequal.md

@@ -45,29 +45,29 @@
 
 # expect_contains() gives useful message on failure
 
-    `x1` (`actual`) doesn't fully contain all the values in `x2` (`expected`).
-    * Missing from `actual`: "d"
-    * Present in `actual`:   "a", "b", "c"
+    `x1` doesn't fully contain all the values in `x2`.
+    * Missing from `x1`: "d"
+    * Present in `x1`:   "a", "b", "c"
 
 
 ---
 
-    `x1` (`actual`) doesn't fully contain all the values in `x3` (`expected`).
-    * Missing from `actual`: "d", "e"
-    * Present in `actual`:   "a", "b", "c"
+    `x1` doesn't fully contain all the values in `x3`.
+    * Missing from `x1`: "d", "e"
+    * Present in `x1`:   "a", "b", "c"
 
 
 # expect_in() gives useful message on failure
 
-    `x1` (`actual`) isn't fully contained within `x2` (`expected`).
-    * Missing from `expected`: "a"
-    * Present in `expected`:   "b", "c"
+    `x1` isn't fully contained within `x2`.
+    * Missing from `x1`: "a"
+    * Present in `x1`:   "b", "c"
 
 
 ---
 
-    `x1` (`actual`) isn't fully contained within `x3` (`expected`).
-    * Missing from `expected`: "a", "b"
-    * Present in `expected`:   "d", "e"
+    `x1` isn't fully contained within `x3`.
+    * Missing from `x1`: "a", "b"
+    * Present in `x1`:   "d", "e"