Cleaned up teardown

Author: VisruthSK

tests/testthat/helper-custom-expectations.R

@@ -15,7 +15,7 @@ expect_compilation <- function(mod, ...) {
   if(length(mod$exe_file()) == 0 || !file.exists(mod$exe_file())) {
     fail(sprint("Model executable '%s' does not exist after compilation.", mod$exe_file()))
   }
-  if(!is.null(before_mtime) && mtime_check_enabled) {
+  if(!is.null(before_mtime)) {
     after_mtime <- file.mtime(mod$exe_file())
     expect_gt(
       after_mtime,
@@ -135,43 +135,3 @@ expect_equal_ignore_order <- function(object, expected, ...) {
 }
 
 expect_not_true <- function(...) expect_false(isTRUE(...))
-
-transform_print_snapshot <- function(x) {
-  vapply(x, function(line) {
-    line <- trimws(line)
-    if (!nzchar(line)) {
-      return(line)
-    }
-    if (grepl("^variable\\b", line)) {
-      return(gsub("\\s+", " ", line))
-    }
-    if (grepl("^# showing", line) ||
-        grepl("^Can't find the following variable\\(s\\):", line)) {
-      return(line)
-    }
-    sub("\\s+.*$", "", line)
-  }, character(1))
-}
-
-transform_unix_toolchain_snapshot <- function(x) {
-  x <- gsub("A suitable C\\+\\+ compiler was not found\\..*", "C++ compiler missing.", x)
-  x <- gsub("A C\\+\\+ compiler was not found\\..*", "C++ compiler missing.", x)
-  gsub("The 'make' tool was not found\\..*", "make missing.", x)
-}
-
-transform_r_version_snapshot <- function(x) {
-  x <- gsub("Rtools[0-9]+", "Rtools<version>", x)
-  gsub("R version [0-9]+\\.[0-9]+\\.[0-9]+", "R version <version>", x)
-}
-
-capture_print_snapshot <- function(code) {
-  code <- substitute(code)
-  value <- NULL
-  lines <- utils::capture.output(
-    value <- rlang::eval_bare(code, parent.frame())
-  )
-  list(
-    value = value,
-    lines = transform_print_snapshot(lines)
-  )
-}

tests/testthat/helper-models.R

@@ -1,12 +1,3 @@
-local({
-  stan_files <- dir(test_path("resources", "stan"), pattern = "\\.stan$", full.names = TRUE)
-  exe_files <- cmdstanr:::cmdstan_ext(cmdstanr:::strip_ext(stan_files))
-  existing_exe_files <- exe_files[file.exists(exe_files)]
-  if (length(existing_exe_files) > 0) {
-    unlink(existing_exe_files, force = TRUE)
-  }
-})
-
 testing_data <- function(name) {
   if (file.exists(test_path("resources", "data", paste0(name, ".data.rds")))) {
     readRDS(test_path("resources", "data", paste0(name, ".data.rds")))

tests/testthat/setup.R

@@ -0,0 +1,17 @@
+cleanup_stan_artifacts <- function() {
+  all_files_in_stan <- list.files(
+    test_path("resources", "stan"),
+    full.names = TRUE,
+    recursive = TRUE
+  )
+  files_to_remove <- all_files_in_stan[!grepl("\\.stan$", all_files_in_stan)]
+
+  if (length(files_to_remove) > 0) {
+    unlink(files_to_remove, force = TRUE)
+  }
+
+  invisible(files_to_remove)
+}
+
+cleanup_stan_artifacts()
+withr::defer(cleanup_stan_artifacts(), testthat::teardown_env())