Merge pull request #32 from zktuong/qol_update

Qol update
zktuong · Mar 22, 2022 · 85ecc9e · 85ecc9e
2 parents 33e787a + 3ce7730
commit 85ecc9e
Show file tree

Hide file tree

Showing 7 changed files with 676 additions and 565 deletions.
diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml
@@ -1,12 +1,14 @@
 name: R
 
 on:
+  pull_request:
+    branches:
+      - "*"
   push:
     branches:
       - "master"
-  pull_request:
-    branches:
       - "*"
+
 
 env:
   cache-version: 'cache-v1'

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: ktplots
 Title: Plot single-cell data dotplots
-Version: 1.1.17
+Version: 1.1.18
 Authors@R: person("Kelvin", "Tuong", email = c("[email protected]", "[email protected]", "[email protected]"), role = c("aut", "cre"))
 Description: Plotting tools for scData.
 License: MIT

diff --git a/R/plot_cpdb.R b/R/plot_cpdb.R
diff --git a/R/plot_cpdb2.R b/R/plot_cpdb2.R
diff --git a/man/plot_cpdb.Rd b/man/plot_cpdb.Rd
diff --git a/man/plot_cpdb2.Rd b/man/plot_cpdb2.Rd
diff --git a/tests/testthat/test_cpdbplot1.R b/tests/testthat/test_cpdbplot1.R
@@ -12,6 +12,22 @@ test_that("plot_cpdb works 2",{
     expect_true(is.ggplot(p))
 })
 
+test_that("plot_cpdb works 3",{
+    p <- plot_cpdb("B cell", "CD4T cell", kidneyimmune, 'celltype', means, pvals, split.by = "Experiment", gene.family = 'chemokines', verbose = FALSE, default_style = FALSE)
+    expect_true(is.ggplot(p))
+})
+
+test_that("plot_cpdb works 4",{
+    p <- plot_cpdb("B cell", "B cell", kidneyimmune, 'celltype', means, pvals, split.by = "Experiment", gene.family = 'chemokines', verbose = FALSE)
+    expect_true(is.ggplot(p))
+})
+
+test_that("plot_cpdb works 5",{
+    p <- plot_cpdb("B cell", "cell", kidneyimmune, 'celltype', means, pvals, split.by = "Experiment", gene.family = 'chemokines', verbose = FALSE, default_style = FALSE, p.adjust.method = 'BH')
+    expect_true(is.ggplot(p))
+})
+
+
 test_that("werid characters are ok", {
     # edit the example objects to simulate Rachel's objects
     # rename B cells to TRC+