From bd0a99f17a482a595f7c0be065b9939c83d89cf4 Mon Sep 17 00:00:00 2001 From: egillax Date: Mon, 10 Feb 2025 14:06:43 +0100 Subject: [PATCH] fix helper --- DESCRIPTION | 2 +- R/HelperFunctions.R | 2 +- tests/testthat/test-HelperFunctions.R | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 tests/testthat/test-HelperFunctions.R diff --git a/DESCRIPTION b/DESCRIPTION index 119fdb0..3aa9e21 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -48,7 +48,7 @@ Config/reticulate: list(package = "torch"), list(package = "polars"), list(package = "duckdb"), - list(package = "pyarrow") + list(package = "pyarrow"), list(package = "tqdm"), list(package = "connectorx"), list(package = "pynvml") diff --git a/R/HelperFunctions.R b/R/HelperFunctions.R index f35bdf6..185d970 100644 --- a/R/HelperFunctions.R +++ b/R/HelperFunctions.R @@ -86,7 +86,7 @@ checkIsClass <- function(parameter, classes) { #' @param value which value it should be higher than checkHigher <- function(parameter, value) { name <- deparse(substitute(parameter)) - if (!is.numeric(parameter) || all(parameter == value)) { + if (!is.numeric(parameter) || all(parameter <= value)) { ParallelLogger::logError(paste0(name, " needs to be > ", value)) stop(paste0(name, " needs to be > ", value)) } diff --git a/tests/testthat/test-HelperFunctions.R b/tests/testthat/test-HelperFunctions.R new file mode 100644 index 0000000..ae00724 --- /dev/null +++ b/tests/testthat/test-HelperFunctions.R @@ -0,0 +1,25 @@ +test_that("Helper functions", { + expect_true(checkInStringVector("test", c("test", "test2"))) + expect_error(checkInStringVector("test", c("test2", "test3"))) + + local({ + filePath <<- withr::local_tempfile(lines = "File contents") + expect_true(checkFileExists(filePath)) + }) + expect_error(checkFileExists(filePath)) + + # checkHigherEqual + expect_true(checkHigherEqual(2, 1)) + expect_true(checkHigherEqual(1, 1)) + expect_error(checkHigherEqual(0, 1)) + + # checkHigher + expect_true(checkHigher(2, 1)) + expect_error(checkHigher(1, 1)) + expect_error(checkHigher(0, 1)) + + # checkIsClass) + expect_true(checkIsClass(2, c("numeric", "integer"))) + expect_error(checkIsClass(2, c("character"))) + expect_error(checkIsClass("2", c("numeric", "integer"))) +})