Roll back to single expect_length() implementation

Author: hadley

R/expect-length.R

@@ -17,10 +17,6 @@ expect_length <- function(object, n) {
   stopifnot(is.numeric(n), length(n) == 1)
 
   act <- quasi_label(enquo(object), arg = "object")
-  expect_length_impl_(act, n)
-}
-
-expect_length_impl_ <- function(act, n) {
   act$n <- length(act$val)
 
   if (act$n != n) {

R/expect-shape.R

@@ -7,29 +7,20 @@
 #'   [length()] of a vector.
 #' @inheritParams expect_that
 #' @param ... Ignored.
-#' @param length Expected [length()] of `object`.
 #' @param nrow,ncol Expected [nrow()]/[ncol()] of `object`.
 #' @param dim Expected [dim()] of `object`.
 #' @family expectations
 #' @export
 #' @examples
 #' x <- matrix(1:9, nrow = 3)
-#' expect_shape(x, length = 9)
 #' expect_shape(x, nrow = 3)
 #' expect_shape(x, ncol = 3)
 #' expect_shape(x, dim = c(3, 3))
-expect_shape = function(object, ..., length, nrow, ncol, dim) {
+expect_shape = function(object, ..., nrow, ncol, dim) {
   check_dots_empty()
-  check_exclusive(length, nrow, ncol, dim)
+  check_exclusive(nrow, ncol, dim)
   act <- quasi_label(enquo(object), arg = "object")
 
-  # Re-use expect_length() to ensure they stay in sync.
-  if (!missing(length)) {
-    return(expect_length_impl_(act, length))
-  }
-  # now that we've handled the length argument, revert to usual base function
-  length <- base::length
-
   dim_object <- base::dim(object)
   if (is.null(dim_object)) {
     return(fail(sprintf("%s has no dimensions.", act$lab)))

man/expect_shape.Rd

@@ -1,7 +1,3 @@
-# length compared correctly
-
-    1 has length 1, not length 2.
-
 # dim compared correctly
 
     matrix(nrow = 6, ncol = 3) has dim (6, 3), not (6, 2).
@@ -56,12 +52,12 @@
       expect_shape(1:10)
     Condition
       Error in `expect_shape()`:
-      ! One of `length`, `nrow`, `ncol`, or `dim` must be supplied.
+      ! One of `nrow`, `ncol`, or `dim` must be supplied.
     Code
       expect_shape(1:10, nrow = 1L, ncol = 2L)
     Condition
       Error in `expect_shape()`:
-      ! Exactly one of `length`, `nrow`, `ncol`, or `dim` must be supplied.
+      ! Exactly one of `nrow`, `ncol`, or `dim` must be supplied.
       x `nrow` and `ncol` were supplied together.
     Code
       expect_shape(1:10, 2)

tests/testthat/_snaps/expect-shape.md

@@ -1,15 +1,3 @@
-test_that("length compared correctly", {
-  expect_success(expect_shape(1, length = 1))
-  expect_snapshot_failure(expect_shape(1, length = 2))
-  expect_success(expect_shape(1:10, length = 10))
-  expect_success(expect_shape(letters[1:5], length = 5))
-  expect_success(expect_shape(integer(), length = 0))
-
-  x <- list(1:10, letters)
-  out <- expect_shape(x, length = 2)
-  expect_identical(out, x)
-})
-
 test_that("dim compared correctly", {
   expect_success(expect_shape(matrix(nrow = 5, ncol = 4), dim = c(5L, 4L)))
   expect_snapshot_failure(expect_shape(