Don't include values in message

Author: hadley

R/expect-invisible.R

@@ -25,9 +25,9 @@ expect_invisible <- function(call, label = NULL) {
   vis <- withVisible(call)
 
   if (!identical(vis$visible, FALSE)) {
-    msg <- sprintf(
-      "Expected %s to return invisibly.\nActually returned visibly.",
-      lab
+    msg <- c(
+      sprintf("Expected %s to return invisibly.", lab),
+      "Actually returned visibly."
     )
     return(fail(msg))
   }
@@ -41,9 +41,9 @@ expect_visible <- function(call, label = NULL) {
   vis <- withVisible(call)
 
   if (!identical(vis$visible, TRUE)) {
-    msg <- sprintf(
-      "Expected %s to return visibly.\nActually returned invisibly.",
-      lab
+    msg <- c(
+      sprintf("Expected %s to return visibly.", lab),
+      "Actually returned invisibly."
     )
     return(fail(msg))
   }

R/expect-match.R

@@ -106,7 +106,7 @@ expect_match_ <- function(
   info = NULL,
   label = NULL,
   negate = FALSE,
-  title = "Text",
+  title = "text",
   trace_env = caller_env()
 ) {
   matches <- grepl(regexp, act$val, perl = perl, fixed = fixed, ...)
@@ -119,27 +119,27 @@ expect_match_ <- function(
 
   text <- encodeString(act$val)
   if (length(act$val) == 1) {
-    values <- paste0(title, ': "', text, '"')
     which <- ""
+    values <- text
   } else {
     bullet <- ifelse(
       condition,
       cli::col_green(cli::symbol$tick),
       cli::col_red(cli::symbol$cross)
     )
-    values <- paste0(title, ":\n", paste0(bullet, " ", text, collapse = "\n"))
-    which <- if (all) "Every element of " else "Some element of "
+    values <- paste0(bullet, " ", text, collapse = "\n")
+    which <- if (all) "every element of " else "some element of "
   }
-  match <- if (negate) "matches" else "does not match"
+  match <- if (negate) "not to match" else "to match"
 
-  msg <- sprintf(
-    "%s%s %s %s %s.\n%s",
+  exp_msg <- sprintf(
+    "Expected %s%s %s %s %s.",
     which,
     act$lab,
     match,
     if (fixed) "string" else "regexp",
-    encodeString(regexp, quote = '"'),
-    values
+    encodeString(regexp, quote = '"')
   )
-  return(fail(msg, info = info, trace_env = trace_env))
+  act_msg <- c(paste0("Actual ", title, ':'), text)
+  return(fail(c(exp_msg, act_msg), info = info, trace_env = trace_env))
 }

R/quasi-label.R

@@ -53,7 +53,7 @@ quasi_label <- function(quo, label = NULL, arg = NULL) {
 
   expr <- quo_get_expr(quo)
   value <- eval_bare(expr, quo_get_env(quo))
-  label <- label %||% auto_label(expr, value)
+  label <- label %||% expr_label(expr)
 
   labelled_value(value, label)
 }
@@ -76,34 +76,6 @@ quasi_capture <- function(.quo, .label, .capture, ...) {
   act
 }
 
-auto_label <- function(expr, value) {
-  if (is.call(expr) || is.name(expr)) {
-    label <- expr_label(expr)
-    if (can_inline(value)) {
-      paste0(label, " (", as_label(value), ")")
-    } else {
-      label
-    }
-  } else {
-    expr_label(expr)
-  }
-}
-
-can_inline <- function(x) {
-  if (!is_syntactic_literal(x)) {
-    return(FALSE)
-  }
-  if (!is.null(dim(x)) || !is.null(attributes(x))) {
-    return(FALSE)
-  }
-
-  if (is.character(x)) {
-    is.na(x) || (!grepl("\n", x) && nchar(x) < 100)
-  } else {
-    TRUE
-  }
-}
-
 expr_label <- function(x) {
   if (is_syntactic_literal(x)) {
     deparse1(x)
@@ -128,7 +100,7 @@ expr_label <- function(x) {
         x <- call2(x[[1]], quote(expr = ...))
       }
     }
-    deparse1(x)
+    paste0("`", deparse1(x), "`")
   } else {
     # Any other object that's been inlined in
     x <- deparse(x)

tests/testthat/_snaps/expect-comparison.md

@@ -12,25 +12,25 @@
 
 # useful output when numbers are very small
 
-    Expected 1.1 * x (1.1e-05) <= `x` (1e-05).
+    Expected `1.1 * x` <= `x`.
     Actual 0.0000110 > 0.0000100
     Difference 0.0000010 > 0
 
 ---
 
-    Expected `x` (1e-05) > 1.1 * x (1.1e-05).
+    Expected `x` > `1.1 * x`.
     Actual 0.0000100 <= 0.0000110
     Difference -0.0000010 <= 0
 
 # useful output when difference is zero
 
-    Expected `x` (100) < 100.
+    Expected `x` < 100.
     Actual 100.0 >= 100.0
     Difference 0.0 >= 0
 
 # useful output when differnce is large
 
-    Expected `x` (100) < 0.001.
+    Expected `x` < 0.001.
     Actual 100.000 >= 0.001
     Difference 99.999 >= 0
 

tests/testthat/_snaps/expect-constant.md

@@ -12,6 +12,22 @@
     `actual` is an S3 object of class <data.frame>, a list
     `expected` is a logical vector (FALSE)
 
+# additional info returned in message
+
+    Expected FALSE to be equal to TRUE.
+    
+    `actual`:   FALSE
+    `expected`: TRUE 
+    NOPE
+
+---
+
+    Expected TRUE to be equal to FALSE.
+    
+    `actual`:   TRUE 
+    `expected`: FALSE
+    YUP
+
 # expect_null works
 
     Expected `df` to be equal to FALSE.

tests/testthat/_snaps/expect-equality.md

@@ -39,40 +39,40 @@
 
 # can control numeric tolerance
 
-    Expected `x1` (1) to equal `x2` (1.000001).
+    Expected `x1` to equal `x2`.
     Actual:
     1/1 mismatches
     [1] 1 - 1 == -1e-06
 
 ---
 
-    Expected `x1` (1) to be equal to `x2` (1.000001).
+    Expected `x1` to be equal to `x2`.
 
       `actual`: 1.0000000
     `expected`: 1.0000010
 
 # provide useful feedback on failure
 
-    Expected `x` (1) to be identical to "a".
+    Expected `x` to be identical to "a".
 
     `actual` is a double vector (1)
     `expected` is a character vector ('a')
 
 ---
 
-    Expected `x` (1) to be equal to "a".
+    Expected `x` to be equal to "a".
 
     `actual` is a double vector (1)
     `expected` is a character vector ('a')
 
 ---
 
-    Expected `x` (1) to be identical to "a".
+    Expected `x` to be identical to "a".
     Types not compatible: double is not character
 
 ---
 
-    Expected `x` (1) to equal "a".
+    Expected `x` to equal "a".
     Actual:
     Types not compatible: double is not character
 
@@ -100,15 +100,12 @@
 # useful message if objects equal but not identical
 
     Expected `f` to be identical to `g`.
-    Names: 1 string mismatch
-    Length mismatch: comparison on first 1 components
-    Component 1: Modes of target, current: function, numeric
-    Component 1: target, current do not match when deparsed
-    Component 1: 'current' is not an environment
+    names for target but not for current
+    Length mismatch: comparison on first 0 components
 
 # attributes for object (#452)
 
-    Expected `oops` (structure(0, oops = "oops")) to equal 0.
+    Expected `oops` to equal 0.
     Actual:
     Attributes: < Modes: list, NULL >
     Attributes: < Lengths: 1, 0 >

tests/testthat/_snaps/expect-inheritance.md

@@ -13,12 +13,12 @@
 
 # expect_is checks class
 
-    Expected factor("a") to inherit from `'character'`.
+    Expected `factor("a")` to inherit from `'character'`.
     Actual inheritance: `'factor'`
 
 # expect_s3/s4_class fails if appropriate type
 
-    Expected `x1` (1) to be an S3 object.
+    Expected `x1` to be an S3 object.
     Actually is a base object.
 
 ---
@@ -33,15 +33,15 @@
 
 # expect_s[34]_class can check not S3/S4
 
-    Expected factor() to not be an S3 object.
+    Expected `factor()` to not be an S3 object.
 
 ---
 
-    Expected A() to not be an S4 object.
+    Expected `A()` to not be an S4 object.
 
 # test_s4_class respects class hierarchy
 
-    Expected C() to inherit from 'D'.
+    Expected `C()` to inherit from 'D'.
     Actual class: 'C'/'A'/'B'/'list'/'vector'
 
 # expect_s3_class validates its inputs
@@ -82,7 +82,7 @@
 
 # expect_r6_class generates useful failures
 
-    Expected `x` (1) to be an R6 object.
+    Expected `x` to be an R6 object.
     Actually is a base object.
 
 # expect_r6_class validates its inputs
@@ -95,12 +95,12 @@
 
 # can check with actual class
 
-    Expected Foo() to inherit from <Bar>.
+    Expected `Foo()` to inherit from <Bar>.
     Actual class: <Foo>
 
 ---
 
-    Expected Baz() to inherit from <Bar>.
+    Expected `Baz()` to inherit from <Bar>.
     Actual class: <Baz>/<Foo>
 
 # expect_s7_class validates its inputs

tests/testthat/_snaps/expect-invisible.md

@@ -1,6 +1,16 @@
+# basic principles of visibility hold
+
+    Expected `x` to return invisibly.
+    Actually returned visibly.
+
+---
+
+    Expected `x <- 1` to return visibly.
+    Actually returned invisibly.
+
 # generates useful failure messages
 
-    Expected invisible(1) to return visibly.
+    Expected `invisible(1)` to return visibly.
     Actually returned invisibly.
 
 ---

tests/testthat/_snaps/expect-known.md

@@ -0,0 +1,62 @@
+# ignores incomplete last line
+
+    Results have changed from known value recorded in '/tmp/RtmppktJm1/file13b4b50b67fc'.
+    
+    `old`: "Hi!"   
+    `new`: "Hi!" ""
+
+---
+
+    Results have changed from known value recorded in '/tmp/RtmppktJm1/file13b4b50b67fc'.
+    
+    `old`: "Hi!"  ""
+    `new`: "oops"   
+
+# updates by default
+
+    Results have changed from known value recorded in '/tmp/RtmppktJm1/file13b4b249dd6d5'.
+    
+    `old`: "Hi!" 
+    `new`: "oops"
+
+---
+
+    Results have changed from known value recorded in '/tmp/RtmppktJm1/file13b4b249dd6d5'.
+    
+    `old`: "Hi!" 
+    `new`: "oops"
+
+# Warning for non-UTF-8 reference files
+
+    Results have changed from known value recorded in '/tmp/RtmppktJm1/file13b4b3b0e2961'.
+    
+    `old`: "éáíöü"
+    `new`:        
+
+# correctly matches to a file
+
+    `x` has changed from known value recorded in 'one.rds'.
+    1/1 mismatches
+    [1] 2 - 1 == 1
+
+# equal_to_ref does not overwrite existing
+
+    `ref_obj2` has changed from known value recorded in '/tmp/RtmppktJm1/file13b4b10c668bf.rds'.
+    3/3 mismatches (average diff: 1)
+    [1] 2 - 1 == 1
+    [2] 3 - 2 == 1
+    [3] 4 - 3 == 1
+
+---
+
+    `ref_obj2` has changed from known value recorded in '/tmp/RtmppktJm1/file13b4b10c668bf.rds'.
+    3/3 mismatches (average diff: 1)
+    [1] 2 - 1 == 1
+    [2] 3 - 2 == 1
+    [3] 4 - 3 == 1
+
+# only succeeds if hash is correct
+
+    Expected value to hash to c08951d2c3.
+    Actual hash: c08951d2c2
+