✨ Error upkeep ✨ (#2177)

Using chores prompt, followed by a couple of human tweaks

Author: hadley

R/expect-comparison.R

@@ -39,7 +39,10 @@ expect_compare_ <- function(
 
   cmp <- op(act$val, exp$val)
   if (length(cmp) != 1 || !is.logical(cmp)) {
-    abort("Result of comparison must be a single logical value")
+    abort(
+      "Result of comparison must be a single logical value",
+      call = trace_env
+    )
   }
   if (!isTRUE(cmp)) {
     digits <- max(

R/skip.R

@@ -138,10 +138,12 @@ package_version <- function(x) {
 #'   should only be run on R versions 4.1.0 and later.
 #' @rdname skip
 skip_unless_r <- function(spec) {
+  check_string(spec)
+
   parts <- unlist(strsplit(spec, " ", fixed = TRUE))
   if (length(parts) != 2L) {
     cli::cli_abort(
-      "{.arg spec} should be a comparison like '>=' and an R version separated by a space."
+      "{.arg spec} must be an valid version specification, like {.str >= 4.0.0}, not {.str {spec}}."
     )
   }
   comparator <- match.fun(parts[1L])

tests/testthat/_snaps/examples.md

@@ -0,0 +1,8 @@
+# test_examples fails if no examples
+
+    Code
+      test_examples("asdf")
+    Condition
+      Error:
+      ! Could not find examples
+

tests/testthat/_snaps/expect-comparison.md

@@ -18,3 +18,11 @@
     `x` is not strictly less than 0.001.
     100.000 - 0.001 = 99.999 >= 0
 
+# comparison must yield a single logical
+
+    Code
+      expect_lt(1:10, 5)
+    Condition
+      Error in `expect_lt()`:
+      ! Result of comparison must be a single logical value
+

tests/testthat/_snaps/expect-setequal.md

@@ -1,3 +1,11 @@
+# warns if both inputs are named
+
+    Code
+      expect_setequal(c(a = 1), c(b = 1))
+    Condition
+      Warning:
+      expect_setequal() ignores names
+
 # checks inputs
 
     Code

tests/testthat/_snaps/reporter-stop.md

@@ -48,3 +48,11 @@
 
 
 
+# stop if needed errors when needed
+
+    Code
+      r$stop_if_needed()
+    Condition
+      Error:
+      ! Test failed
+

tests/testthat/_snaps/reporter-zzz.md

@@ -0,0 +1,8 @@
+# useful error message if can't find reporter
+
+    Code
+      find_reporter(c("summary", "blah"))
+    Condition
+      Error:
+      ! Can not find test reporter blah
+

tests/testthat/_snaps/skip.md

@@ -78,6 +78,14 @@
 
     Reason: On Windows i386
 
+# skip_unless_r works as expected
+
+    Code
+      skip_unless_r("idfjdij")
+    Condition
+      Error in `skip_unless_r()`:
+      ! `spec` must be an valid version specification, like ">= 4.0.0", not "idfjdij".
+
 # skip_unless_r gives the expected output
 
     Reason: Current R version (4.5.0) does not satisfy requirement (>= 999.999.999)

tests/testthat/_snaps/snapshot-file.md

@@ -1,3 +1,19 @@
+# warns on first creation
+
+    Code
+      out <- snapshot_file_equal(tempdir(), "test.txt", NULL, path)
+    Condition
+      Warning:
+      Adding new file snapshot: 'tests/testthat/_snaps/test.txt'
+
+---
+
+    Code
+      expect_true(snapshot_file_equal(tempdir(), "test.txt", NULL, "doesnt-exist.txt"))
+    Condition
+      Error in `snapshot_file_equal()`:
+      ! `doesnt-exist.txt` not found
+
 # snapshot_hint output differs in R CMD check
 
     Code

tests/testthat/_snaps/test-compiled-code.md

@@ -1,3 +1,11 @@
+# get_routine() fails when no routine exists
+
+    Code
+      get_routine("utils", "no_such_routine")
+    Condition
+      Error:
+      ! failed to locate routine 'no_such_routine' in package 'utils'
+
 # validates inputs
 
     Code