diff --git a/tests/testthat/test-01-run-model.R b/tests/testthat/test-01-run-model.R index 3a2229ff..11910edc 100644 --- a/tests/testthat/test-01-run-model.R +++ b/tests/testthat/test-01-run-model.R @@ -205,7 +205,7 @@ test_that("exceeding max_iterations raises convergence warning", { expect_length(out$warnings, 3) expect_equal(out$warnings[[1]]$text, - paste0("Naomi subnational data not equal to Spectrum national data. Check table on review inputs tab for: \nnumber_on_art: 2011;2012;2013;2014;2015;2016;2017;2018;2019;2020;2021;2022;2023")) + paste0("Naomi subnational data not equal to Spectrum national data. Check table on review inputs tab for: \nnumber_on_art: 2019;2021;2022;2023")) expect_equal(out$warnings[[3]]$text, paste0("Convergence error: iteration limit reached without convergence (10)")) diff --git a/tests/testthat/test-downloads.R b/tests/testthat/test-downloads.R index 0849cdd2..2b774264 100644 --- a/tests/testthat/test-downloads.R +++ b/tests/testthat/test-downloads.R @@ -27,8 +27,7 @@ test_that("spectrum download can be created", { expect_equal(names(navigator_checklist), c("NaomiCheckPermPrimKey", "NaomiCheckDes", "TrueFalse")) - checklist_primkeys <- c( "ART_is_Spectrum","ANC_is_Spectrum","Package_created", - "Package_has_all_data","Opt_recent_qtr","Opt_future_proj_qtr", + checklist_primkeys <- c( "Package_created", "Package_has_all_data","Opt_recent_qtr","Opt_future_proj_qtr", "Opt_area_ID_selected","Opt_calendar_survey_match","Opt_recent_survey_only", "Opt_ART_coverage","Opt_ANC_data","Opt_ART_data", "Opt_ART_attendance_yes","Model_fit","Cal_Population", @@ -257,8 +256,7 @@ test_that("spectrum download can be created", { expect_equal(names(navigator_checklist), c("NaomiCheckPermPrimKey", "NaomiCheckDes", "TrueFalse")) - checklist_primkeys <- c( "ART_is_Spectrum","ANC_is_Spectrum","Package_created", - "Package_has_all_data","Opt_recent_qtr","Opt_future_proj_qtr", + checklist_primkeys <- c( "Package_has_all_data","Opt_recent_qtr","Opt_future_proj_qtr", "Opt_area_ID_selected","Opt_calendar_survey_match","Opt_recent_survey_only", "Opt_ART_coverage","Opt_ANC_data","Opt_ART_data", "Opt_ART_attendance_yes","Model_fit","Cal_Population", diff --git a/tests/testthat/test-warning.R b/tests/testthat/test-warning.R index 6ef9ebd4..d3306dfc 100644 --- a/tests/testthat/test-warning.R +++ b/tests/testthat/test-warning.R @@ -61,7 +61,7 @@ test_that("warning raised after false convergence", { expect_length(out$warnings, 3) expect_match(out$warnings[[1]]$text, - "Naomi subnational data not equal to Spectrum national data. Check table on review inputs tab for: \nnumber_on_art: 2011;2012;2013;2014;2015;2016;2017;2018;2019;2020;2021;2022;2023") + "Naomi subnational data not equal to Spectrum national data. Check table on review inputs tab for: \nnumber_on_art: 2019;2021;2022;2023") expect_match(out$warnings[[2]]$text, "Naomi subnational data not equal to Spectrum national data. Check table on review inputs tab for: \nanc_already_art: 2012;2013;2014;2015;2016;2017;2018;2019;2020;2021;2022;2023\nanc_clients: 2012;2013;2014;2015;2016;2017;2018;2019;2020;2021;2022;2023\nanc_known_neg: 2013;2014;2015;2016;2017;2018;2019;2020;2021;2022;2023\nanc_known_pos: 2012;2013;2014;2015;2016;2017;2018;2019;2020;2021;2022;2023\nanc_tested: 2012;2013;2014;2015;2016;2017;2018;2019;2020;2021;2022;2023") expect_equal(out$warnings[[3]]$text,