From 0c18f5de9b2f948d0b5e22a3b3deed16d64d8006 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Tue, 1 Nov 2022 10:39:29 +0100 Subject: Fix illparms tests --- tests/testthat/test_mhmkin.R | 2 +- tests/testthat/test_saemix_parent.R | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/testthat') diff --git a/tests/testthat/test_mhmkin.R b/tests/testthat/test_mhmkin.R index 72b81fec..9fd29c50 100644 --- a/tests/testthat/test_mhmkin.R +++ b/tests/testthat/test_mhmkin.R @@ -24,7 +24,7 @@ test_that("Multiple hierarchical kinetic models can be fitted and diagnosed", { hfit_sfo_tc <- update(hfits[["SFO", "tc"]], covariance.model = diag(c(0, 1))) - expect_equal(illparms(hfit_sfo_tc), character(0)) + expect_equal(as.character(illparms(hfit_sfo_tc)), character(0)) expect_silent(print(illparms(hfit_sfo_tc))) test_summary <- summary(hfit_sfo_tc) diff --git a/tests/testthat/test_saemix_parent.R b/tests/testthat/test_saemix_parent.R index e7574b01..79c5fa69 100644 --- a/tests/testthat/test_saemix_parent.R +++ b/tests/testthat/test_saemix_parent.R @@ -9,9 +9,9 @@ test_that("Parent fits using saemix are correctly implemented", { # mmkin_sfo_1 was generated in the setup script # We did not introduce variance of parent_0 in the data generation # This is correctly detected - expect_equal(illparms(sfo_saem_1), "sd(parent_0)") + expect_equal(as.character(illparms(sfo_saem_1)), "sd(parent_0)") # So we have also done a fit without this variance - expect_equal(illparms(sfo_saem_1_reduced), character(0)) + expect_equal(as.character(illparms(sfo_saem_1_reduced)), character(0)) expect_silent(print(illparms(sfo_saem_1_reduced))) # We cannot currently do the fit with completely fixed initial values @@ -22,7 +22,7 @@ test_that("Parent fits using saemix are correctly implemented", { expect_error(update(mmkin_sfo_1, models = c("SFOOO")), "Please supply models.*") sfo_saem_1_mkin <- saem(mmkin_sfo_1, quiet = TRUE, transformations = "mkin") - expect_equal(illparms(sfo_saem_1_mkin), "sd(parent_0)") + expect_equal(as.character(illparms(sfo_saem_1_mkin)), "sd(parent_0)") sfo_saem_1_reduced_mkin <- update(sfo_saem_1_mkin, no_random_effect = "parent_0") # The endpoints obtained do not depend on the transformation -- cgit v1.2.1