diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2020-12-09 19:12:38 +0100 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2020-12-09 19:12:38 +0100 |
| commit | a5746dcc0e5a018548bf977f4ac61f0ad2a4dd2d (patch) | |
| tree | b3d9e3820368b7470ca0388ebdc5fb1b380fd8a6 /tests | |
| parent | b0341af402271a1339308ba930c12530f62d4cf8 (diff) | |
Some test fixes
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testthat/print_sfo_saem_1.txt (renamed from tests/testthat/print_sfo_saemix_1.txt) | 2 | ||||
| -rw-r--r-- | tests/testthat/test_mixed.R | 2 | ||||
| -rw-r--r-- | tests/testthat/test_plot.R | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/tests/testthat/print_sfo_saemix_1.txt b/tests/testthat/print_sfo_saem_1.txt index 9dd4f175..d341e9e7 100644 --- a/tests/testthat/print_sfo_saemix_1.txt +++ b/tests/testthat/print_sfo_saem_1.txt @@ -6,8 +6,6 @@ Data: 264 observations of 1 variable(s) grouped in 15 datasets Likelihood computed by importance sampling - -LL by is "-653.97 (df=6)" AIC BIC logLik 1320 1324 -654 diff --git a/tests/testthat/test_mixed.R b/tests/testthat/test_mixed.R index 6fc6c2f0..7798be8a 100644 --- a/tests/testthat/test_mixed.R +++ b/tests/testthat/test_mixed.R @@ -88,7 +88,7 @@ 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") + expect_known_output(print(sfo_saem_1, digits = 1), "print_sfo_saem_1.txt") }) test_that("nlme results are reproducible", { diff --git a/tests/testthat/test_plot.R b/tests/testthat/test_plot.R index b0bf2c8f..22f4307f 100644 --- a/tests/testthat/test_plot.R +++ b/tests/testthat/test_plot.R @@ -35,14 +35,14 @@ test_that("Plotting mkinfit and mmkin objects is reproducible", { plot_biphasic_mmkin <- function() plot(f_uba_dfop_sfo_mixed) vdiffr::expect_doppelganger("mixed model fit for mmkin object", plot_biphasic_mmkin) - plot_biphasic_nlme <- function() plot(dfop_nlme_1) - vdiffr::expect_doppelganger("mixed model fit for nlme object", plot_biphasic_nlme) - plot_biphasic_saem_s <- function() plot(f_uba_dfop_sfo_saem) vdiffr::expect_doppelganger("mixed model fit for saem object with saemix transformations", plot_biphasic_saem_s) skip_on_travis() + plot_biphasic_nlme <- function() plot(dfop_nlme_1) + vdiffr::expect_doppelganger("mixed model fit for nlme object", plot_biphasic_nlme) + #plot_biphasic_mmkin <- function() plot(mixed(mmkin_biphasic)) # Biphasic fits with lots of data and fits have lots of potential for differences plot_biphasic_nlme <- function() plot(nlme_biphasic) |