Merge pull request #76 from unit tests for Population class

Unit tests for Population class

Author: saumil-sh

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: rxsim
 Type: Package
 Title: Reducing friction for Randomized Clinical Trial simulations
-Version: 0.1.1.9000
+Version: 0.1.2.9000
 Authors@R: c(
     person(
       "Matthew", "Valko",
@@ -46,7 +46,8 @@ Suggests:
     DoseFinding,
     RBesT,
     BayesianMCPMod,
-    survival
+    survival,
+    testthat (>= 3.0.0)
 VignetteBuilder: knitr
 RoxygenNote: 7.3.3
 Imports: 
@@ -55,3 +56,4 @@ Imports:
 Roxygen: list(markdown = TRUE)
 Config/renv/profiles/ci/dependencies: pak, rcmdcheck
 URL: https://boehringer-ingelheim.github.io/rxsim
+Config/testthat/edition: 3

R/Population.R

@@ -95,7 +95,7 @@ Population <- R6::R6Class(
 
       self$data <- data
       self$n <- length(unique(self$data$id))
-      self$n_readouts <- as.integer((dim(self$data)[1] / self$n))
+      self$n_readouts <- as.integer((nrow(self$data) / self$n))
 
       # Initialize enrollment/dropout status if not provided
       ifelse(
@@ -194,9 +194,20 @@ Population <- R6::R6Class(
       if (!("arm" %in% names(data))) {
         data$arm <- self$name
       }
+
+      # Check required data frame columns
+      col_names <- c("id", "arm", "readout_time")
+      missing_cols <- setdiff(col_names, names(data))
+      if (length(missing_cols) > 0) {
+        stop(sprintf("Data frame is missing required columns: %s", paste(missing_cols, sep = ", ")))
+      }
+      if (length(names(data)) < 4) {
+        stop(sprintf("Data frame is missing endpoint data."))
+      }
+
       self$data <- data
       self$n <- length(unique(self$data$id))
-      self$n_readouts <- as.integer((dim(self$data)[1] / self$n))
+      self$n_readouts <- as.integer((nrow(self$data) / self$n))
       self$dropped <- rep(NA_real_, self$n)
       self$enrolled <- rep(NA_real_, self$n)
       invisible(self)

renv.lock

@@ -3,7 +3,7 @@ local({
 
   # the requested version of renv
   version <- "1.2.0"
-  attr(version, "md5") <- "55a999ab1366249f2dd6c52e0d2489f6"
+  attr(version, "md5") <- "b7d230b07507f361d3bcf794d157a188"
   attr(version, "sha") <- NULL
 
   # the project directory

renv/activate.R

@@ -11,7 +11,7 @@
   "ppm.ignored.urls": [],
   "r.version": null,
   "snapshot.dev": false,
-  "snapshot.type": "explicit",
+  "snapshot.type": "all",
   "use.cache": true,
   "vcs.ignore.cellar": true,
   "vcs.ignore.library": true,

renv/profiles/ci/renv.lock

@@ -0,0 +1,12 @@
+# This file is part of the standard setup for testthat.
+# It is recommended that you do not modify it.
+#
+# Where should you do additional test configuration?
+# Learn more about the roles of various files in:
+# * https://r-pkgs.org/testing-design.html#sec-tests-files-overview
+# * https://testthat.r-lib.org/articles/special-files.html
+
+library(testthat)
+library(rxsim)
+
+test_check("rxsim")