Fix MDA and PEV tests

mrc-ide · Apr 16, 2024 · 709fae3 · 709fae3
1 parent 22758e7
commit 709fae3
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 22 deletions.
diff --git a/tests/testthat/test-mda.R b/tests/testthat/test-mda.R
@@ -81,11 +81,8 @@ test_that('MDA moves the diseased and non-diseased population correctly', {
     drug = mock_double(c(1, 2, 1, 2))
   )
 
-  events$mda_administer <- mock_event(events$mda_administer)
-
   listener <- create_mda_listeners(
     variables,
-    events$mda_administer,
     parameters$mda_drug,
     parameters$mda_timesteps,
     parameters$mda_coverages,
@@ -141,12 +138,6 @@ test_that('MDA moves the diseased and non-diseased population correctly', {
     50,
     c(3, 4)
   )
-
-  mockery::expect_args(
-    events$mda_administer$schedule,
-    1,
-    100
-  )
 })
 
 test_that('MDA moves the diseased and non-diseased population correctly - second round, varying age range', {
@@ -176,11 +167,8 @@ test_that('MDA moves the diseased and non-diseased population correctly - second
     drug = mock_double(c(1, 2, 1, 2))
   )
 
-  events$mda_administer <- mock_event(events$mda_administer)
-
   listener <- create_mda_listeners(
     variables,
-    events$mda_administer,
     parameters$mda_drug,
     parameters$mda_timesteps,
     parameters$mda_coverages,
@@ -265,11 +253,8 @@ test_that('MDA ignores non-detectable asymptomatics', {
     drug = mock_double(c(1, 2, 1, 2))
   )
 
-  events$mda_administer <- mock_event(events$mda_administer)
-
   listener <- create_mda_listeners(
     variables,
-    events$mda_administer,
     parameters$mda_drug,
     parameters$mda_timesteps,
     parameters$mda_coverages,

diff --git a/tests/testthat/test-pev.R b/tests/testthat/test-pev.R
@@ -203,7 +203,6 @@ test_that('Mass vaccinations update vaccination time', {
     c(-1, -1, -1, 50, 50)
   )
 
-  events$mass_pev <- mock_event(events$mass_pev)
   events$mass_pev_doses <- lapply(events$mass_pev_doses, mock_event)
 
   listener <- create_mass_pev_listener(
@@ -241,12 +240,6 @@ test_that('Mass vaccinations update vaccination time', {
     c(1, 3),
     parameters$pev_doses[[3]]
   )
-
-  mockery::expect_args(
-    events$mass_pev$schedule,
-    1,
-    365
-  )
 })
 
 test_that('Mass vaccinations ignore EPI individuals', {