fix more lints

Author: etiennebacher

tests/testthat/test-aes-calculated.R

@@ -6,7 +6,7 @@ test_that("names surrounded by .. is calculated", {
   expect_equal(is_calculated_aes(aes(..x.., ..x, x..)), c(TRUE, FALSE, FALSE))
 
   # even when nested
-  expect_equal(is_calculated_aes(aes(f(..x..))), TRUE)
+  expect_true(is_calculated_aes(aes(f(..x..))))
 })
 
 test_that("call to stat() is calculated", {

tests/testthat/test-aes-grouping.R

@@ -26,7 +26,7 @@ test_that("no error for aes(groupS)", {
   g <- add_group(df2)
 
   expect_equal(nrow(g), nrow(df2))
-  expect_equal(names(g), c("x", "y", "groupS", "group"))
+  expect_named(g, c("x", "y", "groupS", "group"))
 })
 
 test_that("label is not used as a grouping var", {

tests/testthat/test-coord-.R

@@ -37,8 +37,7 @@ test_that("guide names are not removed by `train_panel_guides()`", {
   layout$setup_panel_guides(guides_list(NULL), plot$layers)
 
   # Line showing change in outcome
-  expect_equal(names(layout$panel_params[[1]]$guides$aesthetics),
-               c("x", "y", "x.sec", "y.sec"))
+  expect_named(layout$panel_params[[1]]$guides$aesthetics, c("x", "y", "x.sec", "y.sec"))
 })
 
 test_that("check coord limits errors only on bad inputs", {

tests/testthat/test-coord-polar.R

@@ -1,7 +1,7 @@
 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))
+    r     = c(0,    0, 0.5, 0.5, 1, 1, 0.75, 0.5))
 
   scales <- list(
     x = scale_x_continuous(limits = c(0, 2*pi)),
@@ -176,7 +176,7 @@ test_that("polar coordinates draw 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),
+    r     = c(0,    0, 0.5, 0.5, 1, 1, 0.75, 0.5),
     g     = 1:8
   )
   expect_doppelganger("Rays, circular arcs, and spiral arcs",

tests/testthat/test-coord-train.R

@@ -5,7 +5,7 @@ test_that("NA's don't appear in breaks", {
     ns <- names(trained)[grepl("(\\.major)|(\\.minor)$", names(trained))]
 
     for (n in ns) {
-      if (!is.null(trained[n]) && any(is.na(trained[n])))
+      if (!is.null(trained[n]) && anyNA(trained[n]))
         return(TRUE)
     }
 
@@ -19,8 +19,8 @@ test_that("NA's don't appear in breaks", {
   # This is a test to make sure the later tests will be useful!
   # It's possible that changes to the way that breaks are calculated will
   # make it so that scale_break_positions will no longer give NA for range 1, 12
-  expect_true(any(is.na(scale_x$break_positions())))
-  expect_true(any(is.na(scale_y$break_positions())))
+  expect_true(anyNA(scale_x$break_positions()))
+  expect_true(anyNA(scale_y$break_positions()))
 
   # Check the various types of coords to make sure they don't have NA breaks
   expect_false(any_NA_major_minor(coord_polar()$setup_panel_params(scale_x, scale_y)))

tests/testthat/test-coord_sf.R

@@ -309,8 +309,8 @@ test_that("sf_transform_xy() works", {
   # transform back
   out2 <- sf_transform_xy(out, 4326, 3347)
   expect_identical(data$city, out2$city)
-  expect_true(all(abs(out2$x - data$x) < .01))
-  expect_true(all(abs(out2$y - data$y) < .01))
+  expect_true(all(abs(out2$x - data$x) < 0.01))
+  expect_true(all(abs(out2$y - data$y) < 0.01))
 
 })
 

tests/testthat/test-empty-data.R

@@ -88,13 +88,13 @@ test_that("empty layers still generate one grob per panel", {
     geom_point() +
     facet_wrap(~y)
 
-  expect_equal(length(get_layer_grob(d)), 3)
+  expect_length(get_layer_grob(d), 3)
 })
 
 test_that("missing layers generate one grob per panel", {
   df <- data_frame(x = 1:4, y = rep(1:2, 2), g = rep(1:2, 2))
   base <- ggplot(df, aes(x, y)) + geom_point(shape = NA, na.rm = TRUE)
 
-  expect_equal(length(get_layer_grob(base)), 1)
-  expect_equal(length(get_layer_grob(base + facet_wrap(~ g))), 2)
+  expect_length(get_layer_grob(base), 1)
+  expect_length(get_layer_grob(base + facet_wrap(~ g)), 2)
 })

tests/testthat/test-facet-strips.R

@@ -143,24 +143,24 @@ test_that("padding is only added if axis is present", {
       strip.switch.pad.grid = unit(10, "mm")
     )
   pg <- ggplotGrob(p)
-  expect_equal(length(pg$heights), 19)
-  expect_equal(length(pg$widths), 18)
+  expect_length(pg$heights, 19)
+  expect_length(pg$widths, 18)
 
   pg <- ggplotGrob(
     p + scale_x_continuous(position = "top") +
       scale_y_continuous(position = "right")
   )
-  expect_equal(length(pg$heights), 20)
+  expect_length(pg$heights, 20)
   expect_equal(as.character(pg$heights[9]), "1cm")
-  expect_equal(length(pg$widths), 19)
+  expect_length(pg$widths, 19)
   expect_equal(as.character(pg$widths[13]), "1cm")
 
   # Also add padding with negative ticks and no text (#5251)
   pg <- ggplotGrob(
     p + scale_x_continuous(labels = NULL, position = "top") +
       theme(axis.ticks.length.x.top = unit(-2, "mm"))
   )
-  expect_equal(length(pg$heights), 20)
+  expect_length(pg$heights, 20)
   expect_equal(as.character(pg$heights[9]), "1cm")
 
   # Inverse should be true when strips are switched
@@ -172,17 +172,17 @@ test_that("padding is only added if axis is present", {
     )
 
   pg <- ggplotGrob(p)
-  expect_equal(length(pg$heights), 20)
+  expect_length(pg$heights, 20)
   expect_equal(as.character(pg$heights[13]), "1cm")
-  expect_equal(length(pg$widths), 19)
+  expect_length(pg$widths, 19)
   expect_equal(as.character(pg$widths[7]), "1cm")
 
   pg <- ggplotGrob(
     p + scale_x_continuous(position = "top") +
       scale_y_continuous(position = "right")
   )
-  expect_equal(length(pg$heights), 19)
-  expect_equal(length(pg$widths), 18)
+  expect_length(pg$heights, 19)
+  expect_length(pg$widths, 18)
 })
 
 test_that("y strip labels are rotated when strips are switched", {

tests/testthat/test-fortify.R

@@ -11,7 +11,7 @@ test_that("spatial polygons have correct ordering", {
         y - dely,y - dely,y + dely,y + dely,y - dely), ncol = 2))
   }
 
-  make_hole <- function(x = 0, y = 0, height = .5, width = .5){
+  make_hole <- function(x = 0, y = 0, height = 0.5, width = 0.5){
     p <- make_square(x = x, y = y, height = height, width = width)
     p@hole <- TRUE
     p

tests/testthat/test-geom-boxplot.R

@@ -73,7 +73,7 @@ test_that("boxes with variable widths do not overlap", {
   d <- get_layer_data(p)[c("xmin", "xmax")]
   xid <- find_x_overlaps(d)
 
-  expect_false(any(duplicated(xid)))
+  expect_false(anyDuplicated(xid) > 0)
 })
 
 test_that("boxplots with a group size >1 error", {