Merge branch 'master' of github.com:hadley/ggplot2

Author: hadley

R/facet-wrap.r

@@ -345,22 +345,32 @@ facet_strips.wrap <- function(facet, panel, theme) {
 
   # Adding labels metadata, useful for labellers
   attr(labels_df, "facet") <- "wrap"
-  if (!is.null(facet$switch) && facet$switch == "x") {
+  if (is.null(facet$switch) || facet$switch == "x") {
     dir <- "b"
     attr(labels_df, "type") <- "rows"
   } else {
-    dir <- "t"
+    dir <- "l"
     attr(labels_df, "type") <- "cols"
   }
 
   strips_table <- build_strip(panel, labels_df, facet$labeller,
     theme, dir, switch = facet$switch)
 
   # While grid facetting works with a whole gtable, wrap processes the
-  # columns separately. So we turn the gtable into a list of columns
-  strips <- list(t = vector("list", ncol(strips_table)))
+  # strips separately. So we turn the gtable into a list
+  if (dir == "b") {
+    n_strips <- ncol(strips_table)
+  }  else {
+    n_strips <- nrow(strips_table)
+  }
+
+  strips <- list(t = vector("list", n_strips))
   for (i in seq_along(strips$t)) {
-    strips$t[[i]] <- strips_table[, i]
+    if (dir == "b") {
+      strips$t[[i]] <- strips_table[, i]
+    } else {
+      strips$t[[i]] <- strips_table[i, ]
+    }
   }
   strips
 }

tests/testthat/test-facet-strips.r

@@ -0,0 +1,112 @@
+context("Facet Strips")
+
+strip_layout <- function(p) {
+  data <- ggplot_build(p)
+  plot <- data$plot
+  panel <- data$panel
+  data <- data$data
+  theme <- plot_theme(plot)
+
+  geom_grobs <- Map(function(l, d) l$draw_geom(d, panel, plot$coordinates),
+    plot$layers, data)
+
+  facet <- facet_render(plot$facet, panel, plot$coordinates, theme, geom_grobs)
+  layout <- facet$layout
+  strip_layout <- layout[grepl("^strip", layout$name), 1:4]
+  as.list(strip_layout)
+}
+
+p <- ggplot(mtcars, aes(disp, drat)) + geom_point()
+
+
+test_that("facet_wrap() builds correct output", {
+  wrap <- p + facet_wrap(~cyl)
+
+  wrap_expected <- list(
+    t = c(1, 1, 1),
+    l = c(2, 5, 8),
+    b = c(1, 1, 1),
+    r = c(2, 5, 8)
+  )
+
+  expect_equal(strip_layout(wrap), wrap_expected)
+})
+
+test_that("facet_wrap() switches to 'x'", {
+  wrap_x <- p + facet_wrap(~cyl, switch = "x")
+
+  wrap_x_expected <- list(
+    t = c(3, 3, 3),
+    l = c(2, 5, 8),
+    b = c(3, 3, 3),
+    r = c(2, 5, 8)
+  )
+
+  expect_equal(strip_layout(wrap_x), wrap_x_expected)
+})
+
+test_that("facet_wrap() switches to 'y'", {
+  wrap_y <- p + facet_wrap(~cyl, switch = "y")
+
+  wrap_y_expected <- list(
+    t = c(1, 1, 1),
+    l = c(1, 5, 9),
+    b = c(1, 1, 1),
+    r = c(1, 5, 9)
+  )
+
+  expect_equal(strip_layout(wrap_y), wrap_y_expected)
+})
+
+
+test_that("facet_grid() builds correct output", {
+  grid <- p + facet_grid(~cyl)
+
+  grid_expected <- list(
+    t = c(1, 1, 1),
+    l = c(2, 4, 6),
+    b = c(1, 1, 1),
+    r = c(2, 4, 6)
+  )
+
+  expect_equal(strip_layout(grid), grid_expected)
+})
+
+test_that("facet_grid() switches to 'x'", {
+  grid_x <- p + facet_grid(am ~ cyl, switch = "x")
+
+  grid_x_expected <- list(
+    t = c(1, 3, 5),
+    l = c(7, 7, 2),
+    b = c(1, 3, 6),
+    r = c(7, 7, 6)
+  )
+
+  expect_equal(strip_layout(grid_x), grid_x_expected)
+})
+
+test_that("facet_grid() switches to 'y'", {
+  grid_y <- p + facet_grid(am ~ cyl, switch = "y")
+
+  grid_y_expected <- list(
+    t = c(1, 1, 1, 2),
+    l = c(4, 6, 8, 1),
+    b = c(1, 1, 1, 4),
+    r = c(4, 6, 8, 2)
+  )
+
+  expect_equal(strip_layout(grid_y), grid_y_expected)
+})
+
+test_that("facet_grid() switches to both 'x' and 'y'", {
+  grid_xy <- p + facet_grid(am ~ cyl, switch = "both")
+
+  grid_xy_expected <- list(
+    t = c(1, 5),
+    l = c(1, 4),
+    b = c(3, 6),
+    r = c(2, 8)
+  )
+
+  expect_equal(strip_layout(grid_xy), grid_xy_expected)
+})