postmerge fixes

R/join_keys-extract.R

@@ -2,9 +2,9 @@
 #' @order 2
 #'
 #' @section Functions:
-#' - `x[datanames]`: Returns a subset of the `join_keys` object for
-#' given `datanames`, including parent `datanames` and symmetric mirror keys between
-#' `datanames` in the result.
+#' - `x[names]`: Returns a subset of the `join_keys` object for
+#' given `names`, including parent `names` and symmetric mirror keys between
+#' `names` in the result.
 #' - `x[i, j]`: Returns join keys between datasets `i` and `j`,
 #'   including implicit keys inferred from their relationship with a parent.
 #'

R/teal_data-class.R

@@ -18,7 +18,7 @@ setOldClass("join_keys")
 #'  auxiliary variables.
 #'  Access variables with [get()], [`$`], [get_var()] or [`[[`].
 #'  No setter provided. Evaluate code to add variables into `@.xData`.
-#' @slot code (`list` of `character`) representing code necessary to reproduce the contents of `@env`.
+#' @slot code (`list` of `character`) representing code necessary to reproduce the contents of `qenv`.
 #'  Access with [get_code()].
 #'  No setter provided. Evaluate code to append code to the slot.
 #' @slot join_keys (`join_keys`) object specifying joining keys for data sets in

R/teal_data-get_code.R

@@ -121,7 +121,7 @@ setMethod("get_code",
     }
 
     if (!is.null(names) && lifecycle::is_present(datanames)) {
-      stop("Please use either 'names' (recommended) or 'datanames' parameter.")
+      stop("'names' shouldn't be specified with deprecated 'datanames' parameter.")
     }
 
     checkmate::assert_character(names, min.len = 1L, null.ok = TRUE)

R/teal_data-names.R

@@ -24,18 +24,18 @@ names.teal_data <- function(x) {
   # Sorting from `ls` can be safely done as environments don't have any order
   # nor support numeric-index subsetting
   envir <- as.environment(x)
-  .get_sorted_names(ls(envir = envir), join_keys(x), envir)
+  .get_sorted_names(names = ls(envir = envir), join_keys = join_keys(x), env = envir)
 }
 
 #' @export
 length.teal.data <- function(x) length(ls(x))
 
 #' @keywords internal
-.get_sorted_names <- function(datanames, join_keys, env) {
-  child_parent <- sapply(datanames, parent, x = join_keys, USE.NAMES = TRUE, simplify = FALSE)
+.get_sorted_names <- function(names, join_keys, env) {
+  child_parent <- sapply(names, parent, x = join_keys, USE.NAMES = TRUE, simplify = FALSE)
 
   union(
     intersect(unlist(topological_sort(child_parent)), ls(env, all.names = TRUE)),
-    datanames
+    names
   )
 }

tests/testthat/test-teal_data.R

@@ -3,7 +3,7 @@ testthat::test_that("teal_data allows to initialize empty teal_data object", {
 })
 
 testthat::test_that("empty teal_data returns empty code and verified=TRUE", {
-  testthat::expect_identical(teal_data()@code, list(character(0)))
+  testthat::expect_identical(teal_data()@code, list())
   testthat::expect_identical(teal_data()@verified, TRUE)
 })
 

tests/testthat/test-verify.R

@@ -20,7 +20,7 @@ testthat::test_that("verify returns the same object with changed @verified field
   testthat::expect_identical(teal.code::get_env(tdata2_ver), teal.code::get_env(tdata2))
 })
 
-testthat::test_that("verify raises error if @code does not restore objects in @env", {
+testthat::test_that("verify raises error if @code does not restore objects in @.xData", {
   tdata3 <- teal_data(x1 = iris, code = "x1 = mtcars")
 
   testthat::expect_error(verify(tdata3), "Code verification failed.")