Fix a test I accidentally broke

2 files changed, 13 insertions, 18 deletions

diff --git a/test.log b/test.log
index ddc2bc62..6ba8ff03 100644
--- a/test.log
+++ b/test.log
@@ -4,39 +4,34 @@ Testing mkin
 ✔ |  OK F W S | Context
 ✔ |   5       | AIC calculation
 ✔ |   2       | Export dataset for reading into CAKE
-✔ |  14       | Results for FOCUS D established in expertise for UBA (Ranke 2014) [1.1 s]
+✔ |  14       | Results for FOCUS D established in expertise for UBA (Ranke 2014) [1.0 s]
 ✔ |   4       | Calculation of FOCUS chi2 error levels [0.5 s]
 ✔ |   7       | Fitting the SFORB model [3.6 s]
-✔ |   5       | Analytical solutions for coupled models [3.3 s]
+✔ |   5       | Analytical solutions for coupled models [3.4 s]
 ✔ |   5       | Calculation of Akaike weights
 ✔ |  14       | Confidence intervals and p-values [1.2 s]
 ✔ |  14       | Error model fitting [4.7 s]
-✔ |   1       | Time step normalisation
+✔ |   3       | Time step normalisation
 ✔ |   4       | Test fitting the decline of metabolites from their maximum [0.3 s]
 ✔ |   1       | Fitting the logistic model [0.2 s]
-✔ |  23       | Nonlinear mixed effects models [8.0 s]
-✔ |   1       | Test dataset class mkinds used in gmkin
+✔ |  23       | Nonlinear mixed effects models [8.1 s]
+✔ |   2       | Test dataset classes mkinds and mkindsg
 ✔ |   1       | mkinfit features [0.3 s]
 ✔ |  12       | Special cases of mkinfit calls [0.8 s]
 ✔ |   8       | mkinmod model generation and printing [0.2 s]
 ✔ |   3       | Model predictions with mkinpredict [0.4 s]
-✔ |  16       | Evaluations according to 2015 NAFTA guidance [1.6 s]
+✔ |  16       | Evaluations according to 2015 NAFTA guidance [1.7 s]
 ✔ |   9       | Nonlinear mixed-effects models [7.8 s]
-✖ |  15 1     | Plotting [2.0 s]
-────────────────────────────────────────────────────────────────────────────────
-FAILURE (test_plot.R:26:3): Plotting mkinfit and mmkin objects is reproducible
-Figures don't match: mmkin-plot-for-sfo-focus-c-and-d.svg
-
-────────────────────────────────────────────────────────────────────────────────
+✔ |  16       | Plotting [1.9 s]
 ✔ |   4       | Residuals extracted from mkinfit models
-✔ |   2       | Complex test case from Schaefer et al. (2007) Piacenza paper [1.6 s]
+✔ |   2       | Complex test case from Schaefer et al. (2007) Piacenza paper [1.5 s]
 ✔ |   4       | Summary [0.1 s]
 ✔ |   1       | Summaries of old mkinfit objects
 ✔ |   4       | Results for synthetic data established in expertise for UBA (Ranke 2014) [2.3 s]
-✔ |   9       | Hypothesis tests [7.3 s]
-✔ |   4       | Calculation of maximum time weighted average concentrations (TWAs) [2.3 s]
+✔ |   9       | Hypothesis tests [7.4 s]
+✔ |   4       | Calculation of maximum time weighted average concentrations (TWAs) [2.4 s]
 
 ══ Results ═════════════════════════════════════════════════════════════════════
-Duration: 50.0 s
+Duration: 50.1 s
 
-[ FAIL 1 | WARN 0 | SKIP 0 | PASS 192 ]
+[ FAIL 0 | WARN 0 | SKIP 0 | PASS 196 ]
diff --git a/tests/testthat/test_plot.R b/tests/testthat/test_plot.R
index ae2841c0..b0bf2c8f 100644
--- a/tests/testthat/test_plot.R
+++ b/tests/testthat/test_plot.R
@@ -9,7 +9,7 @@ test_that("Plotting mkinfit and mmkin objects is reproducible", {
   mkinparplot_FOCUS_C_SFO <- function() mkinparplot(fits[["SFO", "FOCUS_C"]])
   mkinerrplot_FOCUS_C_SFO <- function() mkinerrplot(fits[["SFO", "FOCUS_C"]])
   mmkin_FOCUS_C <- function() plot(fits[, "FOCUS_C"])
-  mmkin_SFO <- function() plot(fits["SFO",])
+  mmkin_SFO <- function() plot(fits["SFO", c("FOCUS_C", "FOCUS_D")])
   fit_D_obs_eigen <- suppressWarnings(mkinfit(SFO_SFO, FOCUS_2006_D, error_model = "obs", quiet = TRUE))
   fit_C_tc <- mkinfit("SFO", FOCUS_2006_C, error_model = "tc", quiet = TRUE)
   plot_errmod_fit_C_tc <- function() plot_err(fit_C_tc)