feat: simple test

upsetjs · Feb 9, 2021 · 58adc11 · 58adc11
1 parent b3dadd6
commit 58adc11
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -62,6 +62,12 @@ jobs:
         run: devtools::check('r_package', args = c("--no-manual", "--as-cran"), error_on = "error", check_dir = "check")
         shell: Rscript {0}
 
+      - name: Test
+        env:
+          _R_CHECK_CRAN_INCOMING_REMOTE_: false
+        run: devtools::test('r_package')
+        shell: Rscript {0}
+
       - name: Upload check results
         if: failure()
         uses: actions/upload-artifact@master

diff --git a/r_package/R/data.R b/r_package/R/data.R
@@ -194,10 +194,10 @@ fromList = function(upsetjs,
   else
     sorted_sets
 
-  gen = if (c_type == "none") list() else if (isVennDiagram(upsetjs) || isKarnaughMap(upsetjs)) {
+  gen = if (!is.null(c_type) && c_type == "none") list() else if (isVennDiagram(upsetjs) || isKarnaughMap(upsetjs)) {
     generateCombinationsImpl(
       gen_sets,
-      if_else(is.null(c_type), 'distinctIntersection', c_type),
+      ifelse(is.null(c_type), 'distinctIntersection', c_type),
       0,
       NULL,
       TRUE,
@@ -208,7 +208,7 @@ fromList = function(upsetjs,
   } else {
     generateCombinationsImpl(
       gen_sets,
-      if_else(is.null(c_type), 'intersection', c_type),
+      ifelse(is.null(c_type), 'intersection', c_type),
       0,
       NULL,
       FALSE,
@@ -437,10 +437,10 @@ fromDataFrame = function(upsetjs,
 
   elems = rownames(df)
 
-  gen = if (c_type == "none") list() else if (isVennDiagram(upsetjs) || isKarnaughMap(upsetjs)) {
+  gen = if (!is.null(c_type) && c_type == "none") list() else if (isVennDiagram(upsetjs) || isKarnaughMap(upsetjs)) {
     generateCombinationsImpl(
       gen_sets,
-      if_else(is.null(c_type), 'distinctIntersection', c_type),
+      ifelse(is.null(c_type), 'distinctIntersection', c_type),
       0,
       NULL,
       TRUE,
@@ -451,7 +451,7 @@ fromDataFrame = function(upsetjs,
   } else {
     generateCombinationsImpl(
       gen_sets,
-      if_else(is.null(c_type), 'intersection', c_type),
+      ifelse(is.null(c_type), 'intersection', c_type),
       0,
       NULL,
       FALSE,

diff --git a/r_package/tests/testthat/test-data.R b/r_package/tests/testthat/test-data.R
@@ -1,3 +1,20 @@
-test_that("multiplication works", {
-  expect_equal(2 * 2, 4)
+upsetjs_mock = function() {
+  x = structure(list(mode = 'hover',
+                     sets = c()))
+
+  r = list(
+    x=x,
+    package = 'upsetjs'
+  )
+  class(r) = c(class(r), 'upsetjs_common', 'upsetjs_upset')
+  r
+}
+
+
+test_that("fromList", {
+  listInput <- list(one = c('a', 'b', 'c', 'e', 'g', 'h', 'k', 'l', 'm'), two = c('a', 'b', 'd', 'e', 'j'), three = c('a', 'e', 'f', 'g', 'h', 'i', 'j', 'l', 'm'))
+
+  sets <- upsetjs_mock() %>% fromList(listInput) %>% getSets()
+  expect_equal(length(sets), 0)
+  expect_equal(2, 2)
 })