Any yet more tests

4 files changed, 17 insertions, 3 deletions

diff --git a/tests/testthat/print_mmkin_parent.txt b/tests/testthat/print_mmkin_parent.txt
new file mode 100644
index 00000000..620a657a
--- /dev/null
+++ b/tests/testthat/print_mmkin_parent.txt
@@ -0,0 +1,13 @@
+<mmkin> object
+Status of individual fits:
+
+      dataset
+model  FOCUS_A FOCUS_C FOCUS_D
+  SFO  OK      OK      OK     
+  FOMC C       OK      OK     
+  DFOP OK      OK      OK     
+  HS   OK      OK      OK     
+
+OK: No warnings
+C: Optimisation did not converge:
+false convergence (8)
diff --git a/tests/testthat/setup_script.R b/tests/testthat/setup_script.R
index e3b56fb3..9da8b90d 100644
--- a/tests/testthat/setup_script.R
+++ b/tests/testthat/setup_script.R
@@ -35,7 +35,7 @@ f_1_mkin_notrans <- mkinfit("SFO", FOCUS_2006_A, quiet = TRUE,
 # mmkin object of parent fits for tests
 models <- c("SFO", "FOMC", "DFOP", "HS")
 fits <- mmkin(models,
-  list(FOCUS_C = FOCUS_2006_C, FOCUS_D = FOCUS_2006_D),
+  list(FOCUS_A = FOCUS_2006_A, FOCUS_C = FOCUS_2006_C, FOCUS_D = FOCUS_2006_D),
   quiet = TRUE, cores = n_cores)
 
 # One metabolite
diff --git a/tests/testthat/test_error_models.R b/tests/testthat/test_error_models.R
index 169001f1..2a1ffcc1 100644
--- a/tests/testthat/test_error_models.R
+++ b/tests/testthat/test_error_models.R
@@ -56,7 +56,6 @@ test_that("The default error model algorithm finds the best known AIC values for
   f_tc_exp_d_3 <- mmkin(c("SFO", "DFOP", "HS"),
     lapply(experimental_data_for_UBA_2019, function(x) x$data),
     error_model = "tc",
-    error_model_algorithm = "d_3",
     quiet = TRUE)
 
   AIC_exp_d_3 <- lapply(f_tc_exp_d_3, AIC)
diff --git a/tests/testthat/test_mixed.R b/tests/testthat/test_mixed.R
index ef73f21d..644cccc1 100644
--- a/tests/testthat/test_mixed.R
+++ b/tests/testthat/test_mixed.R
@@ -2,7 +2,8 @@ context("Nonlinear mixed effects models")
 
 test_that("Parent only models can be fitted using nonlinear mixed effects models", {
   # Some fits were done in the setup script
-  mmkin_sfo_2 <- mmkin("SFO", ds_sfo, fixed_initials = c(parent = 100), quiet = TRUE)
+  mmkin_sfo_2 <- update(mmkin_sfo_1, fixed_initials = c(parent = 100))
+  expect_error(update(mmkin_sfo_1, models = c("SFOOO")), "Please supply models.*")
 
   sfo_saemix_2 <- saem(mmkin_sfo_1, quiet = TRUE, transformations = "mkin")
   sfo_saemix_3 <- expect_error(saem(mmkin_sfo_2, quiet = TRUE), "at least two parameters")
@@ -45,6 +46,7 @@ test_that("Parent only models can be fitted using nonlinear mixed effects models
 })
 
 test_that("Print methods work", {
+  expect_known_output(print(fits, digits = 2), "print_mmkin_parent.txt")
   expect_known_output(print(mmkin_biphasic_mixed, digits = 2), "print_mmkin_biphasic_mixed.txt")
   expect_known_output(print(nlme_biphasic, digits = 1), "print_nlme_biphasic.txt")
   expect_known_output(print(sfo_saemix_1, digits = 1), "print_sfo_saemix_1.txt")