Merge branch 'fix-tests' into dev

ocbe-uio · Oct 4, 2023 · 008d38c · 008d38c
2 parents 9a7a4af + bcaa9cd
commit 008d38c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: DIscBIO
 Date: 2021-04-28
 Title: A User-Friendly Pipeline for Biomarker Discovery in Single-Cell Transcriptomics
-Version: 1.2.0.9000
+Version: 1.2.0.9001
 Authors@R:
 	c(
 		person(

diff --git a/tests/testthat/test-DIscBIO-CTCs-Binder-Part1.R b/tests/testthat/test-DIscBIO-CTCs-Binder-Part1.R
@@ -1,10 +1,8 @@
 context("Binder tests, part 1")
 
 # Defining the relative path to current inst -----------------------------------
-notebook_data_path <- system.file("notebook", package = "DIscBIO") # FIXME: passes test() but not check()
-print(notebook_data_path)#TEMP
+notebook_data_path <- system.file("notebook", package = "DIscBIO")
 if (notebook_data_path == "") {
-	print(getwd())#TEMP
 	notebook_data_path <- "../notebook"
 }
 FileName <- "CTCdataset"

diff --git a/tests/testthat/test-DIscBIO-CTCs-Binder-Part2.R b/tests/testthat/test-DIscBIO-CTCs-Binder-Part2.R
@@ -108,6 +108,8 @@ ppi <- suppressMessages(PPI(data))
 networking <- suppressMessages(NetAnalysis(ppi))
 
 test_that("Networks", {
-	expect_equal(dim(ppi), c(922, 13))
-	expect_equal(dim(networking), c(167, 3))
+	expect_gt(nrow(ppi), 1000)
+	expect_equal(ncol(ppi), 13)
+	expect_gt(nrow(networking), 150)
+	expect_equal(ncol(networking), 3)
 })