fix(?) .checkFilterVariables() + unit tests

rformassspectrometry · Apr 11, 2024 · 9b0cda1 · 9b0cda1
1 parent 1be8767
commit 9b0cda1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/R/QFeatures-filter.R b/R/QFeatures-filter.R
@@ -370,10 +370,14 @@ filterFeaturesWithFormula <- function(object, filter, i,
     ## 2 in .local()
     ## 3 in filterFeatures()
     ## 4 in environment the function was called
-    vars <- vars[!vars %in% ls(envir = parent.frame(4))]
-    if (!length(vars))
-        stop("No vars left")
-    ## Get in which assays each variable comes from
+    ##
+    ## BUT WHY? This fails when the user has a variable in their
+    ## working environment.
+    ##
+    ## vars <- vars[!vars %in% ls(envir = parent.frame(4))]
+    ## if (!length(vars))
+    ##     stop("No vars left")
+    ## get in which assays each variable comes from
     out <- sapply(colnames(rowdata), function(rdn) vars %in% rdn)
     if (!is.array(out)) out <- t(out)
     rownames(out) <- vars

diff --git a/tests/testthat/test_utils.R b/tests/testthat/test_utils.R
@@ -41,9 +41,6 @@ test_that(".checkFilterVariables works", {
     expect_error(.checkFilterVariables(rd, "v"),
                  "'v' is/are absent from all rowData.")
     w <- 1
-    ## This one fails when run interactively
-    ## expect_error(.checkFilterVariables(rd, "w"),
-    ##              "No vars left")
-    expect_error(.checkFilterVariables(rd, "ww"),
-                 "'ww' is/are absent from all rowData.")
+    expect_error(.checkFilterVariables(rd, "w"),
+                 "'w' is/are absent from all rowData.")
 })