jared
a5f86d87b3
- .detect_direct_suppressed() keys on (year, canonical_govid, category); all-categories mode collapses category to one literal value, so the key collides and the detector silently reports FALSE instead of "unknown". Report NA there instead, and stop isTRUE() in .build_provenance() from collapsing that NA back to FALSE. Schema widened to allow null. - Refuse complete = TRUE + category = "All Categories": the completion grid has no per-category cells left to fill once categories are collapsed, so the prior silent 0-rows-filled result was never actually checked. - cog_balances(category = "All Categories") returned zero rows with no error. .validate_verb_inputs() gains allow_all_categories (default FALSE); .verb_spendrev() passes TRUE, cog_balances() does not, so the three verbs share one place to reject it instead of drifting again. - Fix the false `subtype = "operations"` argument claim (no such argument exists) in NEWS.md and an internal spending.R comment. Adds three covering tests to test-all-categories.R for the three behaviour changes above.
192 lines
8.4 KiB
R
192 lines
8.4 KiB
R
# Baseline at branch point: 843 PASS / 0 FAIL / 0 SKIP / 0 WARN (2026-08-05, origin/main 2fc9e75)
|
|
|
|
test_that(".build_verb_sql emits a literal category and no category filter in all-categories mode", {
|
|
sql <- uscogdata:::.build_verb_sql(
|
|
view = "spending_annotated",
|
|
subtype_col = "spend_subtype",
|
|
govid = "552025209777",
|
|
years = 2019L,
|
|
category = NULL,
|
|
subtype_scope = c("operations", "capital"),
|
|
all_categories = TRUE
|
|
)
|
|
|
|
expect_match(sql, "'All Categories' AS category", fixed = TRUE)
|
|
# no category filter of any kind
|
|
expect_false(grepl("AND category IN", sql, fixed = TRUE))
|
|
# category is not a grouping key
|
|
expect_false(grepl("GROUP BY year, canonical_govid, gov_name, xwalk_gov_name, spend_subtype, category",
|
|
sql, fixed = TRUE))
|
|
# the subtype allowlist still applies -- this is what makes the sum a concept
|
|
expect_match(sql, "AND spend_subtype IN ('operations','capital')", fixed = TRUE)
|
|
})
|
|
|
|
test_that(".build_verb_sql is unchanged when all_categories is FALSE", {
|
|
args <- list(
|
|
view = "spending_annotated", subtype_col = "spend_subtype",
|
|
govid = "552025209777", years = 2019L, category = NULL,
|
|
subtype_scope = c("operations", "capital")
|
|
)
|
|
old <- do.call(uscogdata:::.build_verb_sql, args)
|
|
new <- do.call(uscogdata:::.build_verb_sql, c(args, list(all_categories = FALSE)))
|
|
expect_identical(old, new)
|
|
expect_match(new, "GROUP BY year, canonical_govid, gov_name, xwalk_gov_name, spend_subtype, category",
|
|
fixed = TRUE)
|
|
})
|
|
|
|
test_that(".ALL_CATEGORIES is the exact reserved string", {
|
|
expect_identical(uscogdata:::.ALL_CATEGORIES, "All Categories")
|
|
})
|
|
|
|
test_that('cog_spending(category = "All Categories") sums to the per-category total', {
|
|
gov <- "552025209777"
|
|
by_cat <- cog_spending(gov, 2019L)
|
|
total <- cog_spending(gov, 2019L, category = "All Categories")
|
|
|
|
expect_true(nrow(total) > 0L)
|
|
expect_setequal(unique(total$category), "All Categories")
|
|
# one row per subtype present in the by-category result
|
|
expect_setequal(unique(total$spend_subtype), unique(by_cat$spend_subtype))
|
|
expect_equal(nrow(total), length(unique(by_cat$spend_subtype)))
|
|
|
|
# the dollars agree, per subtype
|
|
lhs <- tapply(by_cat$amt_nominal, by_cat$spend_subtype, sum)
|
|
rhs <- tapply(total$amt_nominal, total$spend_subtype, sum)
|
|
expect_equal(as.numeric(rhs[names(lhs)]), as.numeric(lhs), tolerance = 1e-8)
|
|
})
|
|
|
|
test_that('"All Categories" respects expenditure_concept', {
|
|
gov <- "552025209777"
|
|
prim <- cog_spending(gov, 2019L, category = "All Categories",
|
|
expenditure_concept = "primary")
|
|
dir <- cog_spending(gov, 2019L, category = "All Categories",
|
|
expenditure_concept = "direct")
|
|
# direct = primary plus interest and insurance benefits, so it is never smaller
|
|
expect_gte(sum(dir$amt_nominal), sum(prim$amt_nominal))
|
|
})
|
|
|
|
test_that('"All Categories" works on revenue and respects revenue_concept', {
|
|
gov <- "552025209777"
|
|
gen <- cog_revenue(gov, 2019L, category = "All Categories",
|
|
revenue_concept = "general")
|
|
tot <- cog_revenue(gov, 2019L, category = "All Categories",
|
|
revenue_concept = "total")
|
|
expect_setequal(unique(gen$category), "All Categories")
|
|
expect_gte(sum(tot$amt_nominal), sum(gen$amt_nominal))
|
|
})
|
|
|
|
test_that('"All Categories" cannot be combined with another category', {
|
|
expect_error(
|
|
cog_spending("552025209777", 2019L, category = c("All Categories", "Police")),
|
|
class = "uscogdata_all_categories_not_combinable"
|
|
)
|
|
})
|
|
|
|
test_that('"All Categories" is recorded in provenance', {
|
|
r <- cog_spending("552025209777", 2019L, category = "All Categories")
|
|
expect_identical(cog_explain(r, format = "list")$category, "All Categories")
|
|
})
|
|
|
|
test_that('"All Categories" combines with subtype to give operating totals', {
|
|
gov <- "552025209777"
|
|
ops_by_cat <- cog_spending(gov, 2019L)
|
|
ops_by_cat <- ops_by_cat[ops_by_cat$spend_subtype == "operations", ]
|
|
ops_total <- cog_spending(gov, 2019L, category = "All Categories")
|
|
ops_total <- ops_total[ops_total$spend_subtype == "operations", ]
|
|
expect_equal(sum(ops_total$amt_nominal), sum(ops_by_cat$amt_nominal),
|
|
tolerance = 1e-8)
|
|
})
|
|
|
|
test_that('cog_categories() advertises "All Categories" for both flows', {
|
|
all <- cog_categories()
|
|
rows <- all[all$category == "All Categories", ]
|
|
expect_setequal(rows$category_type, c("expenditure", "revenue"))
|
|
expect_true(all(is.na(rows$subtype)))
|
|
expect_true(all(is.na(rows$n_codes)))
|
|
})
|
|
|
|
test_that('cog_categories(type=) still scopes, including the pseudo-category', {
|
|
sp <- cog_categories(type = "spending")
|
|
expect_setequal(unique(sp$category_type), "expenditure")
|
|
expect_true("All Categories" %in% sp$category)
|
|
|
|
rev <- cog_categories(type = "revenue")
|
|
expect_setequal(unique(rev$category_type), "revenue")
|
|
expect_true("All Categories" %in% rev$category)
|
|
|
|
# balances have no concept vocabulary, so no pseudo-category
|
|
bal <- cog_categories(type = "balance")
|
|
expect_false("All Categories" %in% bal$category)
|
|
})
|
|
|
|
test_that('cog_categories(pattern=) matches the pseudo-category', {
|
|
hit <- cog_categories(pattern = "^All Categories$")
|
|
expect_equal(nrow(hit), 2L)
|
|
})
|
|
|
|
# --- final whole-branch review fixes ---------------------------------------
|
|
|
|
test_that('complete = TRUE is refused when combined with "All Categories"', {
|
|
# .completion_grid_sql() would emit `AND c.category IN ('All Categories')`,
|
|
# match zero crosswalk rows, and the early return in .complete_result()
|
|
# would stamp completion$applied = TRUE, rows_filled = 0 -- reading as "the
|
|
# grid was checked and nothing was missing" when nothing was actually
|
|
# checked. Filling a summed row has no defined semantics, so the verb must
|
|
# refuse the combination outright (finding 2).
|
|
expect_error(
|
|
cog_spending("552025209777", 2019L, category = "All Categories",
|
|
complete = TRUE),
|
|
class = "uscogdata_complete_unsupported"
|
|
)
|
|
expect_error(
|
|
cog_revenue("552025209777", 2019L, category = "All Categories",
|
|
complete = TRUE),
|
|
class = "uscogdata_complete_unsupported"
|
|
)
|
|
})
|
|
|
|
test_that('cog_balances() rejects "All Categories" instead of silently returning zero rows', {
|
|
# cog_balances() reuses .validate_verb_inputs() but did not pass
|
|
# allow_all_categories = TRUE, so "All Categories" used to become
|
|
# `AND category IN ('All Categories')` against balance_annotated -- 0
|
|
# matching crosswalk rows, 0 rows back, no error (finding 3). Holdings are
|
|
# a stock with no concept vocabulary to sum across, so the honest answer is
|
|
# to refuse, the same way cog_spending()/cog_revenue() refuse other
|
|
# nonsensical combinations.
|
|
expect_error(
|
|
cog_balances("552025209777", 2019L, category = "All Categories"),
|
|
class = "uscogdata_all_categories_unsupported"
|
|
)
|
|
# An ordinary category still works -- this is not a blanket regression.
|
|
r <- suppressMessages(
|
|
cog_balances("552025209777", 2019L, category = "Fund Balances")
|
|
)
|
|
expect_gt(nrow(r), 0L)
|
|
})
|
|
|
|
test_that('expenditure_concept_direct_suppressed is NA, not FALSE, when categories are collapsed', {
|
|
# .detect_direct_suppressed() keys on
|
|
# paste(year, canonical_govid, category, sep = "\r"). In all-categories
|
|
# mode every row carries the literal "All Categories" value, so an IG-only
|
|
# row's key collides with any ordinary Direct row for the same
|
|
# (year, govid) -- has_direct reads TRUE whenever the government has ANY
|
|
# direct spending at all, candidate is always empty, and the detector can
|
|
# never fire. Before the fix this silently reported FALSE, an affirmative
|
|
# claim the code did not actually compute (finding 1). NA is the honest
|
|
# answer: cog_explain(x, format = "list") is required here, since without
|
|
# format = "list" it returns the result tibble, not the provenance list.
|
|
gov <- "552025209777"
|
|
t <- cog_spending(gov, 2019L, category = "All Categories",
|
|
expenditure_concept = "total")
|
|
prov <- cog_explain(t, format = "list")
|
|
expect_true(is.na(prov$expenditure_concept_direct_suppressed))
|
|
expect_false(isTRUE(prov$expenditure_concept_direct_suppressed))
|
|
expect_match(prov$expenditure_concept_note, "unavailable", fixed = TRUE)
|
|
|
|
# A per-category "total" query on the same government/year is unaffected --
|
|
# the detector can still key correctly and reports a strict logical.
|
|
t_by_cat <- cog_spending(gov, 2019L, expenditure_concept = "total")
|
|
prov_by_cat <- cog_explain(t_by_cat, format = "list")
|
|
expect_false(is.na(prov_by_cat$expenditure_concept_direct_suppressed))
|
|
})
|