Skip to content

Commit 217cb1c

Browse files
committed
Reformat
1 parent f21f8bc commit 217cb1c

File tree

3 files changed

+40
-18
lines changed

3 files changed

+40
-18
lines changed

R/expect-self-test.R

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ capture_success_failure <- function(expr) {
2424
failed = function() {}
2525
)
2626

27-
list(n_success = n_success, n_failure = n_failure, last_failure = last_failure)
27+
list(
28+
n_success = n_success,
29+
n_failure = n_failure,
30+
last_failure = last_failure
31+
)
2832
}
2933

3034
#' Tools for testing expectations
@@ -50,9 +54,15 @@ expect_success <- function(expr) {
5054
} else if (status$n_success == 0) {
5155
fail("Expectation did not succeed")
5256
} else if (status$n_success > 1) {
53-
fail(sprintf("Expectation succeeded %i times, instead of once", status$n_success))
57+
fail(sprintf(
58+
"Expectation succeeded %i times, instead of once",
59+
status$n_success
60+
))
5461
} else if (status$n_failure > 0) {
55-
fail(sprintf("Expectation failed %i times, instead of zero", status$n_failure))
62+
fail(sprintf(
63+
"Expectation failed %i times, instead of zero",
64+
status$n_failure
65+
))
5666
}
5767

5868
invisible(NULL)
@@ -73,7 +83,10 @@ expect_failure <- function(expr, message = NULL, ...) {
7383
# This should be impossible, but including for completeness
7484
fail("Expectation failed more than once")
7585
} else if (status$n_success != 0) {
76-
fail(sprintf("Expectation succeeded %i times, instead of never", status$n_success))
86+
fail(sprintf(
87+
"Expectation succeeded %i times, instead of never",
88+
status$n_success
89+
))
7790
}
7891

7992
succeed()
@@ -87,14 +100,14 @@ expect_snapshot_failure <- function(expr) {
87100
}
88101

89102
#' Test for absence of success or failure
90-
#'
103+
#'
91104
#' @description
92105
#' `r lifecycle::badge("deprecated")`
93-
#'
94-
#' These functions are deprecated because [expect_success()] and
106+
#'
107+
#' These functions are deprecated because [expect_success()] and
95108
#' [expect_failure()] now test for exactly one success or no failures, and
96109
#' exactly one failure and no successes.
97-
#'
110+
#'
98111
#' @keywords internal
99112
#' @export
100113
expect_no_success <- function(expr) {

tests/testthat/test-expect-known.R

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ test_that("uses specified width", {
1212

1313
test_that("creates file on first run", {
1414
file <- withr::local_tempfile()
15-
expect_known_output(cat("ok!\n"), file) |>
16-
expect_success() |>
15+
expect_known_output(cat("ok!\n"), file) |>
16+
expect_success() |>
1717
expect_warning("Creating reference")
1818

1919
expect_true(file.exists(file))
@@ -73,8 +73,8 @@ test_that("correctly matches to a file", {
7373
})
7474

7575
test_that("first run is successful", {
76-
expect_known_value(2, "two.rds") |>
77-
expect_success() |>
76+
expect_known_value(2, "two.rds") |>
77+
expect_success() |>
7878
expect_warning("Creating reference")
7979
unlink("two.rds")
8080
})
@@ -124,8 +124,8 @@ test_that("version 3 is possible", {
124124
# expect_known_hash -------------------------------------------------------
125125

126126
test_that("empty hash succeeds with warning", {
127-
expect_known_hash(1:10) |>
128-
expect_success() |>
127+
expect_known_hash(1:10) |>
128+
expect_success() |>
129129
expect_warning("No recorded hash")
130130
})
131131

tests/testthat/test-expect-self-test.R

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ test_that("expect_failure() requires 1 failure and zero successes", {
33

44
expect_failure(expect_failure({}))
55
expect_failure(expect_failure(succeed()))
6-
expect_failure(expect_failure({succeed(); fail()}))
6+
expect_failure(expect_failure({
7+
succeed()
8+
fail()
9+
}))
710
})
811

912
test_that("expect_failure() can optionally match message", {
@@ -13,11 +16,17 @@ test_that("expect_failure() can optionally match message", {
1316

1417
test_that("expect_success() requires 1 success and zero failures", {
1518
expect_success(expect_success(succeed()))
16-
19+
1720
expect_failure(expect_success({}))
1821
expect_failure(expect_success(fail()))
19-
expect_failure(expect_success({succeed(); fail()}))
20-
expect_failure(expect_success({succeed(); succeed()}))
22+
expect_failure(expect_success({
23+
succeed()
24+
fail()
25+
}))
26+
expect_failure(expect_success({
27+
succeed()
28+
succeed()
29+
}))
2130
})
2231

2332
test_that("errors in expect_success bubble up", {

0 commit comments

Comments
 (0)