updated other tests with new data

RECETOX · Oct 30, 2024 · 2f295c0 · 2f295c0
1 parent c20e40b
commit 2f295c0
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 7 deletions.
diff --git a/tests/testthat/test-RecalFunctions.R b/tests/testthat/test-RecalFunctions.R
@@ -46,23 +46,24 @@ patrick::with_parameters_test_that("RecalList works",
     unambig <- readRDS(file.path("test-data", paste0(mode, "_cho_unambig.rds")))
 
     actual <- MFAssignR::RecalList(unambig)
+
     expected <- readRDS(expected_path)
 
     actual <- actual %>% dplyr::select(-"Series.Index")
     expected <- expected %>% dplyr::select(-"Series.Index")
     actual_sorted <- dplyr::arrange_at(actual, "Series")
     expected_sorted <- dplyr::arrange_at(expected, "Series")
-    
+
     expect_equal(actual_sorted, expected_sorted)
   },
   mode = c("neg", "pos"),
 )
 
 test_that("Replicate the Recal bug", {
-  unambig <- read.delim("test-data/bug_unambig.tabular")
-  mono <- read.delim("test-data/bug_mono.tabular")
-  iso <- read.delim("test-data/bug_iso.tabular")
-  recallist <- read.delim("test-data/bug_recalseries.tabular")
+  unambig <- read.delim(file.path("test-data", "bug_unambig.tabular"))
+  mono <- read.delim(file.path("test-data", "bug_mono.tabular"))
+  iso <- read.delim(file.path("test-data", "bug_iso.tabular"))
+  recallist <- read.delim(file.path("test-data", "bug_recalseries.tabular"))
 
   actual <- MFAssignR::Recal(
       df = unambig,
@@ -80,7 +81,8 @@ test_that("Replicate the Recal bug", {
       mzRange = 50,
       CalPeak = 150
     )
-    expected <- readRDS("test-data/bug_recal_expected.rds")
+    expected_path <- file.path("test-data", "bug_recal_expected.rds")
+    expected <- readRDS(expected_path)
     expect_equal(actual, expected)
 })
 
@@ -102,7 +104,9 @@ patrick::with_parameters_test_that("Replicate Recal isopeaks error", {
       series5 = recallist$Series[5],
       mzRange = 80
     )
-    expected <- readRDS("test-data/recal_isopeaks.rds")
+    expected_path <- file.path("test-data", "recal_isopeaks.rds")
+
+    expected <- readRDS(expected_path)
 
     expect_equal(actual, expected)
 },

diff --git a/tests/testthat/test-data/bug_recal_expected.rds b/tests/testthat/test-data/bug_recal_expected.rds
diff --git a/tests/testthat/test-data/neg_recal_iso.rds b/tests/testthat/test-data/neg_recal_iso.rds
diff --git a/tests/testthat/test-data/neg_recal_mono.rds b/tests/testthat/test-data/neg_recal_mono.rds
diff --git a/tests/testthat/test-data/neg_recallist.rds b/tests/testthat/test-data/neg_recallist.rds
diff --git a/tests/testthat/test-data/pos_recal_iso.rds b/tests/testthat/test-data/pos_recal_iso.rds
diff --git a/tests/testthat/test-data/pos_recal_mono.rds b/tests/testthat/test-data/pos_recal_mono.rds
diff --git a/tests/testthat/test-data/recal_isopeaks.rds b/tests/testthat/test-data/recal_isopeaks.rds