Skip to content
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

Update usage of expect_error() #360

Merged
merged 3 commits into from
Oct 21, 2024
Merged

Update usage of expect_error() #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5245bb
Update `test-parameters.R`
hfrick Oct 21, 2024
26305d9
Update `test-grids.R`
hfrick Oct 21, 2024
7707308
Update `test-space_filling.R`
hfrick Oct 21, 2024
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
16 changes: 2 additions & 14 deletions tests/testthat/test-grids.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@

test_that("regular grid", {
expect_error(
grid_regular(mtcars)
)
expect_error(
grid_regular()
)
expect_snapshot(
error = TRUE,
grid_regular(mixture(), trees(), levels = 1:4)
Expand Down Expand Up @@ -52,12 +46,6 @@ test_that("regular grid", {
})

test_that("random grid", {
expect_error(
grid_random(mtcars)
)
expect_error(
grid_random()
)
expect_equal(
nrow(grid_random(mixture(), trees(), size = 2)),
2
Expand All @@ -75,7 +63,7 @@ test_that("wrong argument name", {
skip_if_below_r_version("3.6")
p <- parameters(penalty(), mixture())
set.seed(1)

expect_snapshot(grid_space_filling(p, levels = 5, type = "latin_hypercube"))
expect_snapshot(grid_space_filling(p, levels = 5, type = "max_entropy"))
expect_snapshot(grid_random(p, levels = 5))
Expand All @@ -102,6 +90,6 @@ test_that("filter arg yields same results", {
test_that("new param grid from conventional data frame", {
x <- data.frame(num_comp = 1:3)

expect_error(y <- dials:::new_param_grid(x), regexp = NA)
expect_no_condition(y <- dials:::new_param_grid(x))
expect_true(tibble::is_tibble(y))
})
14 changes: 8 additions & 6 deletions tests/testthat/test-parameters.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,28 @@ test_that("parameters_const() input checks", {
})

test_that("create from param objects", {
expect_error(p_1 <- parameters(mtry(), penalty()), NA)
expect_no_condition(p_1 <- parameters(mtry(), penalty()))
expect_s3_class_parameters(p_1)
expect_equal(p_1 %>% nrow(), 2)

expect_error(p_2 <- parameters(penalty()), NA)
expect_no_condition(p_2 <- parameters(penalty()))
expect_s3_class_parameters(p_2)
expect_equal(p_2 %>% nrow(), 1)
})


test_that("create from lists of param objects", {
expect_error(p_1 <- parameters(list(mtry(), penalty())), NA)
expect_no_condition(p_1 <- parameters(list(mtry(), penalty())))
expect_s3_class_parameters(p_1)
expect_equal(p_1 %>% nrow(), 2)

expect_error(p_2 <- parameters(list(penalty())), NA)
expect_no_condition(p_2 <- parameters(list(penalty())))
expect_s3_class_parameters(p_2)
expect_equal(p_2 %>% nrow(), 1)

expect_error(p_3 <- parameters(list(a = mtry(), "some name" = penalty())), NA)
expect_no_condition(
p_3 <- parameters(list(a = mtry(), "some name" = penalty()))
)
expect_s3_class_parameters(p_3)
expect_equal(p_3 %>% nrow(), 2)
expect_equal(p_3$id, c("a", "some name"))
Expand All @@ -64,7 +66,7 @@ test_that("updating", {
expect_snapshot(error = TRUE, update(p_1, penalty = 1:2))
expect_snapshot(error = TRUE, update(p_1, not_penalty = 1:2))
expect_snapshot(error = TRUE, update(p_1, penalty(), mtry = mtry(3:4)))
expect_error(update(p_1, penalty = NA), NA)
expect_no_condition(update(p_1, penalty = NA))
expect_snapshot(error = TRUE, update(p_1))
})

Expand Down
26 changes: 0 additions & 26 deletions tests/testthat/test-space_filling.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,6 @@ test_that("max entropy designs", {
)
expect_equal(ncol(grid_3), 1L)

expect_error(
grid_max_entropy(
cost,
size = 11,
original = FALSE
)
)
expect_snapshot(
error = TRUE,
grid_max_entropy(
Expand All @@ -46,12 +39,6 @@ test_that("max entropy designs", {
original = FALSE
)
)
expect_error(
grid_max_entropy(
size = 11,
original = FALSE
)
)
})

test_that("`grid_latin_hypercube()` is deprecated", {
Expand Down Expand Up @@ -92,13 +79,6 @@ test_that("latin square designs", {
20
)

expect_error(
grid_latin_hypercube(
cost,
size = 11,
original = FALSE
)
)
expect_snapshot(
error = TRUE,
grid_latin_hypercube(
Expand All @@ -107,12 +87,6 @@ test_that("latin square designs", {
original = FALSE
)
)
expect_error(
grid_latin_hypercube(
size = 11,
original = FALSE
)
)
})


Expand Down
Loading