Merge pull request #21 from Boehringer-Ingelheim/adatptions-for-Tplyr-table

Adatptions for tplyr table

Author: mattkorb

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: dv.listings
 Type: Package
 Title: Data listings module
-Version: 4.1.0-900
+Version: 4.1.1-9000
 Authors@R: 
     c(
       person("Boehringer-Ingelheim Pharma GmbH & Co.KG", role = c("cph", "fnd")),

NEWS.md

@@ -1,5 +1,6 @@
-# dv.listings 4.1.0-900
+# dv.listings 4.1.1-9000
 
+- Adapt checkmate calls to allow default values for datasets that are not present
 - Top buttons are reordered in a single line to avoid consuming excessive space
 
 # dv.listings 4.1.0

R/helpers.R

@@ -90,15 +90,17 @@ fill_default_vars <- function(default_vars, dataset) {
     combine = "and"
   )
   if (!is.null(default_vars)) {
-    checkmate::assert_names(names(default_vars), type = "unique", subset.of = names(dataset))
+    checkmate::assert_names(names(default_vars), type = "unique")
   }
   purrr::walk2(
     default_vars, names(default_vars),
     ~ checkmate::assert_character(.x, unique = TRUE, .var.name = paste0("default_vars$", .y))
   )
   purrr::walk(
     names(default_vars),
-    ~ checkmate::assert_subset(default_vars[[.x]], names(dataset[[.x]]), .var.name = paste0("default_vars$", .x))
+    ~ if (.x %in% names(dataset)) {
+      checkmate::assert_subset(default_vars[[.x]], names(dataset[[.x]]), .var.name = paste0("default_vars$", .x))
+    }
   )
 
   # Fill default_vars

tests/testthat/test-helpers.R

@@ -28,7 +28,6 @@ test_that("fill_default_vars() throws an error when default_vars argument type m
   element_mismatch <- list(dummy1 = 1:6, dummy2 = 1:10) # wrong list element types
   unnamed <- list(dummy_names[1:4], dummy_names[1:8]) # missing names
   duplicated_names <- list(dummy1 = dummy_names[1:4], dummy1 = dummy_names[1:8]) # duplicated names
-  wrong_names <- list(dummy1 = dummy_names[1:4], wrong = dummy_names[1:8]) # wrong names
   duplicated_values <- list( # duplicated vector entries
     dummy1 = c(dummy_names[1:4], dummy_names[1:2]), dummy2 = dummy_names[1:8]
   )
@@ -39,7 +38,7 @@ test_that("fill_default_vars() throws an error when default_vars argument type m
 
   # Perform tests
   purrr::walk(list(
-    type_mismatch, element_mismatch, unnamed, duplicated_names, wrong_names, duplicated_values, wrong_values
+    type_mismatch, element_mismatch, unnamed, duplicated_names, duplicated_values, wrong_values
   ), ~ expect_error(fill_default_vars(.x, dataset)))
 })