Merge remote-tracking branch 'origin/rel-6.4.435'

Author: Crunch.io Jenkins Account

R/cube-collapse-dimensions.R

@@ -64,19 +64,18 @@ dimSums <- function(x, margin = NULL) {
 
 only_count_cube <- function(cube) {
     # ensure that the cube is a counts cube
-    # TODO: this should be made more robust by parsing the ZCL from the
-    # expression instead of reaching inside
-    measures <- cube@.Data[[1]]$measures
-    measures_types <- lapply(measures, function(x) {
-        return(x[["function"]])
-    })
-
-    noncounts <- setdiff(measures_types, c("cube_count"))
+    measure_types <- vapply(
+        names(cube@arrays),
+        function(measure) cubeMeasureType(cube, measure),
+        character(1)
+    )
+
+    noncounts <- setdiff(measure_types, c("count", ".unweighted_counts"))
     if (length(noncounts) > 0) {
         msg <- c(
             "You can't use CrunchCubes with measures other than count. ",
             "The cube you provided included measures: ",
-            serialPaste(noncounts)
+            serialPaste(sort(noncounts))
         )
         halt(msg)
     }

tests/testthat/test-cube-collapse-dimensions.R

@@ -187,7 +187,7 @@ test_that("dimSums() prevents use with non-count cubes", {
         dimSums(mean_cube, 1),
         paste0(
             "You can't use CrunchCubes with measures other than count. ",
-            "The cube you provided included measures: cube_mean"
+            "The cube you provided included measures: mean"
         )
     )
 })
@@ -207,7 +207,7 @@ test_that("only_cube_count() prevents use with non-count cubes", {
         only_count_cube(mean_cube),
         paste0(
             "You can't use CrunchCubes with measures other than count. ",
-            "The cube you provided included measures: cube_mean"
+            "The cube you provided included measures: mean"
         )
     )
 })
@@ -281,13 +281,13 @@ with_test_authentication({
         )
     })
 
-    test_that("only_cube_count() prevents use with non-count cubes", {
+    test_that("only_count_cube() prevents use with non-count cubes", {
         multi_measures <- crtabs(list(mean(ndogs), max(ndogs)) ~ allpets + q1, data = ds)
         expect_error(
             only_count_cube(multi_measures),
             paste0(
                 "You can't use CrunchCubes with measures other than count. ",
-                "The cube you provided included measures: cube_max and cube_mean"
+                "The cube you provided included measures: max and mean"
             )
         )
     })

tests/testthat/test-cube-index-table.R

@@ -128,7 +128,7 @@ test_that("index.table validation", {
         index.table(mean_cube, 1),
         paste0(
             "You can't use CrunchCubes with measures other than count. ",
-            "The cube you provided included measures: cube_mean"
+            "The cube you provided included measures: mean"
         )
     )
 })

tests/testthat/test-decks.R

@@ -1067,12 +1067,12 @@ with_test_authentication({
         settings <- displaySettings(analysis)
         expect_is(settings, "list")
         expect_equal(
-            names(settings),
-            c(
+            sort(names(settings)),
+            sort(c(
                 "percentageDirection", "showEmpty", "showMean", "vizType",
                 "countsOrPercents", "decimalPlaces", "populationMagnitude",
                 "showSignif", "currentTab", "uiView"
-            )
+            ))
         )
         expect_equal(settings$countsOrPercents, "percent")
         settings$countsOrPercents <- "count"

tests/testthat/test-export-dataset.R

@@ -182,7 +182,7 @@ with_test_authentication({
     test_that("Can download a csv of a dataset", {
         skip_on_local_backend("Vagrant host doesn't serve files correctly")
         filename <- tempfile()
-        exportDataset(ds, file = filename)
+        exportDataset(ds, file = filename, format = "csv")
         df2 <- read.csv(filename)
         validExport(df2)
     })