Straggler replacements and fixed some tests for compat with ggplot 4

Author: VisruthSK

tests/testthat/test-aesthetics.R

@@ -14,8 +14,8 @@ test_that("getting and setting the color scheme works", {
   expect_named(color_scheme_get(), scheme_level_names())
   for (clr in names(master_color_list)) {
     color_scheme_set(clr)
-    expect_equal(color_scheme_get(), prepare_colors_for_test(clr, ignore_attr = TRUE),
-                      info = clr)
+    expect_equal(color_scheme_get(), prepare_colors_for_test(clr),
+                      info = clr, ignore_attr = TRUE)
     expect_named(color_scheme_get(), scheme_level_names())
   }
 

tests/testthat/test-convenience-functions.R

@@ -96,20 +96,21 @@ test_that("facet_bg returns correct theme object", {
 test_that("legend_none returns correct theme object", {
   none <- legend_none()
   expect_s3_class(none, "theme")
-  expect_equal(none, list(legend.position = "none"), ignore_attr = TRUE)
+  expect_equal(none$legend.position, "none", ignore_attr = TRUE)
   expect_false(attr(none, "complete"))
 })
 test_that("legend_move returns correct theme object", {
   left <- legend_move("left")
   expect_s3_class(left, "theme")
-  expect_equal(left, list(legend.position = "left"), ignore_attr = TRUE)
+  expect_equal(left$legend.position, "left", ignore_attr = TRUE)
   expect_false(attr(left, "complete"))
 
   pos <- legend_move(c(0.25, 0.5))
   expect_s3_class(pos, "theme")
-  expect_equivalent(
+  expect_equal(
     pos$legend.position.inside %||% pos$legend.position,
-    c(0.25, 0.5)
+    c(0.25, 0.5),
+    ignore_attr = TRUE
   )
   expect_false(attr(pos, "complete"))
 })
@@ -130,9 +131,10 @@ test_that("xaxis_text returns correct theme object", {
 })
 test_that("yaxis_text returns correct theme object", {
   expect_identical(yaxis_text(FALSE), theme(axis.text.y = element_blank()))
-  expect_equivalent(
+  expect_equal(
     yaxis_text(face = "bold", angle = 30),
-    theme(axis.text.y = element_text(face = "bold", angle = 30))
+    theme(axis.text.y = element_text(face = "bold", angle = 30)),
+    ignore_attr = TRUE
   )
 })
 test_that("facet_text returns correct theme object", {

tests/testthat/test-helpers-mcmc.R

@@ -298,7 +298,11 @@ test_that("diagnostic_factor.rhat works", {
                       high = 1.2, high = 1.7))
 
   r <- diagnostic_factor(unname(rhats))
-  expect_equal(r, as.factor(names(rhats)), ignore_attr = TRUE)
+  expect_equal(
+    r,
+    factor(names(rhats), levels = c("low", "ok", "high")),
+    ignore_attr = TRUE
+  )
   expect_identical(levels(r), c("low", "ok", "high"))
 })
 test_that("diagnostic_factor.neff_ratio works", {
@@ -307,7 +311,11 @@ test_that("diagnostic_factor.neff_ratio works", {
                              high = 0.51, high = 0.99, high = 1))
 
   r <- diagnostic_factor(unname(ratios))
-  expect_equal(r, as.factor(names(ratios)), ignore_attr = TRUE)
+  expect_equal(
+    r,
+    factor(names(ratios), levels = c("low", "ok", "high")),
+    ignore_attr = TRUE
+  )
   expect_identical(levels(r), c("low", "ok", "high"))
 })
 

tests/testthat/test-mcmc-intervals.R

@@ -130,8 +130,8 @@ test_that("mcmc_areas_data computes density", {
   densities <- lapply(raw_values, do_dens, 1, 1024)
 
   for (name in names(by_parameter)) {
-    expect_equivalent(by_parameter[[name]][["density"]],
-                      densities[[name]][["y"]])
+    expect_equal(by_parameter[[name]][["density"]],
+                      densities[[name]][["y"]], ignore_attr = TRUE)
   }
 })
 

tests/testthat/test-ppc-distributions.R

@@ -36,7 +36,7 @@ test_that("ppc_dens,pp_hist,ppc_freqpoly,ppc_boxplot return ggplot objects", {
   expect_gg(p <- ppc_hist(y, yrep[1:8, ], binwidth = 3))
   if (utils::packageVersion("ggplot2") >= "3.0.0") {
     facet_var <- vars(rep_label)
-    expect_equal(p$facet$params$facets[[1]], facet_var[[1]])
+    expect_equal(p$facet$params$facets[[1]], facet_var[[1]], ignore_function_env = TRUE, ignore_formula_env = TRUE)
   }
 
   # ppd versions