More consistentct

Author: hadley

R/expect-condition.R

@@ -455,7 +455,7 @@ compare_condition_3e <- function(cond_type, cond_class, cond, lab, expected) {
   } else {
     if (!is.null(cond)) {
       c(
-        sprintf("Expected %s to not throw a %s.", lab, cond_type),
+        sprintf("Expected %s to not throw any %ss.", lab, cond_type),
         actual_condition(cond)
       )
     } else {

R/expect-constant.R

@@ -58,7 +58,7 @@ expect_false <- function(object, info = NULL, label = NULL) {
 #' show_failure(expect_null(y))
 expect_null <- function(object, info = NULL, label = NULL) {
   act <- quasi_label(enquo(object), label)
-  exp <- labelled_value(NULL, "FALSE")
+  exp <- labelled_value(NULL, "NULL")
   expect_waldo_constant_(act, exp, info = info)
 }
 

R/expect-equality.R

@@ -77,10 +77,9 @@ expect_equal <- function(
     }
 
     if (!comp$equal) {
-      msg <- sprintf(
-        "Expected %s to equal %s.\nActual:\n%s",
-        act$lab,
-        exp$lab,
+      msg <- c(
+        sprintf("Expected %s to equal %s.", act$lab, exp$lab),
+        "Differences:",
         comp$message
       )
       return(fail(msg, info = info))
@@ -89,6 +88,7 @@ expect_equal <- function(
   }
 }
 
+
 #' @export
 #' @rdname equality-expectations
 expect_identical <- function(
@@ -120,6 +120,7 @@ expect_identical <- function(
     if (!ident) {
       msg <- c(
         sprintf("Expected %s to be identical to %s.", act$lab, exp$lab),
+        "Differences:",
         msg_act
       )
       return(fail(msg, info = info))

R/expect-inheritance.R

@@ -255,7 +255,7 @@ expect_is <- function(object, class, info = NULL, label = NULL) {
 
   if (!inherits(act$val, class)) {
     msg <- sprintf(
-      "Expected %s to inherit from `%s`.\nActual inheritance: `%s`",
+      "Expected %s to inherit from %s.\nActual inheritance: %s",
       act$lab,
       exp_lab,
       act$class
@@ -270,7 +270,7 @@ expect_is <- function(object, class, info = NULL, label = NULL) {
 isS3 <- function(x) is.object(x) && !isS4(x)
 
 format_class <- function(x) {
-  paste0(encodeString(x, quote = "'"), collapse = "/")
+  paste0(encodeString(x, quote = '"'), collapse = "/")
 }
 
 oo_type <- function(x) {

R/expect-no-condition.R

@@ -111,7 +111,7 @@ expect_no_ <- function(
     msg_exp <- paste0(
       "Expected ",
       act$lab,
-      " to run without any ",
+      " to not throw any ",
       base_class,
       "s",
       if (!is.null(class)) paste0(" of class '", class, "'"),

R/expect-self-test.R

@@ -46,20 +46,20 @@ capture_success_failure <- function(expr) {
 expect_success <- function(expr) {
   status <- capture_success_failure(expr)
 
-  if (status$n_success == 0) {
-    return(fail("Expectation did not succeed"))
-  } else if (status$n_success > 1) {
-    return(fail(sprintf(
-      "Expected expectation to succeed once.\nActually succeeded: %i times",
-      status$n_success
-    )))
+  if (status$n_success != 1) {
+    msg <- c(
+      "Expected code to succeed exactly once.",
+      sprintf("Actually succeeded %i times", status$n_success)
+    )
+    return(fail(msg))
   }
 
   if (status$n_failure > 0) {
-    return(fail(sprintf(
-      "Expected expectation to not fail.\nActually failed: %i times",
-      status$n_failure
-    )))
+    msg <- c(
+      "Expected code to not fail.",
+      sprintf("Actually failed %i times", status$n_failure)
+    )
+    return(fail(msg))
   }
 
   pass(NULL)
@@ -70,23 +70,25 @@ expect_success <- function(expr) {
 expect_failure <- function(expr, message = NULL, ...) {
   status <- capture_success_failure(expr)
 
-  if (status$n_failure == 0) {
-    return(fail("Expectation did not fail"))
-  } else if (status$n_failure > 1) {
-    # This should be impossible, but including for completeness
-    return(fail("Expectation failed more than once"))
+  if (status$n_failure != 1) {
+    msg <- c(
+      "Expected code to fail exactly once.",
+      sprintf("Actually failed %i times", status$n_failure)
+    )
+    return(fail(msg))
   }
 
   if (status$n_success != 0) {
-    return(fail(sprintf(
-      "Expected expectation to never succeed.\nActually succeeded: %i times",
-      status$n_success
-    )))
+    msg <- c(
+      "Expected code to succeed exactly once.",
+      sprintf("Actually succeeded %i times", status$n_success)
+    )
+    return(fail(msg))
   }
 
   if (!is.null(message)) {
-    act <- labelled_value(status$last_failure$message, "Failure message")
-    return(expect_match_(act, message, ...))
+    act <- labelled_value(status$last_failure$message, "failure message")
+    return(expect_match_(act, message, ..., title = "message"))
   }
   pass(NULL)
 }

R/expect-setequal.R

@@ -123,11 +123,11 @@ expect_in <- function(object, expected) {
   act_miss <- !act$val %in% exp$val
   if (any(act_miss)) {
     msg_exp <- sprintf(
-      "Expected all values in %s to be in %s.",
+      "Expected %s to only contain values from %s.",
       act$lab,
       exp$lab
     )
-    msg_act <- sprintf("Extra: %s", values(act$val[act_miss]))
+    msg_act <- sprintf("Invalid: %s", values(act$val[act_miss]))
     fail(c(msg_exp, msg_act))
   }
 

R/expect-silent.R

@@ -29,7 +29,7 @@ expect_silent <- function(object) {
   if (length(outputs) != 0) {
     msg <- c(
       sprintf("Expected %s to run silently.", act$lab),
-      sprintf("Actually produced: %s.", paste(outputs, collapse = ", "))
+      sprintf("Actual noise: %s.", paste(outputs, collapse = ", "))
     )
     return(fail(msg))
   }

tests/testthat/_snaps/expect-condition.md

@@ -12,7 +12,7 @@
       expect_error(stop("Yes"), NA)
     Condition
       Error:
-      ! Expected `stop("Yes")` to not throw a error.
+      ! Expected `stop("Yes")` to not throw any errors.
       Actually got a <simpleError> with message:
         Yes
 
@@ -48,7 +48,7 @@
       expect_error(fb(), NA)
     Condition
       Error:
-      ! Expected `fb()` to not throw a error.
+      ! Expected `fb()` to not throw any errors.
       Actually got a <foobar> with message:
         dispatched!
 
@@ -78,10 +78,10 @@
 # regexp = NA checks for absence of message
 
     Code
-      expect_message(message("!"), NA)
+      expect_message(f(), NA)
     Condition
       Error:
-      ! Expected `message("!")` to not throw a message.
+      ! Expected `f()` to not throw any messages.
       Actually got a <simpleMessage> with message:
         !
         
@@ -173,67 +173,3 @@
       * Unused arguments: `pattern` and `fixed`.
       i Did you mean to use `regexp` so `...` is passed to `grepl()`?
 
-# other conditions are swallowed
-
-    Code
-      expect_error(f("error"), "not a match")
-    Condition
-      Error:
-      ! `f("error")` threw an error with unexpected message.
-      Expected match: "not a match"
-      Actual message: "error"
-
----
-
-    Code
-      expect_warning(f("warning"), "not a match")
-    Condition
-      Error:
-      ! `f("warning")` produced unexpected warnings.
-      Expected match: not a match
-      Actual values:
-      * warning
-
----
-
-    Code
-      expect_message(f("message"), "not a match")
-    Condition
-      Error:
-      ! `f("message")` produced unexpected messages.
-      Expected match: not a match
-      Actual values:
-      * message
-
----
-
-    Code
-      expect_condition(f("condition"), "not a match")
-    Condition
-      Error:
-      ! `f("condition")` threw an condition with unexpected message.
-      Expected match: "not a match"
-      Actual message: "signal"
-
----
-
-    Code
-      expect_error(f("error"), class = "not a match")
-    Condition
-      Error:
-      ! `f("error")` threw an error with unexpected class.
-      Expected class: not a match
-      Actual class:   simpleError/error/condition
-      Message:        error
-
----
-
-    Code
-      expect_condition(f("message"), class = "not a match")
-    Condition
-      Error:
-      ! `f("message")` threw an condition with unexpected class.
-      Expected class: not a match
-      Actual class:   simpleMessage/message/condition
-      Message:        message
-

tests/testthat/_snaps/expect-constant.md

@@ -52,7 +52,7 @@
       expect_null(df)
     Condition
       Error:
-      ! Expected `df` to be FALSE.
+      ! Expected `df` to be NULL.
       Differences:
       `actual` is an S3 object of class <data.frame>, a list
       `expected` is NULL