add more tests for datanames() and do not extract datanames() from jo…

…in_keys as they might refer to datanames that do not exist in env

R/teal_data-class.R

@@ -60,7 +60,7 @@ setClass(
 new_teal_data <- function(data,
                           code = character(0),
                           join_keys = join_keys(),
-                          datanames = union(names(data), names(join_keys))) {
+                          datanames = names(data)) {
   checkmate::assert_list(data)
   checkmate::assert_class(join_keys, "join_keys")
   if (is.null(datanames)) datanames <- character(0) # todo: allow to specify

tests/testthat/test-datanames.R

@@ -44,7 +44,7 @@ testthat::test_that("datanames<- called on qenv.error does not change qenv.error
 
 # topological_order ----
 
-testthat::test_that("datanames are set in topological in constructor if join_keys are specified", {
+testthat::test_that("datanames are set in topological order in constructor if join_keys are specified", {
   data <-
     teal_data(b = data.frame(), a = data.frame(), join_keys = join_keys(join_key("a", "b", "id")))
   testthat::expect_identical(
@@ -53,6 +53,25 @@ testthat::test_that("datanames are set in topological in constructor if join_key
   )
 })
 
+testthat::test_that("datanames return parent if in constructor it was provided in join_keys and exists in env", {
+  data <-
+    teal_data(b = data.frame(), a = data.frame(), join_keys = join_keys(join_key("a", "b", "id")))
+  datanames(data) <- "b"
+  testthat::expect_identical(
+    datanames(data),
+    c("a", "b")
+  )
+})
+
+testthat::test_that("datanames do not return parent if in constructor it was provided in join_keys but do not exists in env", {
+  data <-
+    teal_data(b = data.frame(), join_keys = join_keys(join_key("a", "b", "id")))
+  testthat::expect_identical(
+    datanames(data),
+    "b"
+  )
+})
+
 testthat::test_that("datanames return topological order of datasets once join_keys are specified", {
   data <- within(teal_data(), {
     ADTTE <- teal.data::rADTTE
@@ -67,7 +86,7 @@ testthat::test_that("datanames return topological order of datasets once join_ke
   )
 })
 
-testthat::test_that("datanames return topological order of datasets after datanames are caled after join_keys", {
+testthat::test_that("datanames return topological order of datasets after datanames are called after join_keys", {
   data <- within(teal_data(), {
     ADTTE <- teal.data::rADTTE
     iris <- iris
@@ -82,3 +101,34 @@ testthat::test_that("datanames return topological order of datasets after datana
     c("ADSL", "ADTTE", "iris")
   )
 })
+
+
+testthat::test_that("datanames return parent if join_keys were provided and parent exists in env", {
+  data <- within(teal_data(), {
+    ADTTE <- teal.data::rADTTE
+    iris <- iris
+    ADSL <- teal.data::rADSL
+  })
+
+  join_keys(data) <- default_cdisc_join_keys[c("ADSL", "ADTTE")]
+  datanames(data) <- c("ADTTE", "iris")
+
+  testthat::expect_identical(
+    datanames(data),
+    c("ADSL", "ADTTE", "iris")
+  )
+})
+
+testthat::test_that("datanames do not return parent if join_keys were provided and parent did not exists in env", {
+  data <- teal_data(
+    ADTTE = teal.data::rADTTE,
+    iris = iris
+  )
+
+  join_keys(data) <- default_cdisc_join_keys[c("ADSL", "ADTTE")]
+
+  testthat::expect_identical(
+    datanames(data),
+    c("ADTTE", "iris")
+  )
+})

tests/testthat/test-teal_data.R

@@ -28,17 +28,19 @@ testthat::test_that("teal_data initializes teal_data object with @datanames take
   )
 })
 
-testthat::test_that("teal_data initializes teal_data object with @datanames taken from passed join_keys", {
+testthat::test_that(
+  "teal_data initializes teal_data object without @datanames taken from join_keys if objects did not exist in env", {
   testthat::expect_identical(
-    teal_data(join_keys = join_keys(join_key("parent", "child", "id")))@datanames,
-    c("parent", "child")
+    datanames(teal_data(join_keys = join_keys(join_key("parent", "child", "id")))),
+    character(0)
   )
 })
 
-testthat::test_that("teal_data initializes teal_data object with @datanames taken from join_keys and passed objects", {
+testthat::test_that(
+  "teal_data initializes teal_data object with @datanames taken only from passed objects and not join_keys", {
   testthat::expect_identical(
-    teal_data(iris = iris, join_keys = join_keys(join_key("parent", "child", "id")))@datanames,
-    c("iris", "parent", "child")
+    datanames(teal_data(iris = iris, join_keys = join_keys(join_key("parent", "child", "id")))),
+    "iris"
   )
 })