Skip to content

Checks selected variable is in choices available. #254

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

Closed
wants to merge 4 commits into from
Closed

Checks selected variable is in choices available. #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2ab636
Add new test combining choices_selected and value_choices
llrs-roche Feb 10, 2025
137ea04
Stop if selected is not in choices
llrs-roche Feb 11, 2025
3e95f66
Do not raise error on delayed choices
llrs-roche Feb 11, 2025
c33e92d
[skip style] [skip vbump] Restyle files
github-actions[bot] Feb 11, 2025
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
5 changes: 5 additions & 0 deletions R/choices_selected.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,11 @@ choices_selected <- function(choices,
}

if (inherits(choices, "delayed_data")) {
if (is.character(selected) && !inherits(choices, "delayed_variable_choices")) {
if (!all(selected %in% choices$var_choices) || !all(selected %in% choices$var_label)) {
stop("Selected, '", selected, "' is not in the available choices.")
}
}
Comment on lines +155 to +159
Copy link
Contributor

@gogonzo gogonzo Feb 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to determine this at this point? If choices are delayed, we can't guess if selected is a subset of the chocies.

return(
structure(
list(choices = choices, selected = selected, keep_order = keep_order, fixed = fixed),
Expand Down
6 changes: 6 additions & 0 deletions tests/testthat/test-choices_selected.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ testthat::test_that("choices_selected throws error when selected is not found in
choices_selected(choices = c("a"), selected = c("c", "b")),
"Must be a subset of \\{'a'\\}"
)
testthat::expect_error(
choices_selected(
value_choices("ADTTE", "PARAMCD", "PARAM"),
"OS"
)
)
})

testthat::test_that("delayed_choices select the desired choices", {
Expand Down
Loading