smoothing the new tests

tests/testthat/test-leaf_kaplan.R

@@ -6,11 +6,13 @@
 #' @srrstats {G5.5} *Correctness tests are run with a fixed random seed*
 set.seed(329)
 
+flc <- flc[flc$status==1, ]
+
 weights <- sample(1:5, nrow(flc), replace = TRUE)
 
 # fit a normal tree with no bootstrap weights
 fit <- orsf(flc,
-            futime + death ~ .,
+            time + status ~ .,
             n_tree = 1,
             weights = weights,
             tree_seeds = 1,
@@ -27,7 +29,7 @@ fit <- orsf(flc,
 aorsf_surv <- fit$forest$leaf_pred_prob[[1]][[1]]
 aorsf_time <- fit$forest$leaf_pred_indx[[1]][[1]]
 
-kap <- survfit(Surv(futime, death) ~ 1, data = flc, weights = weights)
+kap <- survfit(Surv(time, status) ~ 1, data = flc, weights = weights)
 
 test_that(
  desc = 'aorsf kaplan has same time values as survfit',

tests/testthat/test-orsf_formula.R

@@ -68,7 +68,7 @@ test_that(
   # keeps unique names
   expect_equal(x_vars, get_names_x(fit_long))
   # is the same forest as standard
-  expect_equal_leaf_summary(fit_long, fit_standard)
+  expect_equal_leaf_summary(fit_long, fit_standard_pbc)
 
  }
 )
@@ -95,7 +95,7 @@ test_that(
   )
 
   # different formula but same as standard forest
-  expect_equal_leaf_summary(fit_surv, fit_standard)
+  expect_equal_leaf_summary(fit_surv, fit_standard_pbc)
  }
 )
 
@@ -111,7 +111,7 @@ test_that(
                               n_tree = 10,
                               tree_seeds = seeds_standard)
 
-  expect_equal_leaf_summary(fit_status_modified, fit_standard)
+  expect_equal_leaf_summary(fit_status_modified, fit_standard_pbc)
 
   expect_error(
    orsf(pbc_orsf, Surv(status, time) ~ . - id),

tests/testthat/test-orsf_vi.R

@@ -140,6 +140,8 @@ test_that(
  desc = 'informative errors for custom functions',
  code = {
 
+  fit_no_vi <- orsf(pbc_vi, formula, importance = 'none', n_tree = 1)
+
   expect_error(
    orsf_vi_anova(object = 'nope'),
    regexp = 'inherit'