"project" to "projects"

OuhscBbmc · Oct 11, 2024 · fa71737 · fa71737
1 parent 2a0f9b5
commit fa71737
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/R/metadata-utilities.R b/R/metadata-utilities.R
@@ -77,7 +77,7 @@
 #' REDCapR::regex_named_captures(pattern = pattern_boxes, text = choices_2)
 #' }
 #'
-#' path_3     <- system.file(package = "REDCapR", "test-data/project/simple/metadata.csv")
+#' path_3     <- system.file(package = "REDCapR", "test-data/projects/simple/metadata.csv")
 #' ds_metadata_3  <- read.csv(path_3)
 #' choices_3  <- ds_metadata_3[ds_metadata_3$field_name=="race", "select_choices_or_calculations"]
 #' REDCapR::regex_named_captures(pattern = pattern_boxes, text = choices_3)

diff --git a/R/project-simple.R b/R/project-simple.R
@@ -20,23 +20,23 @@ populate_project_simple <- function(batch = FALSE, verbose = TRUE) {
     verbose       = verbose
   )
   path_in_simple <- system.file(
-    "test-data/project/simple/data.csv",
+    "test-data/projects/simple/data.csv",
     package = "REDCapR"
   )
 
   # Write the file to disk (necessary only when you wanted to change the data).  Don't uncomment; just run manually.
   # returned_object <- redcap_read_oneshot(redcap_uri=uri, token=token, raw_or_label="raw")
-  # utils::write.csv(returned_object$data, file="./inst/test-data/project/simple/simple-data.csv", row.names=FALSE)
+  # utils::write.csv(returned_object$data, file="./inst/test-data/projects/simple/simple-data.csv", row.names=FALSE)
   # returned_object_metadata <- redcap_metadata_read(redcap_uri=uri, token=token)
-  # utils::write.csv(returned_object_metadata$data, file="./inst/test-data/project/simple/simple-metadata.csv", row.names=FALSE)
+  # utils::write.csv(returned_object_metadata$data, file="./inst/test-data/projects/simple/simple-metadata.csv", row.names=FALSE)
 
   # Read in the data in R's memory from a csv file.
   ds_to_write <-
     readr::read_csv(
       path_in_simple,
       show_col_types = FALSE
     )
-  # ds_to_write <- utils::read.csv(file="./inst/test-data/project/simple/simple-data.csv")
+  # ds_to_write <- utils::read.csv(file="./inst/test-data/projects/simple/simple-data.csv")
 
   # Remove the calculated variables.
   ds_to_write$age <- NULL

diff --git a/R/redcap-metadata-write.R b/R/redcap-metadata-write.R
@@ -62,7 +62,7 @@
 #' ds_to_write <-
 #'   readr::read_csv(
 #'     file = system.file(
-#'       "test-data/project/simple/metadata.csv",
+#'       "test-data/projects/simple/metadata.csv",
 #'       package = "REDCapR"
 #'     ),
 #'     col_types = readr::cols(.default = readr::col_character())

diff --git a/man/metadata_utilities.Rd b/man/metadata_utilities.Rd
diff --git a/man/redcap_metadata_write.Rd b/man/redcap_metadata_write.Rd
diff --git a/tests/testthat/test-arm-export.R b/tests/testthat/test-arm-export.R
@@ -71,7 +71,7 @@ test_that("Longitudinal Two Arms", {
   testthat::skip_on_cran()
   credential  <- retrieve_credential_testing("longitudinal")
 
-  path_expected <- "test-data/project/longitudinal/arm.csv"
+  path_expected <- "test-data/projects/longitudinal/arm.csv"
   expected_data_frame <- read_arms(path_expected)
 
   expected_outcome_message <- "The list of arms was retrieved from the REDCap project in \\d+(\\.\\d+\\W|\\W)seconds\\."

diff --git a/tests/testthat/test-event-read.R b/tests/testthat/test-event-read.R
@@ -52,7 +52,7 @@ test_that("Longitudinal Two Arms", {
   testthat::skip_on_cran()
   credential  <- retrieve_credential_testing("longitudinal")
 
-  path_expected <- "test-data/project/longitudinal/event.csv"
+  path_expected <- "test-data/projects/longitudinal/event.csv"
   expected_data_frame <- retrieve_expected_events(path_expected)
 
   expected_outcome_message <- "The list of events was retrieved from the REDCap project in \\d+(\\.\\d+\\W|\\W)seconds\\."

diff --git a/tests/testthat/test-metadata-write.R b/tests/testthat/test-metadata-write.R
@@ -4,7 +4,7 @@ credential  <- retrieve_credential_testing("metadata-write")
 
 # Read in the dictionary in R's memory from a csv file.
 path_in <- system.file(
-  "test-data/project/simple/metadata.csv",
+  "test-data/projects/simple/metadata.csv",
   package = "REDCapR"
 )
 dictionary_to_write <-

diff --git a/tests/testthat/test-read-batch-longitudinal.R b/tests/testthat/test-read-batch-longitudinal.R
@@ -30,7 +30,7 @@ test_that("smoke", {
 })
 
 test_that("so-example-data-frame-retrieval", {
-  path_expected <- "test-data/project/longitudinal/expected/so-example-data-frame-retrieval.R"
+  path_expected <- "test-data/projects/longitudinal/expected/so-example-data-frame-retrieval.R"
 
   actual <- tibble::tibble(a=1:5, b=6:10)
 
@@ -43,7 +43,7 @@ test_that("so-example-data-frame-retrieval", {
 
 test_that("default", {
   testthat::skip_on_cran()
-  path_expected <- "test-data/project/longitudinal/expected/default.R"
+  path_expected <- "test-data/projects/longitudinal/expected/default.R"
   expected_outcome_message <- "\\d+ records and \\d+ columns were read from REDCap in \\d+(\\.\\d+\\W|\\W)seconds\\."
 
   ###########################
@@ -89,7 +89,7 @@ test_that("default", {
 
 test_that("filter-numeric", {
   testthat::skip_on_cran()
-  path_expected <- "test-data/project/longitudinal/expected/filter-numeric.R"
+  path_expected <- "test-data/projects/longitudinal/expected/filter-numeric.R"
   expected_outcome_message <- "\\d+ records and \\d+ columns were read from REDCap in \\d+(\\.\\d+\\W|\\W)seconds\\."
 
   filter <- "[bmi] > 25"
@@ -140,7 +140,7 @@ test_that("filter-numeric", {
 
 test_that("filter-character", {
   testthat::skip_on_cran()
-  path_expected <- "test-data/project/longitudinal/expected/filter-character.R"
+  path_expected <- "test-data/projects/longitudinal/expected/filter-character.R"
   expected_outcome_message <- "\\d+ records and \\d+ columns were read from REDCap in \\d+(\\.\\d+\\W|\\W)seconds\\."
 
   filter <- "[email] = '[email protected]'"