Skip to content

Always report success/failure count #2298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Always report success/failure count #2298

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 11 additions & 17 deletions R/expect-self-test.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,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) {
actual <- sprintf("Actually succeeded %i times", status$n_success)
fail(c(expected, actual))
} else if (status$n_failure > 0) {
actual <- sprintf("Actually failed %i times", status$n_failure)
fail(c(expected, actual))
} else {
if (status$n_success == 1 && status$n_failure == 0) {
pass()
return(invisible())
}

expected <- "Expected exactly one success and no failures."
actual <- sprintf("Actually succeeded %i times and failed %i times.", status$n_success, status$n_failure)
fail(c(expected, actual))
invisible()
}

Expand All @@ -63,21 +59,19 @@ 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) {
actual <- sprintf("Actually failed %i times", status$n_failure)
fail(c(expected, actual))
} else if (status$n_success != 0) {
actual <- sprintf("Actually succeeded %i times", status$n_success)
fail(c(expected, actual))
} else {
if (status$n_failure == 1 && status$n_failure == 0) {
if (is.null(message)) {
pass()
} else {
act <- labelled_value(status$last_failure$message, "failure message")
expect_match_(act, message, ..., title = "message")
}
return(invisible())
}

expected <- "Expected exactly one failure and no successes."
actual <- sprintf("Actually succeeded %i times and failed %i times.", status$n_success, status$n_failure)
fail(c(expected, actual))
invisible()
}

Expand Down
Loading