expect_condition_matching_

Author: hadley

R/expect-condition.R

@@ -115,7 +115,7 @@ expect_error <- function(
   label = NULL
 ) {
   if (edition_get() >= 3) {
-    expect_condition_matching(
+    expect_condition_matching_(
       "error",
       {{ object }},
       regexp = regexp,
@@ -163,7 +163,7 @@ expect_warning <- function(
       warn("The `all` argument is deprecated")
     }
 
-    expect_condition_matching(
+    expect_condition_matching_(
       "warning",
       {{ object }},
       regexp = regexp,
@@ -208,7 +208,7 @@ expect_message <- function(
   label = NULL
 ) {
   if (edition_get() >= 3) {
-    expect_condition_matching(
+    expect_condition_matching_(
       "message",
       {{ object }},
       regexp = regexp,
@@ -240,7 +240,7 @@ expect_condition <- function(
   label = NULL
 ) {
   if (edition_get() >= 3) {
-    expect_condition_matching(
+    expect_condition_matching_(
       "condition",
       {{ object }},
       regexp = regexp,
@@ -273,7 +273,7 @@ expect_condition <- function(
   }
 }
 
-expect_condition_matching <- function(
+expect_condition_matching_ <- function(
   base_class,
   object,
   regexp = NULL,
@@ -309,7 +309,12 @@ expect_condition_matching <- function(
   # Access error fields with `[[` rather than `$` because the
   # `$.Throwable` from the rJava package throws with unknown fields
   if (!is.null(msg)) {
-    return(fail(msg, info = info, trace = act$cap[["trace"]], trace_env = trace_env))
+    return(fail(
+      msg,
+      info = info,
+      trace = act$cap[["trace"]],
+      trace_env = trace_env
+    ))
   }
   # If a condition was expected, return it. Otherwise return the value
   # of the expression.

R/expect-self-test.R

@@ -138,10 +138,10 @@ expect_snapshot_skip <- function(x, cran = FALSE) {
   expect_snapshot_condition_("skip", x)
 }
 expect_skip <- function(code) {
-  expect_condition(code, class = "skip")
+  expect_condition_matching_("skip", code)
 }
 expect_no_skip <- function(code) {
-  expect_no_condition(code, class = "skip")
+  expect_no_("skip", code)
 }
 
 

tests/testthat/_snaps/reporter-progress.new.md

@@ -306,7 +306,7 @@
     Backtrace:
         x
      1. +-testthat::expect_error(f(), "foo")
-     2. | \-testthat:::expect_condition_matching(...)
+     2. | \-testthat:::expect_condition_matching_(...)
      3. |   \-testthat:::quasi_capture(...)
      4. |     +-testthat (local) .capture(...)
      5. |     | \-base::withCallingHandlers(...)
@@ -437,7 +437,7 @@
     Backtrace:
         x
      1. +-testthat::expect_error(f(), "foo")
-     2. | \-testthat:::expect_condition_matching(...)
+     2. | \-testthat:::expect_condition_matching_(...)
      3. |   \-testthat:::quasi_capture(...)
      4. |     +-testthat (local) .capture(...)
      5. |     | \-base::withCallingHandlers(...)