aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2019-10-22 14:49:05 +0200
committerJohannes Ranke <jranke@uni-bremen.de>2019-10-22 14:49:05 +0200
commit9bbdcf6e3858a888eeaa2be68755fcd81791f2db (patch)
tree09fcc76cf410ce8be55e0b89c610017d9ad2d735
parent4aeef10690f4992f75f4ace0b6412a05a48b29fc (diff)
Two more plotting tests
-rw-r--r--test.log8
-rw-r--r--tests/testthat/test_plots_summary_twa.R4
2 files changed, 8 insertions, 4 deletions
diff --git a/test.log b/test.log
index eb5486e0..5fedc55e 100644
--- a/test.log
+++ b/test.log
@@ -3,7 +3,7 @@ Testing mkin
✔ | OK F W S | Context
✔ | 2 | Export dataset for reading into CAKE
✔ | 3 | Confidence intervals and p-values
-✔ | 10 | Error model fitting [36.8 s]
+✔ | 10 | Error model fitting [37.2 s]
✔ | 5 | Calculation of FOCUS chi2 error levels [3.5 s]
✔ | 13 | Results for FOCUS D established in expertise for UBA (Ranke 2014) [3.4 s]
✔ | 6 | Test fitting the decline of metabolites from their maximum [0.9 s]
@@ -15,7 +15,7 @@ Testing mkin
✔ | 16 | Evaluations according to 2015 NAFTA guidance [4.0 s]
✔ | 4 | Calculation of maximum time weighted average concentrations (TWAs) [2.2 s]
✔ | 3 | Summary
-✔ | 9 | Plotting [0.5 s]
+✔ | 11 | Plotting [0.6 s]
✔ | 3 | AIC calculation
✔ | 2 | Complex test case from Schaefer et al. (2007) Piacenza paper [5.3 s]
✔ | 4 | Fitting the SFORB model [1.7 s]
@@ -23,9 +23,9 @@ Testing mkin
✔ | 4 | Results for synthetic data established in expertise for UBA (Ranke 2014) [7.1 s]
══ Results ═════════════════════════════════════════════════════════════════════
-Duration: 69.7 s
+Duration: 70.2 s
-OK: 111
+OK: 113
Failed: 0
Warnings: 0
Skipped: 0
diff --git a/tests/testthat/test_plots_summary_twa.R b/tests/testthat/test_plots_summary_twa.R
index 0f88bc30..3fe078b5 100644
--- a/tests/testthat/test_plots_summary_twa.R
+++ b/tests/testthat/test_plots_summary_twa.R
@@ -92,6 +92,8 @@ context("Plotting")
test_that("Plotting mkinfit and mmkin objects is reproducible", {
skip_on_cran()
+ plot_default_FOCUS_C_SFO <- function() plot(fits[["SFO", "FOCUS_C"]])
+ plot_res_FOCUS_C_SFO <- function() plot(fits[["SFO", "FOCUS_C"]], show_residuals = TRUE)
plot_sep_FOCUS_C_SFO <- function() plot_sep(fits[["SFO", "FOCUS_C"]])
mkinparplot_FOCUS_C_SFO <- function() mkinparplot(fits[["SFO", "FOCUS_C"]])
mkinerrplot_FOCUS_C_SFO <- function() mkinerrplot(fits[["SFO", "FOCUS_C"]])
@@ -102,6 +104,8 @@ 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)
+ 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("mkinfit plot for FOCUS C with sep = TRUE", plot_sep_FOCUS_C_SFO)
vdiffr::expect_doppelganger("mkinparplot for FOCUS C SFO", mkinparplot_FOCUS_C_SFO)
vdiffr::expect_doppelganger("mkinerrplot for FOCUS C SFO", mkinerrplot_FOCUS_C_SFO)

Contact - Imprint