Skip to content

Commit 37dbf05

Browse files
committed
FindAllMarkers still uses 'slot' even in v5
1 parent c2c6dd4 commit 37dbf05

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

tests/testthat/test-prioritization.R

+10-3
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,21 @@ test_that("Wrapper function for seurat", {
7878
expect_true(nrow(tmp2$lr_condition_de) < nrow(tmp$lr_condition_de))
7979
expect_identical(tmp2$sender_receiver_info, tmp$sender_receiver_info)
8080

81-
# Change slot for package version < 5
82-
slot_name <- ifelse(as.numeric(substr(packageVersion("Seurat"), 1, 1)) < 5, "slot", "layer")
81+
# Change slot if object is seurat obj v5
82+
# slot_name <- ifelse(as.numeric(substr(seurat_obj_test@version, 1, 1)) >= 5 & inherits(seurat_obj_test[["RNA"]], "Assay5"),
83+
# "layer", "slot")
84+
slot_name <- "slot"
8385

8486
tmp3 <- do.call(generate_info_tables, replace(generate_info_tables_args, slot_name, "counts"))
8587

8688
# tmp3 should have different values for p_val_ligand, lfc_ligand, average values, and lr_condition_de
8789
expect_false(isTRUE(all.equal(tmp$sender_receiver_de$p_val_receptor, tmp3$sender_receiver_de$p_val_receptor)))
88-
expect_false(isTRUE(all.equal(tmp$sender_receiver_de$lfc_receptor, tmp3$sender_receiver_de$lfc_receptor)))
90+
# LFC remains the same for v5
91+
if (grepl("^5", packageVersion("Seurat")) & grepl("^5", seurat_obj_test@version)){
92+
expect_true(isTRUE(all.equal(tmp$sender_receiver_de$lfc_receptor, tmp3$sender_receiver_de$lfc_receptor)))
93+
} else {
94+
expect_false(isTRUE(all.equal(tmp$sender_receiver_de$lfc_receptor, tmp3$sender_receiver_de$lfc_receptor)))
95+
}
8996
expect_false(isTRUE(all.equal(tmp$sender_receiver_info$avg_ligand, tmp3$sender_receiver_info$avg_ligand)))
9097
expect_false(isTRUE(all.equal(tmp$lr_condition_de$p_val_receptor, tmp3$lr_condition_de$p_val_receptor)))
9198

0 commit comments

Comments
 (0)