fix test

R/clonalCompare.R

@@ -102,12 +102,13 @@ clonalCompare <- function(input.data,
   }
 
   compareColname <- ifelse(proportion, "Proportion", "Count")
+  normalizer <- ifelse(proportion, sum, length)
 
   Con.df <- input.data %>%
     purrr::imap(function(df, columnNames) {
       tbl <- as.data.frame(table(df[, cloneCall]))
       if (proportion) {
-        tbl[, 2] <- tbl[, 2] / sum(tbl[, 2])
+        tbl[, 2] <- tbl[, 2] / normalizer(tbl[, 2])
       }
       colnames(tbl) <- c("clones", compareColname)
       tbl$Sample <- columnNames

tests/testthat/test-clonalCompare.R

@@ -68,12 +68,28 @@ test_that("clonalCompare works with exportTable and prop FALSE", {
     )
   }
 
-  clonalCompareCountConvertedToProp <- getClonalCompareRes(FALSE) %>%
-    dplyr::mutate(Count = Count / length(Count)) %>% #FIXME this is wrong
-    dplyr::rename(Proportion = Count)
+  countCompareRes <- getClonalCompareRes(prop = FALSE)
+  propCompareRes <- getClonalCompareRes(prop = TRUE)
 
   expect_identical(
-    getClonalCompareRes(TRUE),
-    clonalCompareCountConvertedToProp
+    countCompareRes %>% dplyr::select(-Count),
+    propCompareRes %>% dplyr::select(-Proportion)
+  )
+
+  fullJoined <- getClonalCompareRes(FALSE) %>%
+    dplyr::full_join(
+      getClonalCompareRes(TRUE)
+    )
+
+  expect_setequal(
+    colnames(fullJoined),
+    c("clones", "Count", "original.clones", "Proportion", "Sample")
+  )
+
+  countPropFactor <- fullJoined$Count / fullJoined$Proportion
+
+  expect_identical(
+    as.integer(fullJoined$Count - fullJoined$Proportion * countPropFactor),
+    integer(nrow(fullJoined))
   )
 })