Update tests due to ropensci/babette#108

ropensci · Jan 4, 2025 · 3d04000 · 3d04000
1 parent 8eb8b1c
commit 3d04000
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 10 deletions.
diff --git a/R/check_inference_model.R b/R/check_inference_model.R
@@ -74,7 +74,7 @@ check_inference_model <- function(
     }
   )
   if (!is_one_na(inference_model$tipdates_filename)) {
-    check_string(inference_model$tipdates_filename)
+    check_string(inference_model$tipdates_filename, allow_na = TRUE)
     if (!file.exists(inference_model$tipdates_filename)) {
       stop(
         "Tipdating filename not found at path '",

diff --git a/tests/testthat/test-get_inference_model_filenames.R b/tests/testthat/test-get_inference_model_filenames.R
@@ -4,15 +4,16 @@ test_that("use, all three filenames", {
   inference_model$mcmc$tracelog$filename <- "/home/john/trace.log"
   inference_model$mcmc$screenlog$filename <- "/home/john/screen.log"
   inference_model$mcmc$treelog$filename <- "/home/john/tree.log"
-  inference_model$tipdates_filename <- "/home/john/tipdate.csv"
+  inference_model$tipdates_filename <- get_beautier_path(
+    "babette_issue_108_tipdates.txt"
+  )
 
   filenames <- get_inference_model_filenames(inference_model)
 
   expect_true("/home/john/trace.log" %in% filenames)
   expect_true("/home/john/screen.log" %in% filenames)
   expect_true("/home/john/tree.log" %in% filenames)
-  expect_true("/home/john/tipdate.csv" %in% filenames)
-
+  expect_true(inference_model$tipdates_filename %in% filenames)
 })
 
 test_that("no tipdates filename", {

diff --git a/tests/testthat/test-rename_inference_model_files.R b/tests/testthat/test-rename_inference_model_files.R
@@ -4,7 +4,9 @@ test_that("replace dir from local to folder", {
   inference_model$mcmc$tracelog$filename <- "trace.log"
   inference_model$mcmc$screenlog$filename <- "screen.log"
   inference_model$mcmc$treelog$filename <- "tree.log"
-  inference_model$tipdates_filename <- "tipdates.csv"
+  inference_model$tipdates_filename <- get_beautier_path(
+    "babette_issue_108_tipdates.txt"
+  )
 
   inference_model <- rename_inference_model_filenames(
     inference_model = inference_model,
@@ -16,7 +18,10 @@ test_that("replace dir from local to folder", {
     inference_model$mcmc$screenlog$filename, "/home/john/screen.log"
   )
   expect_equal(inference_model$mcmc$treelog$filename, "/home/john/tree.log")
-  expect_equal(inference_model$tipdates_filename, "/home/john/tipdates.csv")
+  expect_equal(
+    inference_model$tipdates_filename,
+    "/home/john/babette_issue_108_tipdates.txt"
+  )
 })
 
 test_that("rename dir from folder to folder", {
@@ -25,7 +30,9 @@ test_that("rename dir from folder to folder", {
   inference_model$mcmc$tracelog$filename <- "/home/john/trace.log"
   inference_model$mcmc$screenlog$filename <- "/home/john/screen.log"
   inference_model$mcmc$treelog$filename <- "/home/john/tree.log"
-  inference_model$tipdates_filename <- "/home/john/tipdates.csv"
+  inference_model$tipdates_filename <- get_beautier_path(
+    "babette_issue_108_tipdates.txt"
+  )
 
   inference_model <- rename_inference_model_filenames(
     inference_model = inference_model,
@@ -35,7 +42,10 @@ test_that("rename dir from folder to folder", {
   expect_equal(inference_model$mcmc$tracelog$filename, "/home/doe/trace.log")
   expect_equal(inference_model$mcmc$screenlog$filename, "/home/doe/screen.log")
   expect_equal(inference_model$mcmc$treelog$filename, "/home/doe/tree.log")
-  expect_equal(inference_model$tipdates_filename, "/home/doe/tipdates.csv")
+  expect_equal(
+    inference_model$tipdates_filename,
+    "/home/doe/babette_issue_108_tipdates.txt"
+  )
 })
 
 
@@ -45,7 +55,9 @@ test_that("remove dir", {
   inference_model$mcmc$tracelog$filename <- "/home/john/trace.log"
   inference_model$mcmc$screenlog$filename <- "/home/john/screen.log"
   inference_model$mcmc$treelog$filename <- "/home/john/tree.log"
-  inference_model$tipdates_filename <- "/home/john/tipdates.csv"
+  inference_model$tipdates_filename <- get_beautier_path(
+    "babette_issue_108_tipdates.txt"
+  )
 
   inference_model <- rename_inference_model_filenames(
     inference_model = inference_model,
@@ -55,7 +67,10 @@ test_that("remove dir", {
   expect_equal(inference_model$mcmc$tracelog$filename, "trace.log")
   expect_equal(inference_model$mcmc$screenlog$filename, "screen.log")
   expect_equal(inference_model$mcmc$treelog$filename, "tree.log")
-  expect_equal(inference_model$tipdates_filename, "tipdates.csv")
+  expect_equal(
+    inference_model$tipdates_filename,
+    "babette_issue_108_tipdates.txt"
+  )
 })
 
 test_that("use", {