From a06e9a0544e9589f8dd73c657a74d42edaadbe12 Mon Sep 17 00:00:00 2001 From: "David J. Bosak" Date: Thu, 13 Jun 2024 16:03:21 -0400 Subject: [PATCH] Fix tests for quarter code. --- tests/testthat/test-fapply.R | 28 ++++++++++++++-------------- tests/testthat/test-utilities.R | 13 ++++++++----- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/tests/testthat/test-fapply.R b/tests/testthat/test-fapply.R index 6e165f3..6f6b290 100644 --- a/tests/testthat/test-fapply.R +++ b/tests/testthat/test-fapply.R @@ -282,8 +282,8 @@ test_that("fapply11: format_quarter() works as expected.", { res - expect_equal(res %eq% c("2000-1", "2025-1", "2000-2", "2025-2", "2000-3", "2025-3", - "2000-4", "2025-4", NA, NA), TRUE) + expect_equal(all(res[1:8] == c("2000-1", "2025-1", "2000-2", "2025-2", "2000-3", "2025-3", + "2000-4", "2025-4")), TRUE) f2 <- format(v1, "%Y-%Q") @@ -291,8 +291,8 @@ test_that("fapply11: format_quarter() works as expected.", { res2 - expect_equal(res2 %eq% c("2000-Q1", "2025-Q1", "2000-Q2", "2025-Q2", "2000-Q3", - "2025-Q3", "2000-Q4", "2025-Q4", NA, NA), TRUE) + expect_equal(all(res2[1:8] == c("2000-Q1", "2025-Q1", "2000-Q2", "2025-Q2", "2000-Q3", + "2025-Q3", "2000-Q4", "2025-Q4")), TRUE) }) @@ -307,8 +307,8 @@ test_that("fapply12: fapply with quarter works as expected.", { print(res1) - expect_equal(res1 %eq% c("00-1", "25-1", "00-2","25-2", "00-3", "25-3", "00-4", - "25-4", NA, NA), TRUE) + expect_equal(all(res1[1:8] == c("00-1", "25-1", "00-2","25-2", "00-3", "25-3", "00-4", + "25-4")), TRUE) res2 <- fapply(v1, "%Y-%Q") @@ -317,10 +317,10 @@ test_that("fapply12: fapply with quarter works as expected.", { print(res2) - expect_equal(res2 %eq% c("2000-Q1", "2025-Q1", "2000-Q2","2025-Q2", "2000-Q3", + expect_equal(all(res2[1:8] == c("2000-Q1", "2025-Q1", "2000-Q2","2025-Q2", "2000-Q3", "2025-Q3", "2000-Q4", - "2025-Q4", NA, NA), TRUE) + "2025-Q4")), TRUE) res3 <- fapply(v1, "%q") @@ -329,8 +329,8 @@ test_that("fapply12: fapply with quarter works as expected.", { print(res3) - expect_equal(res3 %eq% c("1", "1", "2","2", "3", "3", "4", - "4", NA, NA), TRUE) + expect_equal(all(res3[1:8] == c("1", "1", "2","2", "3", "3", "4", + "4")), TRUE) res4 <- fapply(Sys.time(), "%Q") @@ -359,8 +359,8 @@ test_that("fapply13: fapply with quarter and date works as expected.", { - expect_equal(res1 %eq% c("00-1-15", "25-1-15", "00-2-15","25-2-15", "00-3-15", - "25-3-15", "00-4-15", "25-4-15", NA, NA), TRUE) + expect_equal(all(res1[1:8] == c("00-1-15", "25-1-15", "00-2-15","25-2-15", "00-3-15", + "25-3-15", "00-4-15", "25-4-15")), TRUE) res2 <- fapply(v1, "%Y-%Q-%d") @@ -369,10 +369,10 @@ test_that("fapply13: fapply with quarter and date works as expected.", { res2 - expect_equal(res2 %eq% c("2000-Q1-15", "2025-Q1-15", "2000-Q2-15","2025-Q2-15", "2000-Q3-15", + expect_equal(all(res2[1:8] == c("2000-Q1-15", "2025-Q1-15", "2000-Q2-15","2025-Q2-15", "2000-Q3-15", "2025-Q3-15", "2000-Q4-15", - "2025-Q4-15", NA, NA), TRUE) + "2025-Q4-15")), TRUE) }) diff --git a/tests/testthat/test-utilities.R b/tests/testthat/test-utilities.R index 99319dc..73a2117 100644 --- a/tests/testthat/test-utilities.R +++ b/tests/testthat/test-utilities.R @@ -54,7 +54,7 @@ test_that("utils2: get_quarter() works as expected.", { res <- get_quarter(v1) - expect_equal(res %eq% c(1, 1, 2, 2, 3, 3, 4, 4, NA, NA), TRUE) + expect_equal(all(res[1:8] == c(1, 1, 2, 2, 3, 3, 4, 4)), TRUE) expect_equal("numeric" %in% class(res), TRUE) }) @@ -77,8 +77,10 @@ test_that("utils3: replace_quarter() works as expected.", { res - expect_equal(res %eq% c("2000-Q1", "2025-Q1", "2000-Q2", "2025-Q2", "2000-Q3", - "2025-Q3", "2000-Q4", "2025-Q4", NA, NA), TRUE) + expect_equal(all(res[1:8] == c("2000-Q1", "2025-Q1", "2000-Q2", "2025-Q2", "2000-Q3", + "2025-Q3", "2000-Q4", "2025-Q4")), TRUE) + + expect_equal(all(is.na(res[9:10]) == c(TRUE, TRUE)), TRUE) val <- format(v1, "%Y-%q") q <- get_quarter(v1) @@ -89,9 +91,10 @@ test_that("utils3: replace_quarter() works as expected.", { res2 - expect_equal(res2 %eq% c("2000-q1", "2025-q1", "2000-q2", "2025-q2", "2000-q3", - "2025-q3", "2000-q4", "2025-q4", NA, NA), TRUE) + expect_equal(all(res2[1:8] == c("2000-q1", "2025-q1", "2000-q2", "2025-q2", "2000-q3", + "2025-q3", "2000-q4", "2025-q4")), TRUE) + expect_equal(all(is.na(res2[9:10]) == c(TRUE, TRUE)), TRUE) })