diff --git a/DESCRIPTION b/DESCRIPTION index eb45acaf..1e91ef26 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: AMR -Version: 2.1.1.9014 -Date: 2024-03-03 +Version: 2.1.1.9015 +Date: 2024-03-09 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) data analysis and to work with microbial and antimicrobial properties by diff --git a/NEWS.md b/NEWS.md index 907a02f6..f2fc26ee 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 2.1.1.9014 +# AMR 2.1.1.9015 *(this beta version will eventually become v3.0. We're happy to reach a new major milestone soon, which will be all about the new One Health support!)* diff --git a/inst/tinytest/test-ab_property.R b/inst/tinytest/test-ab_property.R index d755efde..007d16fb 100644 --- a/inst/tinytest/test-ab_property.R +++ b/inst/tinytest/test-ab_property.R @@ -66,8 +66,7 @@ expect_equal( c("101477-8", "101478-6", "18864-9", "18865-6", "20374-5", "21066-6", "23618-2", "27-3", "28-1", "29-9", "30-7", "31-5", "32-3", "33-1", "3355-5", "33562-0", "33919-2", "34-9", "43883-8", "43884-6", "6979-9", "6980-7", "87604-5") ) -expect_true(ab_url("AMX") %like% "whocc.no") -# expect_warning(ab_url("ASP")) +expect_true(ab_url("AMX") %like% "fhi[.]no") expect_identical( colnames(set_ab_names(example_isolates[, 17:22])), diff --git a/inst/tinytest/test-av_property.R b/inst/tinytest/test-av_property.R index 8a6b1a2f..51377ef8 100644 --- a/inst/tinytest/test-av_property.R +++ b/inst/tinytest/test-av_property.R @@ -60,5 +60,4 @@ expect_equal( c("29113-8", "30273-7", "30287-7", "30303-2", "78772-1", "78773-9", "79134-3", "80118-3") ) -expect_true(av_url("ACI") %like% "whocc.no") -# expect_warning(av_url("ASP")) +expect_true(av_url("ACI") %like% "fhi[.]no")