From df996535b0bb3077040abccf1c6e20bb4751d2ce Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Tue, 8 Dec 2020 23:56:14 +0100 Subject: Test plots on R-release and cache packages again --- tests/testthat/test_nafta.R | 4 ++-- tests/testthat/test_plot.R | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/testthat') diff --git a/tests/testthat/test_nafta.R b/tests/testthat/test_nafta.R index 62c88983..80b6adba 100644 --- a/tests/testthat/test_nafta.R +++ b/tests/testthat/test_nafta.R @@ -22,7 +22,7 @@ test_that("Test data from Appendix B are correctly evaluated", { plot_nafta <- function() plot(res) if(requireNamespace("vdiffr", quietly = TRUE)) { - skip_if(getRversion() < "4.1.0") + skip_if(getRversion() >= "4.1.0") vdiffr::expect_doppelganger("NAFTA SOP Appendix B", plot_nafta) } }) @@ -50,7 +50,7 @@ test_that("Test data from Appendix D are correctly evaluated", { plot_nafta <- function() plot(res) if(requireNamespace("vdiffr", quietly = TRUE)) { - skip_if(getRversion() < "4.1.0") + skip_if(getRversion() >= "4.1.0") vdiffr::expect_doppelganger("Plot NAFTA analysis", plot_nafta) } }) diff --git a/tests/testthat/test_plot.R b/tests/testthat/test_plot.R index 72f1020c..75fc863f 100644 --- a/tests/testthat/test_plot.R +++ b/tests/testthat/test_plot.R @@ -26,7 +26,7 @@ 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.1.0") + skip_if(getRversion() >= "4.1.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