BOT: Fix #839: Remove test_columns_not_present() wrapper

R/check-input-helpers.R

@@ -107,15 +107,3 @@ test_columns_present <- function(data, columns) {
   check <- check_columns_present(data, columns)
   return(isTRUE(check))
 }
-
-#' Test whether column names are NOT present in a data.frame
-#' @description The function checks whether all column names are NOT present.
-#' If none of the columns are present, the function returns TRUE. If one or
-#' more columns are present, the function returns FALSE.
-#' @inheritParams document_check_functions
-#' @returns Returns TRUE if none of the columns are present and FALSE otherwise
-#' @importFrom checkmate test_names
-#' @keywords internal_input_check
-test_columns_not_present <- function(data, columns) {
-  test_names(colnames(data), disjunct.from = columns)
-}

R/class-forecast-binary.R

@@ -58,15 +58,16 @@ as_forecast_binary.default <- function(data,
 #' @export
 #' @rdname assert_forecast
 #' @importFrom cli cli_abort
+#' @importFrom checkmate test_names
 #' @keywords validate-forecast-object
 assert_forecast.forecast_binary <- function(
   forecast, forecast_type = NULL, verbose = TRUE, ...
 ) {
   forecast <- assert_forecast_generic(forecast, verbose)
   assert_forecast_type(forecast, actual = "binary", desired = forecast_type)
 
-  columns_correct <- test_columns_not_present(
-    forecast, c("sample_id", "quantile_level")
+  columns_correct <- test_names(
+    colnames(forecast), disjunct.from = c("sample_id", "quantile_level")
   )
   if (!columns_correct) {
     cli_abort(

tests/testthat/test-check-input-helpers.R

@@ -36,15 +36,6 @@ test_that("check_columns_present works", {
   )
 })
 
-test_that("test_columns_not_present works", {
-  expect_true(
-    test_columns_not_present(example_binary, "sample_id")
-  )
-  expect_false(
-    test_columns_not_present(example_binary, "location")
-  )
-})
-
 test_that("check_columns_present() works", {
   expect_identical(
     check_columns_present(example_quantile, c("observed", "predicted", "nop")),

tests/testthat/test-class-forecast-binary.R

@@ -45,6 +45,25 @@ test_that("assert_forecast.forecast_binary works as expected", {
   )
 })
 
+test_that("assert_forecast.forecast_binary() rejects data with quantile_level column", {
+  test <- na.omit(as.data.table(example_binary))
+  test[, "quantile_level" := 0.5]
+  expect_error(
+    as_forecast_binary(test),
+    "Input looks like a binary forecast, but an additional column"
+  )
+})
+
+test_that("assert_forecast.forecast_binary() accepts valid binary data without sample_id or quantile_level", {
+  expect_no_error(assert_forecast(example_binary))
+})
+
+test_that("test_columns_not_present() is no longer exported or defined", {
+  expect_false(
+    exists("test_columns_not_present",
+           where = asNamespace("scoringutils"), mode = "function")
+  )
+})
 
 
 # ==============================================================================