From 9456b44aab720d50f48cdbe26c07c363287d4b9b Mon Sep 17 00:00:00 2001 From: olivroy <52606734+olivroy@users.noreply.github.com> Date: Fri, 28 Jun 2024 11:40:18 -0400 Subject: [PATCH] Apply suggestions from code review --- R/deprecate.R | 5 ++--- tests/testthat/test-wb_functions.R | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/R/deprecate.R b/R/deprecate.R index cfe837345..a2bd288d1 100644 --- a/R/deprecate.R +++ b/R/deprecate.R @@ -70,7 +70,6 @@ remove_comment <- function( #' @keywords internal #' @export convertToExcelDate <- function(df, date1904 = FALSE) { - .Deprecated(old = "convertToExcelDate", new = "convert_to_excel_date", package = "openxlsx2") stop("convertToExcelDate() is defunct and will be removed in new version. Use convert_to_excel_date().", call. = FALSE) } @@ -157,7 +156,7 @@ write_datatable <- function( total_row = FALSE, ... ) { - .Deprecated("wb_add_data_table()", package = "openxlsx2", old = "write_datatable") + .Deprecated("wb_add_data_table()", package = "openxlsx2", old = "write_datatable()") do_write_datatable( wb = wb, sheet = sheet, @@ -208,7 +207,7 @@ write_formula <- function( enforce = FALSE, ... ) { - .Deprecated("wb_add_formula()", package = "openxlsx2", old = "write_formula") + .Deprecated("wb_add_formula()", package = "openxlsx2", old = "write_formula()") do_write_formula( wb = wb, diff --git a/tests/testthat/test-wb_functions.R b/tests/testthat/test-wb_functions.R index 4f0c6ea9f..c82b8486d 100644 --- a/tests/testthat/test-wb_functions.R +++ b/tests/testthat/test-wb_functions.R @@ -34,7 +34,7 @@ test_that("wb_to_df", { expect_equal(convert_to_excel_date(df = exp["Var5"], date1904 = FALSE), got["Var5"]) - expect_error(expect_warning(convertToExcelDate(df = exp["Var5"], date1904 = FALSE), "deprecated"), "defunct") + expect_error(convertToExcelDate(df = exp["Var5"], date1904 = FALSE), "defunct") # return the underlying Excel formula instead of their values got <- wb_to_df(wb1, showFormula = TRUE)