Fix tests

Author: multimeric

NAMESPACE

@@ -50,6 +50,7 @@ importFrom(purrr,map)
 importFrom(purrr,map_int)
 importFrom(purrr,pmap_chr)
 importFrom(purrr,reduce)
+importFrom(purrr,set_names)
 importFrom(purrr,transpose)
 importFrom(rlang,.data)
 importFrom(stats,setNames)

R/dev.R

@@ -65,7 +65,7 @@ upload_swift = function(source, container, name = basename(source), credential_i
 #' @param version The version for the new metadata as a character scalar, e.g.
 #'   "0.2.3"
 #' @inheritDotParams upload_swift
-#' @example 
+#' @examples
 #' \dontrun{
 #'  metadata = CuratedAtlasQueryR::get_metadata() |> head(10) |> dplyr::collect()
 #'  update_database(metadata, "0.2.3", credential_id = "ABCDEFGHIJK", credential_secret = "ABCD1234EFGH-5678IJK")

R/query.R

@@ -458,7 +458,13 @@ get_metadata <- function(
 #' @param dataset_ids A character vector, where each entry is a dataset ID
 #'  obtained from the `$dataset_id` column of the table returned from
 #'  [get_metadata()]
-#' @return
+#' @importFrom purrr map set_names
+#' @importFrom glue glue
+#' @importFrom DBI dbConnect
+#' @importFrom duckdb duckdb
+#' @importFrom dplyr tbl
+#' @return A named list, where each name is a dataset ID, and each value is
+#'  a "lazy data frame", ie a `tbl`.
 #' @export
 #' @examples
 #' dataset_id = "838ea006-2369-4e2c-b426-b2a744a2b02b"
@@ -474,11 +480,11 @@ get_unharmonised_metadata = function(
     unharmonised_root <- file.path(cache_directory, COUNTS_VERSION, "unharmonised")
     duck = duckdb() |> dbConnect(drv = _, read_only = TRUE)
     dataset_ids |> 
-        purrr::set_names() |>
-        purrr::map(function(dataset_id){
+        set_names() |>
+        map(function(dataset_id){
             file_name = glue::glue("{dataset_id}.parquet")
             local_path = file.path(unharmonised_root, file_name)
-            glue::glue("{remote_url}/{file_name}") |>
+            glue("{remote_url}/{file_name}") |>
                 sync_remote_file(
                 local_path,
                 progress(type = "down", con = stderr())

tests/testthat/test-query.R

@@ -162,13 +162,13 @@ test_that("get_unharmonised_metadata works with one ID", {
     unharmonised_meta = get_unharmonised_metadata(dataset_id)
     unharmonised_tbl = unharmonised_meta[[dataset_id]]
 
-    expect_s3_class(unharmonised_meta, "list")
+    expect_type(unharmonised_meta, "list")
     expect_s3_class(unharmonised_tbl, "tbl")
 })
 
 test_that("get_unharmonised_metadata works with multiple IDs", {
-    dataset_ids = c("838ea006-2369-4e2c-b426-b2a744a2b02b", "83b9cb97-9ee4-404d-8cdf-ccede8235356.parquet")
+    dataset_ids = c("838ea006-2369-4e2c-b426-b2a744a2b02b", "83b9cb97-9ee4-404d-8cdf-ccede8235356")
     unharmonised_meta = get_unharmonised_metadata(dataset_ids)
 
     expect_equal(names(unharmonised_meta), dataset_ids)
-})
+})