From 41b6d1adc727b46821f6795eebd04a9a2e533084 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlle=20Salmon?= Date: Fri, 15 Mar 2024 12:12:44 +0100 Subject: [PATCH] style: restyle guided by lintr --- tests/testthat.R | 4 ++-- tests/testthat/helper.R | 4 ++-- tests/testthat/setup.R | 2 +- tests/testthat/teardown.R | 2 +- tests/testthat/test-layers.R | 2 +- tests/testthat/testdata/test-data-prep.R | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/testthat.R b/tests/testthat.R index 2e285f6..18f6e6a 100644 --- a/tests/testthat.R +++ b/tests/testthat.R @@ -1,4 +1,4 @@ -library(testthat) -library(EMODnetWFS) +library(testthat) # nolint: undesirable_function_linter +library(EMODnetWFS) # nolint: undesirable_function_linter test_check("EMODnetWFS") diff --git a/tests/testthat/helper.R b/tests/testthat/helper.R index 402ef64..190aea1 100644 --- a/tests/testthat/helper.R +++ b/tests/testthat/helper.R @@ -1,4 +1,4 @@ -library(httptest) +library(httptest) # nolint: undesirable_function_linter forget_all <- function() { memoise::forget(emodnet_wfs) @@ -7,7 +7,7 @@ forget_all <- function() { } with_mock_dir <- function(name, ...) { - httptest::with_mock_dir(file.path("../fixtures", name), ...) + httptest::with_mock_dir(file.path("../fixtures", name), ...) # nolint: nonportable_path_linter } create_biology_wfs <- function() { diff --git a/tests/testthat/setup.R b/tests/testthat/setup.R index dc22d33..0ccaa3d 100644 --- a/tests/testthat/setup.R +++ b/tests/testthat/setup.R @@ -1 +1 @@ -pre_test_options <- options(EMODnetWFS.quiet = TRUE) +pre_test_options <- options(EMODnetWFS.quiet = TRUE)# nolint: undesirable_function_linter diff --git a/tests/testthat/teardown.R b/tests/testthat/teardown.R index 6c7ef9f..70588e4 100644 --- a/tests/testthat/teardown.R +++ b/tests/testthat/teardown.R @@ -1 +1 @@ -options(pre_test_options) +options(pre_test_options)# nolint: undesirable_function_linter diff --git a/tests/testthat/test-layers.R b/tests/testthat/test-layers.R index 6722e59..fdcaf33 100644 --- a/tests/testthat/test-layers.R +++ b/tests/testthat/test-layers.R @@ -84,7 +84,7 @@ test_that("reduce layers on single layer returns sf", { }) test_that("emodnet_get_layers errors well when no service nor wfs", { - expect_snapshot_error(emodnet_get_layers(layers = c("randomlayer"))) + expect_snapshot_error(emodnet_get_layers(layers = "randomlayer")) }) test_that("emodnet_get_layers errors well when bad wfs", { diff --git a/tests/testthat/testdata/test-data-prep.R b/tests/testthat/testdata/test-data-prep.R index d21d905..c393e28 100644 --- a/tests/testthat/testdata/test-data-prep.R +++ b/tests/testthat/testdata/test-data-prep.R @@ -4,7 +4,7 @@ attr_desc <- layer_attribute_descriptions(wfs, layer = "maritimebnds") testthis::use_testdata(attr_desc, overwrite = TRUE) -maritime_crs <- EMODnetWFS:::get_layer_default_crs( +maritime_crs <- get_layer_default_crs( layer = "maritimebnds", wfs, output = "crs"