Throw NA breaks error in 1 place

Author: teunbrand

R/scale-.R

@@ -607,6 +607,12 @@ check_breaks_labels <- function(breaks, labels, call = NULL) {
   if (is.null(breaks)) {
     return(TRUE)
   }
+  if (identical(breaks, NA)) {
+    cli::cli_abort(
+      "Invalid {.arg breaks} specification. Use {.code NULL}, not {.code NA}.",
+      call = call
+    )
+  }
   if (is.null(labels)) {
     return(TRUE)
   }
@@ -722,12 +728,6 @@ ScaleContinuous <- ggproto("ScaleContinuous", Scale,
     if (is.null(breaks)) {
       return(NULL)
     }
-    if (identical(breaks, NA)) {
-      cli::cli_abort(
-        "Invalid {.arg breaks} specification. Use {.code NULL}, not {.code NA}.",
-        call = self$call
-      )
-    }
 
     # Ensure limits don't exceed domain (#980)
     domain <- suppressWarnings(transformation$transform(transformation$domain))
@@ -1004,13 +1004,6 @@ ScaleDiscrete <- ggproto("ScaleDiscrete", Scale,
       return(NULL)
     }
 
-    if (identical(self$breaks, NA)) {
-      cli::cli_abort(
-        "Invalid {.arg breaks} specification. Use {.code NULL}, not {.code NA}.",
-        call = self$call
-      )
-    }
-
     if (is.waive(self$breaks)) {
       breaks <- limits
     } else if (is.function(self$breaks)) {
@@ -1228,11 +1221,6 @@ ScaleBinned <- ggproto("ScaleBinned", Scale,
 
     if (is.null(self$breaks)) {
       return(NULL)
-    } else if (identical(self$breaks, NA)) {
-      cli::cli_abort(
-        "Invalid {.arg breaks} specification. Use {.code NULL}, not {.code NA}.",
-        call = self$call
-      )
     } else if (is.waive(self$breaks)) {
       if (self$nice.breaks) {
         if (!is.null(self$n.breaks) && support_nbreaks(transformation$breaks)) {

tests/testthat/test-scales-breaks-labels.R

@@ -170,38 +170,12 @@ test_that("suppressing breaks, minor_breask, and labels works", {
 
 test_that("scale_breaks with explicit NA options (deprecated)", {
   # NA is defunct, should throw error
-
-  # X
-  sxc <- scale_x_continuous(breaks = NA)
-  sxc$train(1:3)
-  expect_error(sxc$get_breaks())
-  expect_error(sxc$get_breaks_minor())
-
-  # Y
-  syc <- scale_y_continuous(breaks = NA)
-  syc$train(1:3)
-  expect_error(syc$get_breaks())
-  expect_error(syc$get_breaks_minor())
-
-  # Alpha
-  sac <- scale_alpha_continuous(breaks = NA)
-  sac$train(1:3)
-  expect_error(sac$get_breaks())
-
-  # Size
-  ssc <- scale_size_continuous(breaks = NA)
-  ssc$train(1:3)
-  expect_error(ssc$get_breaks())
-
-  # Fill
-  sfc <- scale_fill_continuous(breaks = NA)
-  sfc$train(1:3)
-  expect_error(sfc$get_breaks())
-
-  # Colour
-  scc <- scale_colour_continuous(breaks = NA)
-  scc$train(1:3)
-  expect_error(scc$get_breaks())
+  expect_error(scale_x_continuous(breaks = NA))
+  expect_error(scale_y_continuous(breaks = NA))
+  expect_error(scale_alpha_continuous(breaks = NA))
+  expect_error(scale_size_continuous(breaks = NA))
+  expect_error(scale_fill_continuous(breaks = NA))
+  expect_error(scale_colour_continuous(breaks = NA))
 })
 
 test_that("breaks can be specified by names of labels", {

tests/testthat/test-scales.R

@@ -432,21 +432,18 @@ test_that("scales accept lambda notation for function input", {
 
 test_that("breaks and labels are correctly checked", {
   expect_snapshot_error(check_breaks_labels(1:10, letters))
-  p <- ggplot(mtcars) + geom_point(aes(mpg, disp)) + scale_x_continuous(breaks = NA)
-  expect_snapshot_error(ggplot_build(p))
+  expect_snapshot_error(scale_x_continuous(breaks = NA))
   p <- ggplot(mtcars) + geom_point(aes(mpg, disp)) + scale_x_continuous(minor_breaks = NA)
   expect_snapshot_error(ggplot_build(p))
   p <- ggplot(mtcars) + geom_point(aes(mpg, disp)) + scale_x_continuous(labels = NA)
   expect_snapshot_error(ggplotGrob(p))
   p <- ggplot(mtcars) + geom_point(aes(mpg, disp)) + scale_x_continuous(labels = function(x) 1:2)
   expect_snapshot_error(ggplotGrob(p))
-  p <- ggplot(mtcars) + geom_bar(aes(factor(gear))) + scale_x_discrete(breaks = NA)
-  expect_snapshot_error(ggplot_build(p))
+  expect_snapshot_error(scale_x_discrete(breaks = NA))
   p <- ggplot(mtcars) + geom_bar(aes(factor(gear))) + scale_x_discrete(labels = NA)
   expect_snapshot_error(ggplotGrob(p))
 
-  p <- ggplot(mtcars) + geom_bar(aes(mpg)) + scale_x_binned(breaks = NA)
-  expect_snapshot_error(ggplot_build(p))
+  expect_snapshot_error(scale_x_binned(breaks = NA))
   p <- ggplot(mtcars) + geom_bar(aes(mpg)) + scale_x_binned(labels = NA)
   expect_snapshot_error(ggplotGrob(p))
   p <- ggplot(mtcars) + geom_bar(aes(mpg)) + scale_x_binned(labels = function(x) 1:2)