Improve consistency

Author: hadley

R/expect-condition.R

@@ -629,9 +629,10 @@ check_condition_dots <- function(
 }
 
 actual_condition <- function(cond) {
-  sprintf(
-    "Actual <%s>:\n%s",
-    paste(class(cond), collapse = "/"),
-    cnd_message(cond)
+  paste0(
+    "Actually got a <",
+    class(cond)[[1]],
+    "> with message:\n",
+    indent_lines(cnd_message(cond))
   )
 }

R/expect-equality.R

@@ -107,22 +107,20 @@ expect_identical <- function(
   } else {
     ident <- identical(act$val, exp$val, ...)
     if (ident) {
-      msg <- ""
+      msg_act <- NULL
     } else {
       compare <- compare(act$val, exp$val)
       if (compare$equal) {
-        msg <- "Objects equal but not identical"
+        msg_act <- "Objects equal but not identical"
       } else {
-        msg <- compare$message
+        msg_act <- compare$message
       }
     }
 
     if (!ident) {
-      msg <- sprintf(
-        "Expected %s to be identical to %s.\n%s",
-        act$lab,
-        exp$lab,
-        msg
+      msg <- c(
+        sprintf("Expected %s to be identical to %s.", act$lab, exp$lab),
+        msg_act
       )
       return(fail(msg, info = info))
     }
@@ -146,12 +144,10 @@ expect_waldo_equal_ <- function(
     y_arg = "expected"
   )
   if (length(comp) != 0) {
-    msg <- sprintf(
-      "Expected %s to be %s to %s.\n\n%s",
-      act$lab,
-      type,
-      exp$lab,
-      paste0(comp, collapse = "\n\n")
+    msg <- c(
+      sprintf("Expected %s to be %s to %s.", act$lab, type, exp$lab),
+      "Differences:",
+      paste0(comp, collpase = "\n")
     )
     return(fail(msg, info = info, trace_env = trace_env))
   }

R/expect-inheritance.R

@@ -70,11 +70,9 @@ expect_type <- function(object, type) {
   act_type <- typeof(act$val)
 
   if (!identical(act_type, type)) {
-    msg <- sprintf(
-      "Expected %s to have type %s.\nActual type: %s",
-      act$lab,
-      format_class(type),
-      format_class(act_type)
+    msg <- c(
+      sprintf("Expected %s to have type %s.", act$lab, format_class(type)),
+      sprintf("Actual type: %s", format_class(act_type))
     )
     return(fail(msg))
   }
@@ -102,16 +100,14 @@ expect_s3_class <- function(object, class, exact = FALSE) {
     if (!isS3(act$val)) {
       msg <- c(
         sprintf("Expected %s to be an S3 object.", act$lab),
-        sprintf("Actually is a %s object.", oo_type(act$val))
+        sprintf("Actual OO type: %s.", oo_type(act$val))
       )
       return(fail(msg))
     } else if (exact) {
       if (!identical(class(act$val), class)) {
-        msg <- sprintf(
-          "Expected %s to have class %s.\nActual class: %s",
-          act$lab,
-          exp_lab,
-          act$class
+        msg <- c(
+          sprintf("Expected %s to have class %s.", act$lab, exp_lab),
+          sprintf("Actual class: %s", act$class)
         )
         return(fail(msg))
       }
@@ -147,7 +143,7 @@ expect_s4_class <- function(object, class) {
     if (!isS4(act$val)) {
       msg <- c(
         sprintf("Expected %s to be an S4 object.", act$lab),
-        sprintf("Actually is a %s object.", oo_type(act$val))
+        sprintf("Actual OO type: %s.", oo_type(act$val))
       )
       return(fail(msg))
     } else {
@@ -175,7 +171,7 @@ expect_r6_class <- function(object, class) {
   if (!inherits(act$val, "R6")) {
     msg <- c(
       sprintf("Expected %s to be an R6 object.", act$lab),
-      sprintf("Actually is a %s object.", oo_type(act$val))
+      sprintf("Actual OO type: %s.", oo_type(act$val))
     )
     return(fail(msg))
   }
@@ -206,7 +202,7 @@ expect_s7_class <- function(object, class) {
   if (!S7::S7_inherits(object)) {
     msg <- c(
       sprintf("Expected %s to be an S7 object.", act$lab),
-      sprintf("Actually is a %s object.", oo_type(act$val))
+      sprintf("Actual OO type: %s.", oo_type(act$val))
     )
     return(fail(msg))
   }
@@ -279,20 +275,17 @@ format_class <- function(x) {
 
 oo_type <- function(x) {
   if (!is.object(x)) {
-    "base"
-  } else if (!isS4(x)) {
+    return("none")
+  }
+  if (isS4(x)) {
+    "S4"
+  } else {
     if (inherits(x, "R6")) {
       "R6"
     } else if (inherits(x, "S7")) {
       "S7"
     } else {
       "S3"
     }
-  } else {
-    if (!is(x, "refClass")) {
-      "S4"
-    } else {
-      "RC"
-    }
   }
 }

R/expect-invisible.R

@@ -27,7 +27,7 @@ expect_invisible <- function(call, label = NULL) {
   if (!identical(vis$visible, FALSE)) {
     msg <- c(
       sprintf("Expected %s to return invisibly.", lab),
-      "Actually returned visibly."
+      "Actual visibility: visible."
     )
     return(fail(msg))
   }
@@ -43,7 +43,7 @@ expect_visible <- function(call, label = NULL) {
   if (!identical(vis$visible, TRUE)) {
     msg <- c(
       sprintf("Expected %s to return visibly.", lab),
-      "Actually returned invisibly."
+      "Actual visibility: invisible."
     )
     return(fail(msg))
   }

R/expect-match.R

@@ -132,14 +132,14 @@ expect_match_ <- function(
   }
   match <- if (negate) "not to match" else "to match"
 
-  exp_msg <- sprintf(
+  msg_exp <- sprintf(
     "Expected %s%s %s %s %s.",
     which,
     act$lab,
     match,
     if (fixed) "string" else "regexp",
     encodeString(regexp, quote = '"')
   )
-  act_msg <- c(paste0("Actual ", title, ':'), text)
-  return(fail(c(exp_msg, act_msg), info = info, trace_env = trace_env))
+  msg_act <- c(paste0("Actual ", title, ':'), text)
+  return(fail(c(msg_exp, msg_act), info = info, trace_env = trace_env))
 }

R/expect-no-condition.R

@@ -108,7 +108,7 @@ expect_no_ <- function(
   act <- quasi_capture(enquo(object), NULL, capture)
 
   if (!is.null(first_match)) {
-    exp_msg <- paste0(
+    msg_exp <- paste0(
       "Expected ",
       act$lab,
       " to run without any ",
@@ -118,13 +118,8 @@ expect_no_ <- function(
       if (!is.null(regexp)) paste0(" matching pattern '", regexp, "'"),
       "."
     )
-    act_msg <- paste0(
-      "Actually got a <",
-      class(first_match)[[1]],
-      "> with message:\n",
-      indent_lines(rlang::cnd_message(first_match))
-    )
-    return(fail(c(exp_msg, act_msg), trace_env = trace_env))
+    msg_act <- actual_condition(first_match)
+    return(fail(c(msg_exp, msg_act), trace_env = trace_env))
   }
 
   pass(act$val)

R/expect-output.R

@@ -36,10 +36,9 @@ expect_output <- function(
 
   if (identical(regexp, NA)) {
     if (!identical(act$cap, "")) {
-      msg <- sprintf(
-        "Expected %s to produce no output.\nActual output:\n%s",
-        act$lab,
-        encodeString(act$cap)
+      msg <- c(
+        sprintf("Expected %s to produce no output.", act$lab),
+        sprintf("Actual output:\n%s", encodeString(act$cap))
       )
       return(fail(msg, info = info))
     }

R/expect-shape.R

@@ -67,7 +67,7 @@ expect_shape = function(object, ..., nrow, ncol, dim) {
     check_number_whole(ncol, allow_na = TRUE)
 
     if (length(dim_object) == 1L) {
-      msg <- sprintf("Expected %s to have more than one dimension.", act$lab)
+      msg <- sprintf("Expected %s to have two or more dimensions.", act$lab)
       return(fail(msg))
     }
 

tests/testthat/_snaps/expect-comparison.md

@@ -1,20 +1,20 @@
 # basic comparisons work
 
     Code
-      expect_lt(10, 10)
+      expect_lt(x, 10)
     Condition
       Error:
-      ! Expected 10 < 10.
+      ! Expected `x` < 10.
       Actual 10.0 >= 10.0
       Difference 0.0 >= 0
 
 ---
 
     Code
-      expect_gt(10, 10)
+      expect_gt(x, 10)
     Condition
       Error:
-      ! Expected 10 > 10.
+      ! Expected `x` > 10.
       Actual 10.0 <= 10.0
       Difference 0.0 <= 0
 

tests/testthat/_snaps/expect-condition.md

@@ -13,8 +13,8 @@
     Condition
       Error:
       ! Expected `stop("Yes")` to not throw a error.
-      Actual <simpleError/error/condition>:
-      Yes
+      Actually got a <simpleError> with message:
+        Yes
 
 # regexp = string matches for error message
 
@@ -49,8 +49,8 @@
     Condition
       Error:
       ! Expected `fb()` to not throw a error.
-      Actual <foobar/rlang_error/error/condition>:
-      dispatched!
+      Actually got a <foobar> with message:
+        dispatched!
 
 # expect_warning validates its inputs
 
@@ -82,8 +82,9 @@
     Condition
       Error:
       ! Expected `message("!")` to not throw a message.
-      Actual <simpleMessage/message/condition>:
-      !
+      Actually got a <simpleMessage> with message:
+        !
+        
 
 # expect_message validates its inputs