Test the initial options

pkg/R/options.R

@@ -72,21 +72,24 @@ options_manager <- function(..., .list, .allowed){
    stopifnot(is.list(.list))
   }
   .defaults <- c(list(...),.list)
-  .op <- .defaults
 
   .al <- list()
   # default option checkers
   for ( v in names(.defaults)) .al[[v]] <- nolimit
   # set explicitly mentioned option checkers
   if (!missing(.allowed)) .al[names(.allowed)] <- .allowed
   # if you impose a limit on an option thats not defined: stop.
-  if (!all(names(.al) %in% names(.op))  ){
-    nm <- names(.al)[!names(.al) %in% names(.op)]
+  if (!all(names(.al) %in% names(.defaults))  ){
+    nm <- names(.al)[!names(.al) %in% names(.defaults)]
     stop(sprintf("Trying to set limits for undefined options %s\n",paste(nm,collapse=", ")))
   }
-  # Check the default values against allowed ranges.
-  vars <- names(.op)
-  for (v in vars) .al[[v]](.defaults[[v]])
+  # Check the default values against allowed ranges and set the defaults as the
+  # (potentially modified) default.
+  vars <- names(.defaults)
+  for (v in vars) {
+    .defaults[v] <- list(.al[[v]](.defaults[[v]]))
+  }
+  .op <- .defaults
 
   # create the options manager function
   function(..., .__defaults=FALSE, .__reset=FALSE){

pkg/tests/testthat/testOptions.R

@@ -59,8 +59,22 @@ test_that("is_setting",{
 
 context("Range checks")
 
+test_that("initial range checks", {
+  expect_equal(options_manager(foo=1,.allowed=c(foo=inrange(0,1)))(),
+               list(foo=1),
+               info="Initial values that are valid succeed.")
+  expect_error(options_manager(foo=2,.allowed=c(foo=inrange(0,1)))(),
+               regex="Option value out of range. Allowed values are in [0, 1]",
+               fixed=TRUE,
+               info="Initial values that are invalid fail.")
+  set_to_1 <- function(x) 1
+  expect_equal(options_manager(foo=2,.allowed=c(foo=set_to_1))(),
+               list(foo=1),
+               info="Initial settings are modified, if needed.")
+})
+
 test_that("range checks",{
-  expect_error( options_manager(foo=1,.allowed=c(x=inrange(0,1)))  )
+  expect_error(options_manager(foo=1,.allowed=c(x=inrange(0,1)))  )
   expect_error(options_manager(x=1,.allowed=list(x=inrange(2,3))))
   opt <- options_manager(foo=1,bar=0
     , .allowed=list(