Update tests with gg2list return as figure

Author: mkcor

tests/testthat/test-cookbook-axes.R

@@ -8,14 +8,13 @@ expect_traces <- function(gg, n.traces, name){
   stopifnot(is.numeric(n.traces))
   save_outputs(gg, paste0("cookbook-axes-", name))
   L <- gg2list(gg)
-  is.trace <- names(L) == ""
-  all.traces <- L[is.trace]
+  all.traces <- L$data
   no.data <- sapply(all.traces, function(tr) {
     is.null(tr[["x"]]) && is.null(tr[["y"]])
   })
   has.data <- all.traces[!no.data]
   expect_equal(length(has.data), n.traces)
-  list(traces=has.data, kwargs=L$kwargs)
+  list(traces=has.data, layout=L$layout)
 }
 
 # Reverse the order of a discrete-valued axis
@@ -44,13 +43,13 @@ test_that("ylim hides points", {
 bp.scale.hide <- bp + scale_y_continuous(limits=c(5, 7.5))
 test_that("scale_y(limits) hides points", {
   info <- expect_traces(bp.scale.hide, 3, "scale.hide")
-  expect_equal(info$kwargs$layout$yaxis$range, c(5, 7.5))
+  expect_equal(info$layout$yaxis$range, c(5, 7.5))
 })
 
 bp.coord <- bp + coord_cartesian(ylim=c(5, 7.5))
 test_that("Using coord_cartesian zooms into the area", {
   info <- expect_traces(bp.coord, 3, "coord-ylim")
-  expect_equal(info$kwargs$layout$yaxis$range, c(5, 7.5))
+  expect_equal(info$layout$yaxis$range, c(5, 7.5))
 })
 
 # Create some noisy exponentially-distributed data
@@ -148,7 +147,7 @@ bp.fonts <- bp +
 
 test_that("element_text face, colour, size, angle, vjust, size", {
   info <- expect_traces(bp.fonts, 3, "fonts")
-  x <- info$kwargs$layout$xaxis
+  x <- info$layout$xaxis
   xtitle <- x[["titlefont"]]
   xtick <- x[["tickfont"]]
   expect_identical(xtitle$color, toRGB("#990000"))

tests/testthat/test-ggplot-abline.R

@@ -12,15 +12,15 @@ test_that("Second trace be the a-b line", {
 
   L <- gg2list(gg)
 
-  expect_equal(length(L), 3)
-  expect_true(L[[2]]$x[1] <= 0)
-  expect_true(L[[2]]$x[2] >= 3.5)
-  expect_identical(L[[2]]$mode, "lines")
-  expect_identical(L[[2]]$line$shape, "linear")
-  expect_equal(L[[2]]$line$width, 8)
+  expect_equal(length(L$data), 2)
+  expect_true(L$data[[2]]$x[1] <= 0)
+  expect_true(L$data[[2]]$x[2] >= 3.5)
+  expect_identical(L$data[[2]]$mode, "lines")
+  expect_identical(L$data[[2]]$line$shape, "linear")
+  expect_equal(L$data[[2]]$line$width, 8)
 
-  expect_identical(L[[1]]$showlegend, FALSE)
-  expect_identical(L[[2]]$showlegend, FALSE)
+  expect_identical(L$data[[1]]$showlegend, FALSE)
+  expect_identical(L$data[[2]]$showlegend, FALSE)
 
   save_outputs(gg, "abline")
 })

tests/testthat/test-ggplot-area.R

@@ -7,11 +7,11 @@ ar <- ggplot(huron) + geom_area(aes(x=year, y=level))
 L <- gg2list(ar)
 
 test_that("sanity check for geom_area", {
-  expect_equal(length(L), 2)
-  expect_identical(L[[1]]$type, "scatter")
-  expect_equal(L[[1]]$x, c(huron$year[1], huron$year, tail(huron$year, n=1)))
-  expect_equal(L[[1]]$y, c(0, huron$level, 0))
-  expect_identical(L[[1]]$line$color, "transparent")
+  expect_equal(length(L$data), 1)
+  expect_identical(L$data[[1]]$type, "scatter")
+  expect_equal(L$data[[1]]$x, c(huron$year[1], huron$year, tail(huron$year, n=1)))
+  expect_equal(L$data[[1]]$y, c(0, huron$level, 0))
+  expect_identical(L$data[[1]]$line$color, "transparent")
 })
 
 save_outputs(ar, "area")
@@ -21,8 +21,8 @@ gg <- ggplot(huron) + geom_area(aes(x=year, y=level), alpha=0.4)
 L <- gg2list(gg)
 
 test_that("transparency alpha in geom_area is converted", {
-  expect_identical(L[[1]]$line$color, "transparent")
-  expect_identical(L[[1]]$fillcolor, "rgba(51,51,51,0.4)")
+  expect_identical(L$data[[1]]$line$color, "transparent")
+  expect_identical(L$data[[1]]$fillcolor, "rgba(51,51,51,0.4)")
 })
 
 save_outputs(gg, "area-fillcolor")

tests/testthat/test-ggplot-bar.R

@@ -1,18 +1,17 @@
 context("bar")
 
-expect_traces <- function(gg, n.traces, name){
+expect_traces <- function(gg, n.traces, name) {
   stopifnot(is.ggplot(gg))
   stopifnot(is.numeric(n.traces))
   save_outputs(gg, paste0("bar-", name))
   L <- gg2list(gg)
-  is.trace <- names(L) == ""
-  all.traces <- L[is.trace]
+  all.traces <- L$data
   no.data <- sapply(all.traces, function(tr) {
     is.null(tr[["x"]]) && is.null(tr[["y"]])
   })
   has.data <- all.traces[!no.data]
   expect_equal(length(has.data), n.traces)
-  list(traces=has.data, kwargs=L$kwargs)
+  list(traces=has.data, layout=L$layout)
 }
 
 researchers <-
@@ -29,7 +28,7 @@ test_that("position_dodge is translated to barmode=group", {
   trs <- info$traces
   trace.names <- sapply(trs[1:2], "[[", "name")
   expect_true(all(c("Math", "Bio") %in% trace.names))
-  expect_identical(info$kwargs$layout$barmode, "group")
+  expect_identical(info$layout$barmode, "group")
   # Check x values
   expect_identical(as.character(trs[[1]]$x), c("Canada", "Germany"))
   expect_identical(as.character(trs[[2]]$x), c("Canada", "USA"))
@@ -41,7 +40,7 @@ test_that("position_stack is translated to barmode=stack", {
   trs <- info$traces
   trace.names <- sapply(trs[1:2], "[[", "name")
   expect_true(all(c("Math", "Bio") %in% trace.names))
-  expect_identical(info$kwargs$layout$barmode, "stack")
+  expect_identical(info$layout$barmode, "stack")
 })
 
 test_that("position_identity is translated to barmode=stack", {
@@ -50,7 +49,7 @@ test_that("position_identity is translated to barmode=stack", {
   trs <- info$traces
   trace.names <- sapply(trs[1:2], "[[", "name")
   expect_true(all(c("Math", "Bio") %in% trace.names))
-  expect_identical(info$kwargs$layout$barmode, "stack")
+  expect_identical(info$layout$barmode, "stack")
 })
 
 test_that("dates work well with bar charts", {
@@ -60,7 +59,7 @@ test_that("dates work well with bar charts", {
     geom_bar(stat="identity")
   info <- expect_traces(gd, 2, "dates")
   trs <- info$traces
-  expect_identical(info$kwargs$layout$xaxis$type, "date")
+  expect_identical(info$layout$xaxis$type, "date")
   # plotly likes time in milliseconds
   t <- as.numeric(unique(researchers$month)) * 24 * 60 * 60 * 1000
   expect_identical(trs[[1]]$x, t)
@@ -79,8 +78,8 @@ test_that("Very basic bar graph", {
     expect_null(tr$marker$line$color)
     expect_null(tr$marker$line$width)
   }
-  expect_null(info$kwargs$layout$annotations)
-  expect_false(info$kwargs$layout$showlegend)
+  expect_null(info$layout$annotations)
+  expect_false(info$layout$showlegend)
 })
 
 test_that("Map the time of day to different fill colors", {
@@ -93,8 +92,8 @@ test_that("Map the time of day to different fill colors", {
     expect_null(tr$marker$line$width)
     expect_true(tr$showlegend)
   }
-  expect_match(info$kwargs$layout$annotations[[1]]$text, "time")
-  expect_true(info$kwargs$layout$showlegend)
+  expect_match(info$layout$annotations[[1]]$text, "time")
+  expect_true(info$layout$showlegend)
 })
 
 test_that("Add a black outline", {
@@ -107,8 +106,8 @@ test_that("Add a black outline", {
     expect_equal(tr$marker$line$width, 1)
     expect_true(tr$showlegend)
   }
-  expect_match(info$kwargs$layout$annotations[[1]]$text, "time")
-  expect_true(info$kwargs$layout$showlegend)
+  expect_match(info$layout$annotations[[1]]$text, "time")
+  expect_true(info$layout$showlegend)
 })
 
 test_that("guides(fill=FALSE) hides fill legend", {
@@ -121,8 +120,8 @@ test_that("guides(fill=FALSE) hides fill legend", {
     expect_identical(tr$marker$line$color, toRGB("black"))
     expect_equal(tr$marker$line$width, 1)
   }
-  expect_null(info$kwargs$layout$annotations)
-  expect_false(info$kwargs$layout$showlegend)
+  expect_null(info$layout$annotations)
+  expect_false(info$layout$showlegend)
 })
 
 test_that('guides(fill="none") hides fill legend', {
@@ -135,8 +134,8 @@ test_that('guides(fill="none") hides fill legend', {
     expect_identical(tr$marker$line$color, toRGB("black"))
     expect_equal(tr$marker$line$width, 1)
   }
-  expect_null(info$kwargs$layout$annotations)
-  expect_false(info$kwargs$layout$showlegend)
+  expect_null(info$layout$annotations)
+  expect_false(info$layout$showlegend)
 })
 
 test_that('guides(colour="none") does not affect fill legend', {
@@ -150,8 +149,8 @@ test_that('guides(colour="none") does not affect fill legend', {
     expect_equal(tr$marker$line$width, 1)
     expect_true(tr$showlegend)
   }
-  expect_match(info$kwargs$layout$annotations[[1]]$text, "time")
-  expect_true(info$kwargs$layout$showlegend)
+  expect_match(info$layout$annotations[[1]]$text, "time")
+  expect_true(info$layout$showlegend)
 })
 
 test_that("guides(fill=FALSE) does not affect colour legend", {
@@ -165,16 +164,16 @@ test_that("guides(fill=FALSE) does not affect colour legend", {
     expect_equal(tr$marker$line$width, 1)
     expect_true(tr$showlegend)
   }
-  expect_match(info$kwargs$layout$annotations[[1]]$text, "time")
-  expect_true(info$kwargs$layout$showlegend)
+  expect_match(info$layout$annotations[[1]]$text, "time")
+  expect_true(info$layout$showlegend)
 })
 
 
 base <- ggplot(mtcars, aes(factor(vs), fill=factor(cyl))) 
 
 test_that("geom_bar() stacks counts", { 
   info <- expect_traces(base + geom_bar(), 3, "position-stack")
-  expect_identical(info$kwargs$layout$barmode, "stack")
+  expect_identical(info$layout$barmode, "stack")
   trs <- info$traces
   # sum of y values for each trace 
   test <- as.numeric(sort(sapply(trs, function(x) sum(x$y))))
@@ -184,7 +183,7 @@ test_that("geom_bar() stacks counts", {
 
 test_that("geom_bar(position = 'fill') stacks proportions", {
   info <- expect_traces(base + geom_bar(position = "fill"), 3, "position-fill")
-  expect_identical(info$kwargs$layout$barmode, "stack")
+  expect_identical(info$layout$barmode, "stack")
   trs <- info$traces
   # sum of y-values *conditioned* on a x-value
   prop <- sum(sapply(sapply(trs, "[[", "y"), "[", 1))

tests/testthat/test-ggplot-boxplot.R

@@ -6,11 +6,11 @@ test_that("geom_boxplot gives a boxplot", {
   L <- gg2list(gg)
 
   # right nb. traces
-  expect_equal(length(L), 4)
+  expect_equal(length(L$data), 3)
   # right type for 1st trace
-  expect_identical(L[[1]]$type, "box")
+  expect_identical(L$data[[1]]$type, "box")
   # right data for 1st trace
-  expect_identical(sort(L[[1]]$y),
+  expect_identical(sort(L$data[[1]]$y),
                    sort(mtcars$mpg[mtcars$cyl == 4]))
 
   save_outputs(gg, "boxplot")
@@ -22,11 +22,11 @@ test_that("geom_violin is equated to geom_boxplot for now", {
   L <- gg2list(gg)
 
   # right nb. traces
-  expect_equal(length(L), 4)
+  expect_equal(length(L$data), 3)
   # right type for 1st trace
-  expect_identical(L[[1]]$type, "box")
+  expect_identical(L$data[[1]]$type, "box")
   # right data for 1st trace
-  expect_identical(sort(L[[1]]$y),
+  expect_identical(sort(L$data[[1]]$y),
                    sort(mtcars$mpg[mtcars$cyl == 4]))
 
   save_outputs(gg, "violin")
@@ -42,9 +42,9 @@ test_that("you can make a boxplot for a distribution of datetimes", {
 
   L <- gg2list(bp)
 
-  expect_equal(length(L), 2)  # 1 trace + layout
-  expect_identical(L[[1]]$type, "box")
-  expect_identical(L[[1]]$y, as.character(df$y))
+  expect_equal(length(L$data), 1)  # 1 trace
+  expect_identical(L$data[[1]]$type, "box")
+  expect_identical(L$data[[1]]$y, as.character(df$y))
 
   save_outputs(bp, "boxplot-datetime")
 })

tests/testthat/test-ggplot-categorical.R

@@ -5,7 +5,7 @@ d <- head(diamonds, 50)
 test_that("axis type=category when we plot factors", {
   gg <- qplot(cut, price, data=d)
   info <- gg2list(gg)
-  l <- info$kwargs$layout
+  l <- info$layout
   expect_identical(l$xaxis$type, "category")
   expect_identical(l$yaxis$type, "linear")
 
@@ -16,12 +16,12 @@ test_that("Bar charts of type=category show category names", {
   gbar <- ggplot(d, aes(cut, price)) + geom_bar(stat="identity")
   info <- gg2list(gbar)
 
-  expect_equal(length(info), 2)  # 1 trace + layout
-  expect_identical(info$kwargs$layout$xaxis$type, "category")
-  expect_identical(info$kwargs$layout$xaxis$title, "cut")
-  expect_identical(info$kwargs$layout$yaxis$type, "linear")
+  expect_equal(length(info$data), 1)  # 1 trace
+  expect_identical(info$layout$xaxis$type, "category")
+  expect_identical(info$layout$xaxis$title, "cut")
+  expect_identical(info$layout$yaxis$type, "linear")
   expect_true(all(c("Fair", "Good", "Very Good", "Premium", "Ideal") %in%
-                    info[[1]]$x))
+                    info$data[[1]]$x))
 
   save_outputs(gbar, "bar-category-names")
 })

tests/testthat/test-ggplot-contour.R

@@ -7,12 +7,12 @@ gg <- ggplot(volcano3d) + geom_contour(aes(x=x, y=y, z=z))
 L <- gg2list(gg)
 
 test_that("geom_contour is translated to type=contour", {
-  expect_equal(length(L), 2)
-  expect_identical(L[[1]]$type, "contour")
+  expect_equal(length(L$data), 1)
+  expect_identical(L$data[[1]]$type, "contour")
 })
 
 test_that("geom_contour uses line contours by default", {
-  expect_identical(L[[1]]$contours$coloring, "lines")
+  expect_identical(L$data[[1]]$contours$coloring, "lines")
 })
 
 save_outputs(gg, "contour")

tests/testthat/test-ggplot-date.R

@@ -9,9 +9,9 @@ test_that("datetimes are converted to e.g. 2013-01-02 05:00:00", {
               data.frame(who="you", time.obj, dollars=c(10.2, 0)))
   gg <- qplot(time.obj, dollars, data=df, color=who, geom="line")
   info <- gg2list(gg)
-  expect_equal(length(info), 3)
-  expect_identical(info$kwargs$layout$xaxis$type, "date")
-  for(trace in info[1:2]){
+  expect_equal(length(info$data), 2)
+  expect_identical(info$layout$xaxis$type, "date")
+  for(trace in info$data[1:2]){
     expect_identical(trace$x, out.str)
   }
 
@@ -24,9 +24,9 @@ test_that("class Date is supported", {
   df$x <- as.Date(df$x)
   gg <- ggplot(df) + geom_line(aes(x=x, y=y))
   info <- gg2list(gg)
-  expect_equal(length(info), 2)
-  expect_identical(info$kwargs$layout$xaxis$type, "date")
-  expect_identical(info[[1]]$x[1], "2013-01-01 00:00:00")
+  expect_equal(length(info$data), 1)
+  expect_identical(info$layout$xaxis$type, "date")
+  expect_identical(info$data[[1]]$x[1], "2013-01-01 00:00:00")
 
   save_outputs(gg, "date-class-Date")
 })
@@ -46,13 +46,13 @@ test_that("scale_x_date and irregular time series work", {
   info <- gg2list(dt)
   info_w_scale <- gg2list(g)
 
-  expect_equal(length(info), 2)  # one trace + layout
-  expect_identical(info[[1]]$x[31], "2122-02-09 00:00:00")
-  expect_equal(length(info_w_scale), 2)  # one trace + layout
-  expect_identical(info_w_scale[[1]]$x[31], "2122-02-09 00:00:00")
-  expect_identical(info$kwargs$layout$xaxis$type, "date")
-  expect_identical(info_w_scale$kwargs$layout$xaxis$type, "date")
-  expect_equal(length(info_w_scale[[2]]), length(info[[2]]))  # similar layout
+  expect_equal(length(info$data), 1)  # one trace
+  expect_identical(info$data[[1]]$x[31], "2122-02-09 00:00:00")
+  expect_equal(length(info_w_scale$data), 1)  # one trace
+  expect_identical(info_w_scale$data[[1]]$x[31], "2122-02-09 00:00:00")
+  expect_identical(info$layout$xaxis$type, "date")
+  expect_identical(info_w_scale$layout$xaxis$type, "date")
+  expect_equal(length(info_w_scale$layout), length(info$layout))  # similar layout
 
   save_outputs(dt, "date-irregular-time-series")
 })

tests/testthat/test-ggplot-density.R

@@ -5,14 +5,13 @@ expect_traces <- function(gg, n.traces, name) {
   stopifnot(is.numeric(n.traces))
   save_outputs(gg, paste0("density-", name))
   L <- gg2list(gg)
-  is.trace <- names(L) == ""
-  all.traces <- L[is.trace]
+  all.traces <- L$data
   no.data <- sapply(all.traces, function(tr) {
     is.null(tr[["x"]]) && is.null(tr[["y"]])
   })
   has.data <- all.traces[!no.data]
   expect_equal(length(has.data), n.traces)
-  list(traces=has.data, kwargs=L$kwargs)
+  list(traces=has.data, layout=L$layout)
 }
 
 # Draw a probability density estimation using geom_density