From f932f8279e3727714374ee29c27feca0ada83b60 Mon Sep 17 00:00:00 2001 From: "Matthijs S. Berends" Date: Fri, 23 Sep 2022 16:07:45 +0200 Subject: [PATCH] fixes --- DESCRIPTION | 2 +- NEWS.md | 2 +- inst/tinytest/test-mo.R | 2 -- tests/tinytest.R | 16 +++++++++++++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 7e60fe1e..1f530136 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 1.8.1.9065 +Version: 1.8.1.9066 Date: 2022-09-23 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) diff --git a/NEWS.md b/NEWS.md index 891bbac2..554b4ea4 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 1.8.1.9065 +# AMR 1.8.1.9066 This version will eventually become v2.0! We're happy to reach a new major milestone soon! diff --git a/inst/tinytest/test-mo.R b/inst/tinytest/test-mo.R index 30ae419a..bf155894 100644 --- a/inst/tinytest/test-mo.R +++ b/inst/tinytest/test-mo.R @@ -307,8 +307,6 @@ expect_equal( rep("UNKNOWN", 3) ) -expect_null(mo_failures()) - expect_error(translate_allow_uncertain(5)) # debug mode diff --git a/tests/tinytest.R b/tests/tinytest.R index c425a946..ac9fd997 100644 --- a/tests/tinytest.R +++ b/tests/tinytest.R @@ -38,11 +38,25 @@ if (identical(Sys.getenv("R_RUN_TINYTEST"), "true")) { set_AMR_locale("English") # get dir.exists(), trimws() and strrep() if on old R if (getRversion() < "3.2.0") { + anyNA <- AMR:::anyNA dir.exists <- AMR:::dir.exists + file.size <- AMR:::file.size + file.mtime <- AMR:::file.mtime + isNamespaceLoaded <- AMR:::isNamespaceLoaded + lengths <- AMR:::lengths } if (getRversion() < "3.3.0") { - trimws <- AMR:::trimws strrep <- AMR:::strrep + trimws <- AMR:::trimws + } + if (getRversion() < "3.4.2") { + isFALSE <- AMR:::isFALSE + } + if (getRversion() < "3.6.0") { + str2lang <- AMR:::str2lang + } + if (getRversion() < "4.0.0") { + deparse1 <- AMR:::deparse1 } # start the unit tests out <- test_package("AMR",