check TIME and time when looking for mixed upper/lower case names in …

…data
marianklose · Jul 25, 2023 · 54f67c8 · 54f67c8
1 parent c13335f
commit 54f67c8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/R/mrgindata.R b/R/mrgindata.R
@@ -192,8 +192,8 @@ valid_data_set <- function(x, m = NULL, verbose = FALSE, quiet = FALSE) {
                          dimnames=list(NULL, "..zeros..")))
 
   # Look for both upper and lower case column names
-  uc <- any(dimnames(dm)[[2]] %in% GLOBALS[["CARRY_TRAN_UC"]])
-  lc <- any(dimnames(dm)[[2]] %in% GLOBALS[["CARRY_TRAN_LC"]])
+  uc <- any(dimnames(dm)[[2]] %in% GLOBALS[["TRAN_UPPER"]])
+  lc <- any(dimnames(dm)[[2]] %in% GLOBALS[["TRAN_LOWER"]])
 
   if(uc & lc) {
     warning("Both lower- & upper-case names found in the data set.\n",

diff --git a/tests/testthat/test-data_set.R b/tests/testthat/test-data_set.R
@@ -58,6 +58,19 @@ test_that("Warning is generated when mixed upper/lower names", {
   expect_warning(mrgsim(data_set(mod,mix)))
 })
 
+test_that("Include TIME and time when checking for mixed upper/lower case", {
+  expect_warning(
+    mrgsim(house(), data = data.frame(ID = 1, TIME = 0, amt = 0, cmt = 1)), 
+    "Both lower- & upper-case", 
+    fixed = TRUE
+  )
+  expect_warning(
+    mrgsim(house(), data = data.frame(ID = 1, time = 0, AMT = 0, cmt = 1)), 
+    "Both lower- & upper-case", 
+    fixed = TRUE
+  )
+})
+
 test_that("Filter out ID", {
   out <- mod %>% data_set(up, ID > 4) %>% mrgsim
   expect_true(all(out$ID > 4))