Show everything in snapshot. Fix failures

Author: hadley

R/expect-self-test.R

@@ -94,7 +94,8 @@ expect_failure <- function(expr, message = NULL, ...) {
 #' @export
 #' @rdname expect_success
 expect_snapshot_failure <- function(expr) {
-  expect_snapshot_condition_("expectation_failure", expr)
+  expr <- enquo0(expr)
+  expect_snapshot_(expr, error = TRUE, error_class = "expectation_failure")
 }
 
 #' Test for absence of success or failure

R/snapshot.R

@@ -68,18 +68,38 @@ expect_snapshot <- function(
   variant = NULL,
   cnd_class = FALSE
 ) {
-  check_bool(cran)
-  check_bool(error)
-  check_bool(cnd_class)
-
   edition_require(3, "expect_snapshot()")
+
+  x <- enquo0(x)
+  expect_snapshot_(
+    x,
+    cran = cran,
+    error = error,
+    transform = transform,
+    variant = variant,
+    cnd_class = cnd_class
+  )
+}
+
+expect_snapshot_ <- function(
+  x,
+  cran = TRUE,
+  error = FALSE,
+  error_class = NULL,
+  transform = NULL,
+  variant = NULL,
+  cnd_class = FALSE,
+  error_frame = caller_env()
+) {
+  check_bool(cran, call = error_frame)
+  check_bool(error, call = error_frame)
+  check_bool(cnd_class, call = error_frame)
+
   variant <- check_variant(variant)
   if (!is.null(transform)) {
     transform <- as_function(transform)
   }
 
-  x <- enquo0(x)
-
   # Execute code, capturing last error
   state <- new_environment(list(error = NULL))
   replay <- function(x) {
@@ -95,7 +115,13 @@ expect_snapshot <- function(
   )
 
   # Use expect_error() machinery to confirm that error is as expected
-  msg <- compare_condition_3e("error", NULL, state$error, quo_label(x), error)
+  msg <- compare_condition_3e(
+    cond_type = "error",
+    cond_class = error_class,
+    cond = state$error,
+    lab = quo_label(x),
+    expected = error
+  )
   if (!is.null(msg)) {
     if (error) {
       return(fail(msg, trace = state$error[["trace"]]))
@@ -112,7 +138,7 @@ expect_snapshot <- function(
     save = function(x) paste0(x, collapse = "\n"),
     load = function(x) split_by_line(x)[[1]],
     variant = variant,
-    trace_env = caller_env()
+    trace_env = error_frame
   )
 }
 

tests/testthat/_snaps/expect-comparison.md

@@ -1,88 +1,152 @@
 # basic comparisons work
 
-    Expected 10 < 10.
-    Actual 10.0 >= 10.0
-    Difference 0.0 >= 0
+    Code
+      expect_lt(10, 10)
+    Condition
+      Error:
+      ! Expected 10 < 10.
+      Actual 10.0 >= 10.0
+      Difference 0.0 >= 0
 
 ---
 
-    Expected 10 > 10.
-    Actual 10.0 <= 10.0
-    Difference 0.0 <= 0
+    Code
+      expect_gt(10, 10)
+    Condition
+      Error:
+      ! Expected 10 > 10.
+      Actual 10.0 <= 10.0
+      Difference 0.0 <= 0
 
 # useful output when numbers are very small
 
-    Expected `1.1 * x` <= `x`.
-    Actual 0.0000110 > 0.0000100
-    Difference 0.0000010 > 0
+    Code
+      expect_lte(1.1 * x, x)
+    Condition
+      Error:
+      ! Expected `1.1 * x` <= `x`.
+      Actual 0.0000110 > 0.0000100
+      Difference 0.0000010 > 0
 
 ---
 
-    Expected `x` > `1.1 * x`.
-    Actual 0.0000100 <= 0.0000110
-    Difference -0.0000010 <= 0
+    Code
+      expect_gt(x, 1.1 * x)
+    Condition
+      Error:
+      ! Expected `x` > `1.1 * x`.
+      Actual 0.0000100 <= 0.0000110
+      Difference -0.0000010 <= 0
 
 # useful output when difference is zero
 
-    Expected `x` < 100.
-    Actual 100.0 >= 100.0
-    Difference 0.0 >= 0
+    Code
+      expect_lt(x, 100)
+    Condition
+      Error:
+      ! Expected `x` < 100.
+      Actual 100.0 >= 100.0
+      Difference 0.0 >= 0
 
 # useful output when differnce is large
 
-    Expected `x` < 0.001.
-    Actual 100.000 >= 0.001
-    Difference 99.999 >= 0
+    Code
+      expect_lt(x, 0.001)
+    Condition
+      Error:
+      ! Expected `x` < 0.001.
+      Actual 100.000 >= 0.001
+      Difference 99.999 >= 0
 
 # comparisons with Inf work
 
-    Expected Inf < Inf.
-    Actual values are incomparable.
+    Code
+      expect_lt(Inf, Inf)
+    Condition
+      Error:
+      ! Expected Inf < Inf.
+      Actual values are incomparable.
 
 ---
 
-    Expected Inf > Inf.
-    Actual values are incomparable.
+    Code
+      expect_gt(Inf, Inf)
+    Condition
+      Error:
+      ! Expected Inf > Inf.
+      Actual values are incomparable.
 
 # comparisons with NA work
 
-    Expected 10 < NA_real_.
-    Actual comparison is NA.
+    Code
+      expect_lt(10, NA_real_)
+    Condition
+      Error:
+      ! Expected 10 < NA_real_.
+      Actual comparison is NA.
 
 ---
 
-    Expected NA_real_ < 10.
-    Actual comparison is NA.
+    Code
+      expect_lt(NA_real_, 10)
+    Condition
+      Error:
+      ! Expected NA_real_ < 10.
+      Actual comparison is NA.
 
 ---
 
-    Expected NA_real_ < NA_real_.
-    Actual comparison is NA.
+    Code
+      expect_lt(NA_real_, NA_real_)
+    Condition
+      Error:
+      ! Expected NA_real_ < NA_real_.
+      Actual comparison is NA.
 
 ---
 
-    Expected NA_real_ <= NA_real_.
-    Actual comparison is NA.
+    Code
+      expect_lte(NA_real_, NA_real_)
+    Condition
+      Error:
+      ! Expected NA_real_ <= NA_real_.
+      Actual comparison is NA.
 
 ---
 
-    Expected 10 > NA_real_.
-    Actual comparison is NA.
+    Code
+      expect_gt(10, NA_real_)
+    Condition
+      Error:
+      ! Expected 10 > NA_real_.
+      Actual comparison is NA.
 
 ---
 
-    Expected NA_real_ > 10.
-    Actual comparison is NA.
+    Code
+      expect_gt(NA_real_, 10)
+    Condition
+      Error:
+      ! Expected NA_real_ > 10.
+      Actual comparison is NA.
 
 ---
 
-    Expected NA_real_ > NA_real_.
-    Actual comparison is NA.
+    Code
+      expect_gt(NA_real_, NA_real_)
+    Condition
+      Error:
+      ! Expected NA_real_ > NA_real_.
+      Actual comparison is NA.
 
 ---
 
-    Expected NA_real_ >= NA_real_.
-    Actual comparison is NA.
+    Code
+      expect_gte(NA_real_, NA_real_)
+    Condition
+      Error:
+      ! Expected NA_real_ >= NA_real_.
+      Actual comparison is NA.
 
 # comparison must yield a single logical