diff --git a/DESCRIPTION b/DESCRIPTION index 776521b68..d5b8a8681 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 3.0.1.9029 +Version: 3.0.1.9030 Date: 2026-03-07 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) diff --git a/NEWS.md b/NEWS.md index d35c2cdf8..71738ef11 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 3.0.1.9029 +# AMR 3.0.1.9030 ### New * Integration with the **tidymodels** framework to allow seamless use of SIR, MIC and disk data in modelling pipelines via `recipes` diff --git a/tests/testthat/test-data.R b/tests/testthat/test-data.R index ddd85c2b0..daa7070e6 100644 --- a/tests/testthat/test-data.R +++ b/tests/testthat/test-data.R @@ -35,7 +35,10 @@ test_that("test-data.R", { expect_identical(class(microorganisms$mo), c("mo", "character")) expect_identical(nrow(antimicrobials), length(unique(AMR::antimicrobials$ab))) expect_identical(class(AMR::antimicrobials$ab), c("ab", "character")) - expect_identical(nrow(antimicrobials[!is.na(antimicrobials$cid), ]), length(unique(AMR::antimicrobials$cid[!is.na(antimicrobials$cid)])), label = "nr of rows with CIDs", expected.label = "unique nr of CIDs") + expect_identical( + nrow(antimicrobials[!is.na(antimicrobials$cid), ]), + length(unique(AMR::antimicrobials$cid[!is.na(antimicrobials$cid)])) + ) # check cross table reference expect_true(all(microorganisms.codes$mo %in% microorganisms$mo)) diff --git a/tests/testthat/test-mdro.R b/tests/testthat/test-mdro.R index ea81eea29..00b928386 100755 --- a/tests/testthat/test-mdro.R +++ b/tests/testthat/test-mdro.R @@ -302,7 +302,7 @@ test_that("test-mdro.R", { # MRGN guideline is used because it explicitly requires PIP=R (not PIP OR TZP) # for Pseudomonas aeruginosa 4MRGN, making the proxy effect directly testable. pseud_no_pip <- data.frame( - mo = as.mo("Pseudomonas aeruginosa"), + mo = as.mo("Pseudomonas aeruginosa"), TZP = as.sir("R"), # piperacillin/tazobactam; no PIP column CAZ = as.sir("R"), IPM = as.sir("R"), @@ -332,7 +332,7 @@ test_that("test-mdro.R", { # Multiple combos for the same base drug: AMX can come from AMC (amoxicillin/clavulanic acid) ente_no_amx <- data.frame( - mo = as.mo("Enterococcus faecium"), + mo = as.mo("Enterococcus faecium"), AMC = as.sir("R"), # amoxicillin/clavulanic acid; no AMX column VAN = as.sir("R"), TEC = as.sir("R"),