Merge pull request #19 from yng-me/wip

fixed failed test
yng-me · Dec 26, 2023 · 602ef79 · 602ef79
2 parents 035a4d6 + 01b143a
commit 602ef79
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 29 deletions.
diff --git a/tests/testthat/test-compute-contribution.R b/tests/testthat/test-compute-contribution.R
@@ -21,21 +21,23 @@ test_that("contribution by dimension works correctly", {
 })
 
 
-# test_that("contribution by dimension works correctly with aggregation", {
-#   mpi_specs <- use_global_mpi_specs(.uid = 'uuid', .aggregation = 'class')
-#   dm <- df_household |>
-#     create_deprivation_matrix(deprivation_profile, .mpi_specs = mpi_specs)
-#
-#   hr <- dm$censored |>
-#     compute_headcount_ratio(.aggregation = attr_spec$aggregation)
-#
-#   m_0 <- dm$censored |>
-#     compute_headcount_ratio_adjusted(.aggregation = attr_spec$aggregation) |>
-#     dplyr::select(MPI) |>
-#     dplyr::bind_cols(hr) |>
-#     compute_contribution(.mpi_specs = mpi_specs)
-#
-#   expect_equal(nrow(m_0), 2)
-#   expect_equal(ncol(m_0), 12)
-#
-# })
+test_that("contribution by dimension works correctly with aggregation", {
+  mpi_specs <- use_global_mpi_specs(.uid = "uuid", .aggregation = "class")
+  attr_spec <- attributes(mpi_specs)
+
+  dm <- df_household |>
+    create_deprivation_matrix(deprivation_profile, .mpi_specs = mpi_specs)
+
+  hr <- dm$censored |>
+    compute_headcount_ratio(.aggregation = attr_spec$aggregation)
+
+  m_0 <- dm$censored |>
+    compute_headcount_ratio_adjusted(.aggregation = attr_spec$aggregation) |>
+    dplyr::select(mpi) |>
+    dplyr::bind_cols(hr) |>
+    compute_contribution(.mpi_specs = mpi_specs)
+
+  expect_equal(nrow(m_0), 2)
+  expect_equal(ncol(m_0), 12)
+
+})
diff --git a/...stthat/test-compute-headcount-ratio-adj.R → ...t/test-compute-headcount-ratio-adjusted.R b/...stthat/test-compute-headcount-ratio-adj.R → ...t/test-compute-headcount-ratio-adjusted.R
diff --git a/tests/testthat/test-define-deprivation.R b/tests/testthat/test-define-deprivation.R
@@ -12,13 +12,6 @@ test_that("dimension is returned correctly", {
 })
 
 
-# test_that("error if specs file is not defined", {
-#   expect_error(
-#     define_deprivation(df_household, drinking_water, drinking_water == 2),
-#     "MPI specifications must be defined first."
-#   )
-# })
-
 test_that("collapsing is correctly implemented", {
   dp <- df_household_roster |>
     define_deprivation(

diff --git a/tests/testthat/test-define-mpi-specs.R b/tests/testthat/test-define-mpi-specs.R
@@ -91,7 +91,6 @@ test_that("[csv] sample specs file loads correctly", {
   expect_length(unique(specs$dimension), 3)
   expect_length(unique(specs$indicator), 10)
   expect_length(unique(specs$variable), 10)
-  # expect_identical(names(mpi_specs), list_name)
   expect_equal(ncol(mpi_specs), 7)
   expect_equal(nrow(mpi_specs), 10)
 })
@@ -109,7 +108,6 @@ test_that("[xlsx] sample specs file loads correctly", {
   expect_length(unique(specs$dimension), 3)
   expect_length(unique(specs$indicator), 10)
   expect_length(unique(specs$variable), 10)
-  # expect_identical(names(mpi_specs), list_name)
   expect_equal(ncol(mpi_specs), 7)
   expect_equal(nrow(mpi_specs), 10)
 })
@@ -127,7 +125,6 @@ test_that("[txt] sample specs file loads correctly", {
   expect_length(unique(specs$dimension), 3)
   expect_length(unique(specs$indicator), 10)
   expect_length(unique(specs$variable), 10)
-  # expect_identical(names(mpi_specs), list_name)
   expect_equal(ncol(mpi_specs), 7)
   expect_equal(nrow(mpi_specs), 10)
 })
@@ -145,7 +142,6 @@ test_that("[json] sample specs file loads correctly", {
   expect_length(unique(specs$dimension), 3)
   expect_length(unique(specs$indicator), 10)
   expect_length(unique(specs$variable), 10)
-  # expect_identical(names(mpi_specs), list_name)
   expect_equal(ncol(mpi_specs), 7)
   expect_equal(nrow(mpi_specs), 10)
 })