Polish expectation tests

Author: hadley

R/expect-self-test.R

@@ -46,18 +46,13 @@ capture_success_failure <- function(expr) {
 expect_success <- function(expr) {
   status <- capture_success_failure(expr)
 
+  expected <- "Expected exactly one success and no failures."
   if (status$n_success != 1) {
-    msg <- c(
-      "Expected one success.",
-      sprintf("Actually succeeded %i times", status$n_success)
-    )
-    fail(msg)
+    actual <- sprintf("Actually succeeded %i times", status$n_success)
+    fail(c(expected, actual))
   } else if (status$n_failure > 0) {
-    msg <- c(
-      "Expected zero failures.",
-      sprintf("Actually failed %i times", status$n_failure)
-    )
-    fail(msg)
+    actual <- sprintf("Actually failed %i times", status$n_failure)
+    fail(c(expected, actual))
   } else {
     pass()
   }
@@ -70,18 +65,13 @@ expect_success <- function(expr) {
 expect_failure <- function(expr, message = NULL, ...) {
   status <- capture_success_failure(expr)
 
+  expected <- "Expected exactly one failure and no successes."
   if (status$n_failure != 1) {
-    msg <- c(
-      "Expected one failure.",
-      sprintf("Actually failed %i times", status$n_failure)
-    )
-    fail(msg)
+    actual <- sprintf("Actually failed %i times", status$n_failure)
+    fail(c(expected, actual))
   } else if (status$n_success != 0) {
-    msg <- c(
-      "Expected zero successes.",
-      sprintf("Actually succeeded %i times", status$n_success)
-    )
-    fail(msg)
+    actual <- sprintf("Actually succeeded %i times", status$n_success)
+    fail(c(expected, actual))
   } else {
     if (is.null(message)) {
       pass()

tests/testthat/_snaps/expect-self-test.md

@@ -4,19 +4,19 @@
       expect_failure(expect_no_failure())
     Condition
       Error:
-      ! Expected one failure.
+      ! Expected exactly one failure and no successes.
       Actually failed 0 times
     Code
       expect_failure(expect_many_failures())
     Condition
       Error:
-      ! Expected one failure.
+      ! Expected exactly one failure and no successes.
       Actually failed 2 times
     Code
       expect_failure(expect_has_success())
     Condition
       Error:
-      ! Expected zero successes.
+      ! Expected exactly one failure and no successes.
       Actually succeeded 1 times
     Code
       expect_failure(expect_failure_foo(), "bar")
@@ -52,19 +52,19 @@
       expect_success(expect_no_success())
     Condition
       Error:
-      ! Expected one success.
+      ! Expected exactly one success and no failures.
       Actually succeeded 0 times
     Code
       expect_success(expect_many_successes())
     Condition
       Error:
-      ! Expected one success.
+      ! Expected exactly one success and no failures.
       Actually succeeded 2 times
     Code
       expect_success(expect_has_failure())
     Condition
       Error:
-      ! Expected zero failures.
+      ! Expected exactly one success and no failures.
       Actually failed 1 times
 
 # expect_no are deprecated