github/shiny
1
1
Fork 0
mirror of https://github.com/rstudio/shiny.git synced 2026-02-11 23:25:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

some changes after feedback from Winston

Browse Source
This commit is contained in:
Barbara Borges Ribeiro
2017-03-24 17:50:15 +00:00
parent 8961778867
commit bcd8fce199
6 changed files with 38 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/testthat/test-bootstrap.r
View File

@@ -192,21 +192,18 @@ test_that("selectInput selects items by default", {
test_that("normalizeChoicesArgs does its job", {
# Unnamed vectors and lists
expected <- list(choiceNames = c("a", "b"), choiceValues = list("a", "b"))
expected <- list(choiceNames = list("a", "b"), choiceValues = list("a", "b"))
expect_equal(normalizeChoicesArgs(c("a", "b"), NULL, NULL), expected)
expect_equal(normalizeChoicesArgs(list("a", "b"), NULL, NULL), expected)
# Named list
expected <- list(choiceNames = c("one", "two"), choiceValues = list("a", "b"))
expected <- list(choiceNames = list("one", "two"), choiceValues = list("a", "b"))
x <- list(one = "a", two = "b")
expect_equal(normalizeChoicesArgs(x, NULL, NULL), expected)
expect_equal(normalizeChoicesArgs(NULL, names(x), unname(x)), expected)
# Using unnamed `choiceNames` and `choiceValues` vectors/lists directly
expected <- list(choiceNames = c("one", "two"), choiceValues = c("a", "b"))
expect_equal(normalizeChoicesArgs(NULL, c("one", "two"), c("a", "b")), expected)
expected <- list(choiceNames = list("one", "two"), choiceValues = list("a", "b"))
expect_equal(normalizeChoicesArgs(NULL, list("one", "two"), list("a", "b")), expected)
# Using choiceNames with HTML and choiceValues
@@ -219,5 +216,21 @@ test_that("normalizeChoicesArgs does its job", {
x <- list("a", "b")
expect_warning(res <- normalizeChoicesArgs(x, nms, vals),
"Using `choices` argument; ignoring `choiceNames` and `choiceValues`.")
expect_equal(res, list(choiceNames = c("a", "b"), choiceValues = list("a", "b")))
expect_equal(res, list(choiceNames = list("a", "b"), choiceValues = list("a", "b")))
# Set possibilities to character(0)
expected <- list(choiceNames = list(), choiceValues = list())
expect_equal(normalizeChoicesArgs(character(0), NULL, NULL), expected)
expect_equal(normalizeChoicesArgs(NULL, character(0), character(0)), expected)
expect_warning(res <- normalizeChoicesArgs(character(0), character(0), character(0)),
"Using `choices` argument; ignoring `choiceNames` and `choiceValues`.")
expect_equal(res, expected)
# Set possibilities to character(0) in an inconsistent way
expected <- list(choiceNames = NULL, choiceValues = NULL)
expect_equal(normalizeChoicesArgs(NULL, character(0), NULL), expected)
expect_equal(normalizeChoicesArgs(NULL, NULL, character(0)), expected)
# Set all possibilities to NULL
expect_equal(normalizeChoicesArgs(NULL, NULL, NULL), expected)
})