diff --git a/R/get_agfd.R b/R/get_agfd.R index ef187b6..864559c 100644 --- a/R/get_agfd.R +++ b/R/get_agfd.R @@ -131,7 +131,7 @@ get_agfd <- function(fixed_prices = TRUE, #' @autoglobal #' @noRd print.read.abares.agfd.nc.files <- function(x, ...) { - cli::cli_h1("\nLocally Available ABARES AGFD NetCDF Files\n") + cli::cli_h1("Locally Available ABARES AGFD NetCDF Files") cli::cli_ul(basename(x)) cat("\n") invisible(x) diff --git a/R/get_soil_thickness.R b/R/get_soil_thickness.R index 17474d4..9ce621e 100644 --- a/R/get_soil_thickness.R +++ b/R/get_soil_thickness.R @@ -152,7 +152,7 @@ print.read.abares.soil.thickness.files <- function(x, ...) { cli::cli_text("To see the full metadata, call {.fn print_soil_thickness_metadata} on a soil thickness object in your R session.") - cat("\n") + cli::cat_line() invisible(x) } @@ -184,6 +184,6 @@ print_soil_thickness_metadata <- function(x) { cli::cli_h1("Soil Thickness for Australian areas of intensive agriculture of Layer 1 (A Horizon - top-soil)\n") cli::cli_h2("Dataset ANZLIC ID ANZCW1202000149") cli::cli_text(x$metadata) - cat("\n") + cli::cat_line() invisible(x) } diff --git a/R/inspect_cache.R b/R/inspect_cache.R index dae98b0..6c60b80 100644 --- a/R/inspect_cache.R +++ b/R/inspect_cache.R @@ -45,7 +45,7 @@ inspect_cache <- function(recursive = FALSE) { ) )) } else { - cli::cli_h1("\nLocally Available {{read.abares}} Cached Files\n") + cli::cli_h1("Locally Available {{read.abares}} Cached Files") cli::cli_ul(basename(f)) } } diff --git a/codemeta.json b/codemeta.json index 5f46b37..4a74df0 100644 --- a/codemeta.json +++ b/codemeta.json @@ -309,7 +309,7 @@ }, "SystemRequirements": null }, - "fileSize": "327.717KB", + "fileSize": "327.685KB", "citation": [ { "@type": "SoftwareSourceCode", diff --git a/tests/testthat/test-get_aagis_regions.R b/tests/testthat/test-get_aagis_regions.R index 005edd8..87ad4fe 100644 --- a/tests/testthat/test-get_aagis_regions.R +++ b/tests/testthat/test-get_aagis_regions.R @@ -31,10 +31,10 @@ test_that("get_aagis_regions caches", { expect_true(file.exists( file.path(.find_user_cache(), "aagis_regions_dir/aagis.gpkg") )) - expect_true(!file.exists( + expect_false(file.exists( file.path(.find_user_cache(), "aagis_regions_dir/aagis_zip") )) - expect_true(!file.exists(file.path( + expect_false(file.exists(file.path( .find_user_cache(), "aagis_asgs16v1_g5a.*" ))) }) diff --git a/tests/testthat/test-get_abares_trade.R b/tests/testthat/test-get_abares_trade.R index 4f3387d..be205da 100644 --- a/tests/testthat/test-get_abares_trade.R +++ b/tests/testthat/test-get_abares_trade.R @@ -66,7 +66,7 @@ test_that("get_abares_trade caches", { expect_true(file.exists( file.path(.find_user_cache(), "abares_trade_dir/abares_trade.rds") )) - expect_true(!file.exists( + expect_false(file.exists( file.path(.find_user_cache(), "abares_trade_dir/abares_trade.zip") )) }) diff --git a/tests/testthat/test-get_abares_trade_regions.R b/tests/testthat/test-get_abares_trade_regions.R index 74091d8..edf407a 100644 --- a/tests/testthat/test-get_abares_trade_regions.R +++ b/tests/testthat/test-get_abares_trade_regions.R @@ -52,7 +52,7 @@ test_that("get_abares_trade_regions caches", { expect_true(file.exists( file.path(.find_user_cache(), "abares_trade_dir/abares_trade_regions.rds") )) - expect_true(!file.exists( + expect_false(file.exists( file.path(.find_user_cache(), "abares_trade_dir/abares_trade_regions.csv") )) }) diff --git a/tests/testthat/test-get_agfd.R b/tests/testthat/test-get_agfd.R index c74e75a..69bd414 100644 --- a/tests/testthat/test-get_agfd.R +++ b/tests/testthat/test-get_agfd.R @@ -7,9 +7,9 @@ test_that("get_agfd, fixed = TRUE works", { agfd_nc <- list.files(agfd_nc_dir, full.names = TRUE) nc_files <- function(agfd_nc_dir) { - cli::cli_h1("\nLocally Available ABARES AGFD NetCDF Files\n") + cli::cli_h1("Locally Available ABARES AGFD NetCDF Files") cli::cli_ul(basename(list.files(agfd_nc_dir))) - cat("\n") + cli::cat_line() } print_out <- capture.output(nc_files) @@ -32,9 +32,9 @@ test_that("get_agfd, fixed = FALSE works", { agfd_nc <- list.files(agfd_nc_dir, full.names = TRUE) nc_files <- function(agfd_nc_dir) { - cli::cli_h1("\nLocally Available ABARES AGFD NetCDF Files\n") + cli::cli_h1("Locally Available ABARES AGFD NetCDF Files") cli::cli_ul(basename(list.files(agfd_nc_dir))) - cat("\n") + cli::cat_line() } print_out <- capture.output(nc_files) @@ -88,9 +88,9 @@ test_that("print.read.abares.agfd.nc.files returns a properly formatted list", skip_if_offline() skip_on_ci() print_out <- function(x) { - cli::cli_h1("\nLocally Available ABARES AGFD NetCDF Files\n") + cli::cli_h1("Locally Available ABARES AGFD NetCDF Files") cli::cli_ul(basename(x)) - cat("\n") + cli::cat_line() } x <- get_agfd(cache = TRUE) diff --git a/tests/testthat/test-get_soil_thickness.R b/tests/testthat/test-get_soil_thickness.R index f5e489a..b513ac5 100644 --- a/tests/testthat/test-get_soil_thickness.R +++ b/tests/testthat/test-get_soil_thickness.R @@ -82,7 +82,7 @@ test_that("print.read.abares.thickness.files prints metadata", { cli::cli_text("To see the full metadata, call {.fn print_soil_thickness_metadata} on a soil thickness object in your R session.") - cat("\n") + cli::cat_line() } print_out <- capture.output(out_text()) @@ -101,7 +101,7 @@ test_that("print_soil_thickness_metadata prints full metadata", { ) cli::cli_h2("Dataset ANZLIC ID ANZCW1202000149") cli::cli_text(x$metadata) - cat("\n") + cli::cat_line() } x <- get_soil_thickness(cache = TRUE) diff --git a/tests/testthat/test-read_agfd_stars.R b/tests/testthat/test-read_agfd_stars.R index 1430a28..882fd9e 100644 --- a/tests/testthat/test-read_agfd_stars.R +++ b/tests/testthat/test-read_agfd_stars.R @@ -1,4 +1,5 @@ + test_that("read_agfd_stars() returns a stars object", { skip_if_offline() skip_on_ci() @@ -7,8 +8,8 @@ test_that("read_agfd_stars() returns a stars object", { expect_type(x, "list") expect_s3_class(x[[1]], "stars") - expect_identical( - names(x), + expect_named( + x, c( "f2022.c1991.p2022.t2022.nc", "f2022.c1992.p2022.t2022.nc", @@ -45,8 +46,8 @@ test_that("read_agfd_stars() returns a stars object", { "f2022.c2023.p2022.t2022.nc" ) ) - expect_identical( - names(x[[1]]), + expect_named( + x[[1]], c( "farmno", "R_total_hat_ha", diff --git a/tests/testthat/test-read_agfd_terra.R b/tests/testthat/test-read_agfd_terra.R index 980f303..f7bd1f3 100644 --- a/tests/testthat/test-read_agfd_terra.R +++ b/tests/testthat/test-read_agfd_terra.R @@ -7,8 +7,8 @@ test_that("read_agfd_terra() returns a terra object", { expect_type(x, "list") expect_s4_class(x[[1]], "SpatRaster") - expect_identical( - names(x), + expect_named( + x, c( "f2022.c1991.p2022.t2022.nc", "f2022.c1992.p2022.t2022.nc", @@ -45,8 +45,8 @@ test_that("read_agfd_terra() returns a terra object", { "f2022.c2023.p2022.t2022.nc" ) ) - expect_identical( - names(x[[1]]), + expect_named( + x[[1]], c( "farmno", "R_total_hat_ha", diff --git a/tests/testthat/test-read_agfd_tidync.R b/tests/testthat/test-read_agfd_tidync.R index 5b0985c..8ec30f0 100644 --- a/tests/testthat/test-read_agfd_tidync.R +++ b/tests/testthat/test-read_agfd_tidync.R @@ -7,8 +7,8 @@ test_that("read_agfd_tidync() returns a tidync object", { expect_type(x, "list") expect_s3_class(x[[1]], "tidync") - expect_identical( - names(x), + expect_named( + x, c( "f2022.c1991.p2022.t2022.nc", "f2022.c1992.p2022.t2022.nc",