add another check for data_lst unique class

phipsonlab · Nov 13, 2024 · 24c8975 · 24c8975
1 parent 861773a
commit 24c8975
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/R/create_genesets.R b/R/create_genesets.R
@@ -50,8 +50,8 @@ length 2 for hexagon bins")
         stop("Input bin_type is not supported. Supported bin_type is 
 rectangle/square or hexagon.")
     }
-
-    if (length(unique(vapply(data_lst,class,FUN.VALUE = character(1)))) != 1) {
+    if (length(unique(vapply(data_lst, function(x) class(x)[1],
+                FUN.VALUE = character(1)))) != 1) {
         stop("The input data_lst contains elements from multiple classes")
     }
     if (length(names(data_lst)) == 0){

diff --git a/tests/testthat/test-create_genesets.R b/tests/testthat/test-create_genesets.R
@@ -47,6 +47,12 @@ expect_error(create_genesets(data_lst=list("a" = trans, "b" = list()),
                              bin_param=c(2,2),cluster_info = NULL,
                              w_x=c(0,25), w_y=c(0,25)))
 
+expect_error(create_genesets(data_lst=list("a" = as.matrix(trans), 
+                                           "b" = as.data.frame(trans)),
+                             name_lst=list(dummy_W=c("A")),
+                             bin_type="square",
+                             bin_param=c(2,2),cluster_info = NULL,
+                             w_x=c(0,25), w_y=c(0,25)))
 expect_error(create_genesets(data_lst= list(trans),
                              name_lst=list(dummy_W=c("A")),
                              bin_type="square",