Merge branch 'development' into function/set_up_keyring

Public-Health-Scotland · Sep 25, 2023 · c3f71cc · c3f71cc
2 parents 7590279 + 53ede24
commit c3f71cc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/R/compute_mid_year_age.R b/R/compute_mid_year_age.R
@@ -20,7 +20,7 @@
 compute_mid_year_age <- function(fyyear, dob) {
   age_intervals <- lubridate::interval(
     start = dob,
-    end = as.Date(midpoint_fy(fyyear))
+    end = midpoint_fy(fyyear)
   )
 
   ages <- lubridate::as.period(age_intervals)$year

diff --git a/tests/testthat/test-compute_mid_year_age.R b/tests/testthat/test-compute_mid_year_age.R
@@ -0,0 +1,16 @@
+test_that("Accurately compute mid year age", {
+  expect_equal(
+    compute_mid_year_age("1718", lubridate::make_date("2000")),
+    phsmethods::age_calculate(
+      lubridate::make_date("2000"),
+      lubridate::make_date("2017", 9L, 30L)
+    )
+  )
+  expect_equal(
+    compute_mid_year_age("2021", lubridate::make_date("1999") + 1:1000),
+    phsmethods::age_calculate(
+      lubridate::make_date("1999") + 1:1000,
+      lubridate::make_date("2020", 9L, 30L)
+    )
+  )
+})