aboutsummaryrefslogtreecommitdiff
path: root/tests/testthat
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2020-06-15 09:05:27 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2020-06-15 09:05:27 +0200
commit068b168d78c9550a77514e0c39923f8d40b48b03 (patch)
treebea0c6801e687d4e0f326ddbdbf5a0a27df8f355 /tests/testthat
parente6f9e9ca89e35e610d9895b979f1351a47451db0 (diff)
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
Diffstat (limited to 'tests/testthat')
-rw-r--r--tests/testthat/FOCUS_2006_D.csf2
-rw-r--r--tests/testthat/test_nafta.R2
-rw-r--r--tests/testthat/test_plot.R1
3 files changed, 1 insertions, 4 deletions
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)

Contact - Imprint