Copyedit testthat tests (#2634)

Consistently use lower case to name tests
Make test names grammatically correct
Apply consistent whitespace rules

Author: pkq

tests/testthat/test-add.R

@@ -1,6 +1,6 @@
 context("Adding plot elements")
 
-test_that("Mapping class is preserved when adding uneval objects", {
+test_that("mapping class is preserved when adding uneval objects", {
   p <- ggplot(mtcars) + aes(wt, mpg)
   expect_identical(class(p$mapping), "uneval")
 })

tests/testthat/test-aes-grouping.r

@@ -9,6 +9,7 @@ df <- data.frame(
 group <- function(x) as.vector(layer_data(x, 1)$group)
 groups <- function(x) length(unique(group(x)))
 
+
 test_that("one group per combination of discrete vars", {
   plot <- ggplot(df, aes(x, x)) + geom_point()
   expect_equal(group(plot), rep(NO_GROUP, 4))

tests/testthat/test-aes-setting.r

@@ -1,6 +1,6 @@
 context("Aes - setting values")
 
-test_that("Aesthetic parameters must match length of data", {
+test_that("aesthetic parameters match length of data", {
   df <- data.frame(x = 1:5, y = 1:5)
   p <- ggplot(df, aes(x, y))
 
@@ -13,7 +13,6 @@ test_that("Aesthetic parameters must match length of data", {
   expect_error(set_colours(rep("red", 3)), "must be either length 1")
   expect_error(set_colours(rep("red", 4)), "must be either length 1")
   set_colours(rep("red", 5))
-
 })
 
 test_that("legend filters out aesthetics not of length 1", {
@@ -24,7 +23,6 @@ test_that("legend filters out aesthetics not of length 1", {
   # Ideally would test something in the legend data structure, but
   # that's not easily accessible currently.
   expect_error(ggplot_gtable(ggplot_build(p)), NA)
-
 })
 
 test_that("alpha affects only fill colour of solid geoms", {

tests/testthat/test-aes.r

@@ -23,7 +23,7 @@ test_that("aes_string() doesn't parse non-strings", {
   expect_identical(aes_string(0.4)$x, 0.4)
 })
 
-test_that("aes_q() & aes_string() preserves explicit NULLs", {
+test_that("aes_q() & aes_string() preserve explicit NULLs", {
   expect_equal(aes_q(NULL), aes(NULL))
   expect_equal(aes_q(x = NULL), aes(NULL))
   expect_equal(aes_q(colour = NULL), aes(colour = NULL))

tests/testthat/test-build.r

@@ -15,7 +15,7 @@ test_that("there is one data frame for each layer", {
   expect_equal(nlayers(l3), 3)
 })
 
-test_that("position aesthetics coerced to correct type", {
+test_that("position aesthetics are coerced to correct type", {
   l1 <- ggplot(df, aes(x, y)) + geom_point()
   d1 <- layer_data(l1, 1)
 

tests/testthat/test-coord-polar.r

@@ -1,6 +1,6 @@
 context("coord_polar")
 
-test_that("Polar distance calculation", {
+test_that("polar distance is calculated correctly", {
   dat <- data.frame(
     theta = c(0, 2*pi,   2,   6, 6, 1,    1,  0),
     r     = c(0,    0, 0.5, 0.5, 1, 1, 0.75, .5))
@@ -26,9 +26,7 @@ test_that("Polar distance calculation", {
   #   geom_point(alpha=0.3) + coord_polar()
 })
 
-
-
-test_that("Polar distance calculation ignores NA's", {
+test_that("polar distance calculation ignores NA's", {
 
   # These are r and theta values; we'll swap them around for testing
   x1 <- c(0, 0.5, 0.5, NA, 1)
@@ -39,7 +37,6 @@ test_that("Polar distance calculation ignores NA's", {
   dists <- dist_polar(x2, x1)
   expect_equal(is.na(dists), c(FALSE, FALSE, TRUE, TRUE))
 
-
   # NA on the end
   x1 <- c(0, 0.5, 0.5, 1, NA)
   x2 <- c(0,   1,   2, 0,  1)
@@ -48,7 +45,6 @@ test_that("Polar distance calculation ignores NA's", {
   dists <- dist_polar(x2, x1)
   expect_equal(is.na(dists), c(FALSE, FALSE, FALSE, TRUE))
 
-
   # NAs in each vector - also have NaN
   x1 <- c(0, 0.5, 0.5,  1, NA)
   x2 <- c(NaN,   1,   2, NA,  1)
@@ -58,7 +54,6 @@ test_that("Polar distance calculation ignores NA's", {
   expect_equal(is.na(dists), c(TRUE, FALSE, TRUE, TRUE))
 })
 
-
 test_that("clipping can be turned off and on", {
   # clip can be turned on and off
   p <- ggplot() + coord_polar()
@@ -73,7 +68,7 @@ test_that("clipping can be turned off and on", {
 
 # Visual tests ------------------------------------------------------------
 
-test_that("Polar coordinates draws correctly", {
+test_that("polar coordinates draw correctly", {
   theme <- theme_test() +
     theme(
       axis.text.y = element_blank(),

tests/testthat/test-empty-data.r

@@ -20,7 +20,6 @@ test_that("layers with empty data are silently omitted", {
   expect_equal(nrow(layer_data(d, 1)), 0)
 })
 
-
 test_that("plots with empty data and vectors for aesthetics work", {
   d <- ggplot(NULL, aes(1:5, 1:5)) + geom_point()
   expect_equal(nrow(layer_data(d)), 5)
@@ -32,7 +31,6 @@ test_that("plots with empty data and vectors for aesthetics work", {
   expect_equal(nrow(layer_data(d)), 5)
 })
 
-
 test_that("layers with empty data are silently omitted with facet_wrap", {
   # Empty data, facet_wrap, throws error
   d <- ggplot(df0, aes(mpg, wt)) +
@@ -56,7 +54,6 @@ test_that("layers with empty data are silently omitted with facet_grid", {
   expect_equal(nrow(layer_data(d, 2)), nrow(mtcars))
 })
 
-
 test_that("empty data overrides plot defaults", {
   # Should error when totally empty data frame because there's no x and y
   d <- ggplot(mtcars, aes(mpg, wt)) +

tests/testthat/test-facet-.r

@@ -64,7 +64,7 @@ test_that("facets split up the data", {
   expect_equal(d1$PANEL, factor(1:3))
 })
 
-test_that("facet_wrap() accept vars()", {
+test_that("facet_wrap() accepts vars()", {
   p <- ggplot(df, aes(x, y)) + geom_point()
   p2 <- p + facet_wrap(vars(z))
 
@@ -130,7 +130,6 @@ test_that("facets with free scales scale independently", {
   expect_true(sd(d3$y) < 1e-10)
 })
 
-
 test_that("shrink parameter affects scaling", {
   l1 <- ggplot(df, aes(1, y)) + geom_point()
   r1 <- pranges(l1)
@@ -148,8 +147,7 @@ test_that("shrink parameter affects scaling", {
   expect_equal(r3$y[[1]], c(1, 3))
 })
 
-
-test_that("Facet variables", {
+test_that("facet variables", {
   expect_identical(facet_null()$vars(), character(0))
   expect_identical(facet_wrap(~ a)$vars(), "a")
   expect_identical(facet_grid(a ~ b)$vars(), c("a", "b"))
@@ -163,9 +161,10 @@ test_that("facet gives clear error if ", {
   )
 })
 
+
 # Visual tests ------------------------------------------------------------
 
-test_that("Facet labels can respect both justification and margin arguments", {
+test_that("facet labels respect both justification and margin arguments", {
 
   df <- data.frame(
     x = 1:2,

tests/testthat/test-facet-layout.r

@@ -11,7 +11,7 @@ panel_layout <- function(facet, data) {
   layout$layout
 }
 
-test_that("grid: single row and single col equivalent", {
+test_that("grid: single row and single col are equivalent", {
   row <- panel_layout(facet_grid(a~.), list(a))
   col <- panel_layout(facet_grid(.~a), list(a))
 
@@ -34,7 +34,7 @@ test_that("grid: includes all combinations", {
   expect_equal(nrow(all), 4)
 })
 
-test_that("wrap and grid equivalent for 1d data", {
+test_that("wrap and grid are equivalent for 1d data", {
   rowg <- panel_layout(facet_grid(a~.), list(a))
   roww <- panel_layout(facet_wrap(~a, ncol = 1), list(a))
   expect_equal(roww, rowg)
@@ -105,7 +105,6 @@ test_that("wrap: drop = FALSE preserves unused levels", {
   wrap_b <- panel_layout(facet_wrap(~b, drop = FALSE), list(a2))
   expect_equal(nrow(wrap_b), 4)
   expect_equal(as.character(wrap_b$b), as.character(4:1))
-
 })
 
 test_that("grid: drop = FALSE preserves unused levels", {
@@ -121,7 +120,6 @@ test_that("grid: drop = FALSE preserves unused levels", {
   expect_equal(nrow(grid_ab), 16)
   expect_equal(as.character(grid_ab$a), as.character(rep(1:4, each = 4)))
   expect_equal(as.character(grid_ab$b), as.character(rep(4:1, 4)))
-
 })
 
 # Missing behaviour ----------------------------------------------------------

tests/testthat/test-facet-map.r

@@ -10,16 +10,14 @@ panel_map_one <- function(facet, data, plot_data = data) {
   layout$setup(list(data), plot_data)[[1]]
 }
 
-
-test_that("two col cases with no missings adds single extra column", {
+test_that("two col cases with no missings adds a single extra column", {
   loc <- panel_map_one(facet_grid(cyl~vs), mtcars)
 
   expect_equal(nrow(loc), nrow(mtcars))
   expect_equal(ncol(loc), ncol(mtcars) + 1)
 
   match <- unique(loc[c("cyl", "vs", "PANEL")])
   expect_equal(nrow(match), 5)
-
 })
 
 test_that("margins add extra data", {
@@ -28,7 +26,6 @@ test_that("margins add extra data", {
   expect_equal(nrow(loc), nrow(df) * 2)
 })
 
-
 test_that("grid: missing facet columns are duplicated", {
   facet <- facet_grid(a~b)
 
@@ -60,7 +57,6 @@ test_that("wrap: missing facet columns are duplicated", {
   loc_c <- panel_map_one(facet, df_c, plot_data = df)
   expect_equal(nrow(loc_c), 4)
   expect_equal(loc_c$PANEL, factor(1:4))
-
 })
 
 # Missing behaviour ----------------------------------------------------------
@@ -71,7 +67,7 @@ a3 <- data.frame(
   c = factor(c(1:3, NA), exclude = NULL)
 )
 
-test_that("wrap: missing values located correctly", {
+test_that("wrap: missing values are located correctly", {
   facet <- facet_wrap(~b, ncol = 1)
   loc_b <- panel_map_one(facet, data.frame(b = NA), plot_data = a3)
   expect_equal(as.character(loc_b$PANEL), "4")
@@ -81,7 +77,7 @@ test_that("wrap: missing values located correctly", {
   expect_equal(as.character(loc_c$PANEL), "4")
 })
 
-test_that("grid: missing values located correctly", {
+test_that("grid: missing values are located correctly", {
   facet <- facet_grid(b~.)
   loc_b <- panel_map_one(facet, data.frame(b = NA), plot_data = a3)
   expect_equal(as.character(loc_b$PANEL), "4")
@@ -160,5 +156,4 @@ test_that("wrap: facet order follows default data frame order", {
   lay <- get_layout(ggplot(mapping = aes(x, y)) + facet_wrap(~fx) +
     geom_point(data = d) + geom_blank(data = d2))
   expect_equal(as.character(lay$fx), c("c","b","a")[lay$PANEL])
-
 })

tests/testthat/test-fortify.r

@@ -1,6 +1,6 @@
 context("Fortify")
 
-test_that("Spatial polygons have correct ordering", {
+test_that("spatial polygons have correct ordering", {
   skip_if_not_installed("sp")
 
   make_square <- function(x = 0, y = 0, height = 1, width = 1){
@@ -24,7 +24,6 @@ test_that("Spatial polygons have correct ordering", {
                 sp::Polygons(list(make_square(0,1)), 4),
                 sp::Polygons(list(make_square(0,3)), 5))
 
-
   polys_sp <- sp::SpatialPolygons(polys)
   fake_sp <- sp::SpatialPolygonsDataFrame(polys_sp, fake_data)
 
@@ -34,7 +33,6 @@ test_that("Spatial polygons have correct ordering", {
   fake_sp2 <- sp::SpatialPolygonsDataFrame(polys2_sp, fake_data)
 
   expect_equivalent(fortify(fake_sp), plyr::arrange(fortify(fake_sp2), id, order))
-
 })
 
 test_that("fortify.default proves a helpful error with class uneval", {

tests/testthat/test-function-args.r

@@ -42,7 +42,6 @@ test_that("geom_xxx and GeomXxx$draw arg defaults match", {
   })
 })
 
-
 test_that("stat_xxx and StatXxx$compute_panel arg defaults match", {
   ggplot2_ns <- asNamespace("ggplot2")
   objs <- ls(ggplot2_ns)

tests/testthat/test-geom-dotplot.R

@@ -3,7 +3,7 @@ context("geom_dotplot")
 set.seed(111)
 dat <- data.frame(x = LETTERS[1:2], y = rnorm(30), g = LETTERS[3:5])
 
-test_that("Dodging works", {
+test_that("dodging works", {
   p <- ggplot(dat, aes(x = x, y = y, fill = g)) +
     geom_dotplot(
       binwidth = 0.2,
@@ -34,8 +34,7 @@ test_that("Dodging works", {
   expect_true(all(abs(df$x - df$xmin - dwidth/2) < 1e-6))
 })
 
-
-test_that("Binning works", {
+test_that("binning works", {
   bp <- ggplot(dat, aes(y)) +
     geom_dotplot(binwidth = .4, method = "histodot")
   x <- layer_data(bp)$x
@@ -53,7 +52,6 @@ test_that("Binning works", {
   expect_false(all(abs((x - min(x) + 1e-7) %% .4) < 1e-6))
 })
 
-
 test_that("NA's result in warning from stat_bindot", {
   set.seed(122)
   dat <- data.frame(x = rnorm(20))
@@ -64,7 +62,7 @@ test_that("NA's result in warning from stat_bindot", {
     "Removed 2 rows.*stat_bindot")
 })
 
-test_that("When binning on y-axis, limits depend on the panel", {
+test_that("when binning on y-axis, limits depend on the panel", {
    p <- ggplot(mtcars, aes(factor(cyl), mpg)) +
         geom_dotplot(binaxis='y')
 
@@ -78,6 +76,7 @@ test_that("When binning on y-axis, limits depend on the panel", {
    expect_false(all(equal_limits2))
 })
 
+
 # Visual tests ------------------------------------------------------------
 
 test_that("geom_dotplot draws correctly", {

tests/testthat/test-geom-hex.R

@@ -1,6 +1,6 @@
 context("geom_hex")
 
-test_that("density and value summaries available", {
+test_that("density and value summaries are available", {
   df <- data.frame(x = c(1, 1, 1, 2), y = c(1, 1, 1, 2))
   base <- ggplot(df, aes(x, y)) +
     geom_hex()

tests/testthat/test-geom-path.R

@@ -7,6 +7,7 @@ test_that("keep_mid_true drops leading/trailing FALSE", {
   expect_equal(keep_mid_true(c(F, T, F, T, T)), c(F, T, T, T, T))
 })
 
+
 # Visual tests ------------------------------------------------------------
 
 test_that("geom_path draws correctly", {

tests/testthat/test-geom-sf.R

@@ -1,5 +1,6 @@
 context("geom-sf")
 
+
 # Visual tests ------------------------------------------------------------
 
 test_that("geom_sf draws correctly", {

tests/testthat/test-geom-smooth.R

@@ -1,6 +1,6 @@
 context("geom_smooth")
 
-test_that("Data is ordered by x", {
+test_that("data is ordered by x", {
   df <- data.frame(x = c(1, 5, 2, 3, 4), y = 1:5)
 
   ps <- ggplot(df, aes(x, y))+
@@ -9,7 +9,7 @@ test_that("Data is ordered by x", {
   expect_equal(layer_data(ps)[c("x", "y")], df[order(df$x), ])
 })
 
-test_that("Default smoothing methods for small and large data sets work", {
+test_that("default smoothing methods for small and large data sets work", {
   # test small data set
   set.seed(6531)
   x <- rnorm(10)
@@ -48,9 +48,9 @@ test_that("Default smoothing methods for small and large data sets work", {
     "method = 'gam' and formula 'y ~ s\\(x, bs = \"cs\"\\)"
   )
   expect_equal(plot_data$y, as.numeric(out))
-
 })
 
+
 # Visual tests ------------------------------------------------------------
 
 test_that("geom_smooth() works with alternative stats", {