From 068b168d78c9550a77514e0c39923f8d40b48b03 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Mon, 15 Jun 2020 09:05:27 +0200 Subject: Fix a bug, update for current vdiffr Vignette FOCUS_L failed as I had introduced a bug in the handling of warnings. Current vdiffr only runs visual tests if R < 4.1.0, skipping r-devel for now, see https://github.com/r-lib/vdiffr/commit/630a29d013361fd63fea242f531e2db6aef37919 --- tests/testthat/FOCUS_2006_D.csf | 2 +- tests/testthat/test_nafta.R | 2 -- tests/testthat/test_plot.R | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/testthat/FOCUS_2006_D.csf b/tests/testthat/FOCUS_2006_D.csf index 7c8340cd..aa9fc233 100644 --- a/tests/testthat/FOCUS_2006_D.csf +++ b/tests/testthat/FOCUS_2006_D.csf @@ -5,7 +5,7 @@ Description: MeasurementUnits: % AR TimeUnits: days Comments: Created using mkin::CAKE_export -Date: 2020-05-29 +Date: 2020-06-15 Optimiser: IRLS [Data] diff --git a/tests/testthat/test_nafta.R b/tests/testthat/test_nafta.R index 595db999..dad6d84c 100644 --- a/tests/testthat/test_nafta.R +++ b/tests/testthat/test_nafta.R @@ -22,7 +22,6 @@ test_that("Test data from Appendix B are correctly evaluated", { plot_nafta <- function() plot(res) if(requireNamespace("vdiffr", quietly = TRUE)) { - skip_if(getRversion() > 4.0) vdiffr::expect_doppelganger("NAFTA SOP Appendix B", plot_nafta) } }) @@ -50,7 +49,6 @@ test_that("Test data from Appendix D are correctly evaluated", { plot_nafta <- function() plot(res) if(requireNamespace("vdiffr", quietly = TRUE)) { - skip_if(getRversion() > 4.0) vdiffr::expect_doppelganger("Plot NAFTA analysis", plot_nafta) } }) diff --git a/tests/testthat/test_plot.R b/tests/testthat/test_plot.R index a33de07f..c6a187be 100644 --- a/tests/testthat/test_plot.R +++ b/tests/testthat/test_plot.R @@ -21,7 +21,6 @@ test_that("Plotting mkinfit and mmkin objects is reproducible", { plot_errmod_fit_obs_1 <- function() plot_err(fit_obs_1, sep_obs = FALSE) plot_errmod_fit_tc_1 <- function() plot_err(fit_tc_1, sep_obs = FALSE) - skip_if(getRversion() > 4.0) vdiffr::expect_doppelganger("mkinfit plot for FOCUS C with defaults", plot_default_FOCUS_C_SFO) vdiffr::expect_doppelganger("mkinfit plot for FOCUS C with residuals like in gmkin", plot_res_FOCUS_C_SFO) vdiffr::expect_doppelganger("plot_res for FOCUS C", plot_res_FOCUS_C_SFO_2) -- cgit v1.2.1