github/shiny
1
1
Fork 0
mirror of https://github.com/rstudio/shiny.git synced 2026-02-07 21:26:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update caches from code review feedback

Browse Source
This commit is contained in:
Winston Chang
2018-07-19 14:32:05 -05:00
parent bc0fb3f44c
commit 86ea023e2e
9 changed files with 243 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/testthat/test-cache.R
View File

@@ -3,8 +3,6 @@ context("Cache")
test_that("DiskCache: handling missing values", {
d <- diskCache()
expect_true(is.key_missing(d$get("abcd")))
# Can't add value that is identical to the sentinel value
expect_error(d$set("x", key_missing()))
d$set("a", 100)
expect_identical(d$get("a"), 100)
expect_identical(d$get("y", missing = NULL), NULL)
@@ -15,8 +13,6 @@ test_that("DiskCache: handling missing values", {
d <- diskCache(missing = NULL)
expect_true(is.null(d$get("abcd")))
# Can't add value that is identical to the sentinel value
expect_error(d$set("x", NULL))
d$set("a", 100)
expect_identical(d$get("a"), 100)
expect_identical(d$get("y", missing = -1), -1)
@@ -50,8 +46,6 @@ test_that("DiskCache: handling missing values", {
test_that("MemoryCache: handling missing values", {
d <- memoryCache()
expect_true(is.key_missing(d$get("abcd")))
# Can't add value that is identical to the sentinel value
expect_error(d$set("x", key_missing()))
d$set("a", 100)
expect_identical(d$get("a"), 100)
expect_identical(d$get("y", missing = NULL), NULL)
@@ -62,8 +56,6 @@ test_that("MemoryCache: handling missing values", {
d <- memoryCache(missing = NULL)
expect_true(is.null(d$get("abcd")))
# Can't add value that is identical to the sentinel value
expect_error(d$set("x", NULL))
d$set("a", 100)
expect_identical(d$get("a"), 100)
expect_identical(d$get("y", missing = -1), -1)

41
tests/testthat/test-utils.R
View File

@@ -191,44 +191,3 @@ test_that("Callbacks fire in predictable order", {
cb$invoke()
expect_equal(x, c(1, 2, 3))
})
test_that("absolutePath works as expected", {
# Relative paths that don't exist
expect_identical(absolutePath("foo9484"), file.path(getwd(), "foo9484"))
expect_identical(absolutePath("foo9484/bar"), file.path(getwd(), "foo9484/bar"))
# Absolute path that exists and does NOT have a symlink
expect_identical(absolutePath("/"), "/")
# Find a path that is not a symlink and test it.
# Use paste0 instead of file.path("/", ...) or dir(full.names=T) because
# those can result in two leading slashes.
paths <- paste0("/", dir("/"))
symlink_idx <- (Sys.readlink(paths) != "")
paths <- paths[!symlink_idx]
if (length(paths) != 0) {
test_path <- paths[1]
expect_identical(absolutePath(test_path), test_path)
}
# On Windows, absolute paths can start with a drive letter.
if (isWindows()) {
expect_identical(absolutePath("z:/foo9484"), "z:/foo9484")
expect_identical(absolutePath("c:\\foo9484"), "c:\\foo9484")
expect_identical(absolutePath("d:\\"), "d:\\")
expect_identical(absolutePath("d:/"), "d:/")
}
# Absolute path that doesn't exist
expect_identical(absolutePath("/foo9484"), "/foo9484")
expect_identical(absolutePath("/foo9484/bar"), "/foo9484/bar")
# Invalid input
expect_error(absolutePath(NULL))
expect_error(absolutePath(NA))
expect_error(absolutePath(character(0)))
expect_error(absolutePath(""))
expect_error(absolutePath(12))
expect_error(absolutePath(c("a", "b")))
expect_error(absolutePath(list("abc")))
})