Skip to content

Commit 7805e94

Browse files
committed
Update test_differential_expression.R
1 parent f4feb97 commit 7805e94

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

tests/testthat/test_differential_expression.R

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
# Tests for functions in differential_expression.R
2-
if (!identical(Sys.getenv("NOT_CRAN"), "true")) return()
3-
42
suppressWarnings(RNGversion(vstr = "3.5.3"))
53
set.seed(seed = 42)
64

@@ -18,6 +16,7 @@ results.sct <- suppressWarnings(FindMarkers(object = sct.obj, ident.1 = 0, ident
1816

1917

2018
test_that("Default settings work as expected with pseudocount = 1", {
19+
skip_on_cran()
2120
expect_error(FindMarkers(object = pbmc_small))
2221
expect_error(FindMarkers(object = pbmc_small, ident.1 = "test"))
2322
expect_error(FindMarkers(object = pbmc_small, ident.1 = 0, ident.2 = "test"))
@@ -62,6 +61,7 @@ tymp.results <- suppressWarnings(FindMarkers(object = pbmc_small, ident.1 = 0, f
6261
vargenes.results <- suppressWarnings(FindMarkers(object = pbmc_small, ident.1 = 0, features = VariableFeatures(object = pbmc_small), verbose = FALSE, base = exp(1),pseudocount.use = 1))
6362

6463
test_that("features parameter behaves correctly ", {
64+
skip_on_cran()
6565
expect_equal(nrow(x = tymp.results), 1)
6666
expect_equal(tymp.results[1, "p_val"], 3.227445e-07, tolerance = 1e-12)
6767
expect_equal(tymp.results[1, "avg_logFC"], -2.188179, tolerance = 1e-6)
@@ -82,6 +82,7 @@ test_that("features parameter behaves correctly ", {
8282

8383
results <- suppressWarnings(FindMarkers(object = pbmc_small, ident.1 = Cells(x = pbmc_small)[1:40], ident.2 = Cells(x = pbmc_small)[41:80], verbose = FALSE, base = exp(1),pseudocount.use = 1))
8484
test_that("passing cell names works", {
85+
skip_on_cran()
8586
expect_equal(nrow(x = results), 216)
8687
expect_equal(results[1, "p_val"], 0.0001690882)
8788
expect_equal(results[1, "avg_logFC"], -1.967123, tolerance = 1e-6)
@@ -95,6 +96,7 @@ results <- suppressWarnings(FindMarkers(object = pbmc_small, ident.1 = 0, ident.
9596
results.clr <- suppressWarnings(FindMarkers(object = clr.obj, ident.1 = 0, ident.2 = 1, verbose = FALSE, base = exp(1), pseudocount.use = 0.1))
9697
results.sct <- suppressWarnings(FindMarkers(object = sct.obj, ident.1 = 0, ident.2 = 1, verbose = FALSE, base = exp(1), pseudocount.use = 0.1, vst.flavor = "v1"))
9798
test_that("setting pseudocount.use works", {
99+
skip_on_cran()
98100
expect_equal(nrow(x = results), 222)
99101
expect_equal(results[1, "avg_logFC"], -2.640848, tolerance = 1e-6)
100102
expect_equal(nrow(x = results.clr), 214)
@@ -107,6 +109,7 @@ results <- suppressWarnings(FindMarkers(object = pbmc_small, ident.1 = 0, ident.
107109
results.clr <- suppressWarnings(FindMarkers(object = clr.obj, ident.1 = 0, ident.2 = 1, verbose = FALSE, base = exp(1), pseudocount.use = 1, mean.fxn = rowMeans))
108110
results.sct <- suppressWarnings(FindMarkers(object = sct.obj, ident.1 = 0, ident.2 = 1, verbose = FALSE, base = exp(1), pseudocount.use = 1, mean.fxn = rowMeans, vst.flaovr = "v1"))
109111
test_that("setting mean.fxn works", {
112+
skip_on_cran()
110113
expect_equal(nrow(x = results), 216)
111114
expect_equal(results[1, "avg_logFC"], -4.204346, tolerance = 1e-6)
112115
expect_equal(results.clr[1, "avg_logFC"], -1.353025, tolerance = 1e-6)
@@ -154,6 +157,7 @@ test_that("only.pos works", {
154157

155158
results <- suppressWarnings(FindMarkers(object = pbmc_small, ident.1 = 0, ident.2 = 1, max.cells.per.ident = 20, verbose = FALSE, base = exp(1),pseudocount.use = 1))
156159
test_that("max.cells.per.ident works", {
160+
skip_on_cran()
157161
expect_equal(nrow(x = results), 222)
158162
expect_equal(results[1, "p_val"], 3.428568e-08, tolerance = 1e-13)
159163
expect_equal(results[1, "avg_logFC"], -2.638242, tolerance = 1e-6)
@@ -182,6 +186,7 @@ Idents(object = t2) <- "groups"
182186
results2 <- suppressWarnings(FindMarkers(object = t2, ident.1 = "g1", ident.2 = "g2", verbose = FALSE, base = exp(1), pseudocount.use = 1))
183187

184188
test_that("group.by works", {
189+
skip_on_cran()
185190
expect_equal(nrow(x = results), 190)
186191
expect_equal(results, results2)
187192
expect_equal(results[1, "p_val"], 0.02870319)
@@ -198,6 +203,7 @@ Idents(object = t2) <- "groups"
198203
results2 <- suppressWarnings(FindMarkers(object = t2, ident.1 = "g1", ident.2 = "g2", verbose = FALSE, base = exp(1), pseudocount.use = 1))
199204

200205
test_that("subset.ident works", {
206+
skip_on_cran()
201207
expect_equal(nrow(x = results), 183)
202208
expect_equal(results, results2)
203209
expect_equal(results[1, "p_val"], 0.01293720)
@@ -210,6 +216,7 @@ test_that("subset.ident works", {
210216

211217
results <- suppressWarnings(FindMarkers(object = pbmc_small, ident.1 = 0, ident.2 = 1, reduction = "pca", verbose = FALSE, base = exp(1), pseudocount.use = 1))
212218
test_that("reduction works", {
219+
skip_on_cran()
213220
expect_equal(results[1, "p_val"], 1.664954e-10, tolerance = 1e-15)
214221
expect_equal(results[1, "avg_diff"], -2.810453669, tolerance = 1e-6)
215222
expect_equal(results[1, "p_val_adj"], 3.163412e-09, tolerance = 1e-14)
@@ -370,6 +377,7 @@ test_that("BPCells FindMarkers gives same results", {
370377
# -------------------------------------------------------------------------------
371378

372379
test_that("FindAllMarkers works as expected", {
380+
skip_on_cran()
373381
pbmc_copy <- pbmc_small
374382
Idents(pbmc_copy) <- "orig.ident"
375383

0 commit comments

Comments
 (0)