Require data frame compatibility for setequal()

tidyverse · Mar 17, 2023 · 0589584 · 0589584
1 parent d4acc5e
commit 0589584
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/R/sets.R b/R/sets.R
@@ -142,12 +142,7 @@ setdiff.data.frame <- function(x, y, ...) {
 #' @export
 setequal.data.frame <- function(x, y, ...) {
   check_dots_empty()
-  if (!is.data.frame(y)) {
-    abort("`y` must be a data frame.")
-  }
-  if (!isTRUE(is_compatible(x, y))) {
-    return(FALSE)
-  }
+  check_compatible(x, y)
 
   cast <- vec_cast_common(x = x, y = y)
   all(vec_in(cast$x, cast$y)) && all(vec_in(cast$y, cast$x))

diff --git a/tests/testthat/_snaps/sets.md b/tests/testthat/_snaps/sets.md
@@ -102,7 +102,8 @@
       setequal(mtcars, 1)
     Condition
       Error in `setequal()`:
-      ! `y` must be a data frame.
+      ! `x` and `y` are not compatible.
+      `y` must be a data frame.
 
 # setequal checks for extra arguments
 

diff --git a/tests/testthat/test-sets.R b/tests/testthat/test-sets.R
@@ -116,9 +116,9 @@ test_that("setequal uses coercion rules (#6114)", {
 })
 
 test_that("setequal tibbles must have same rows and columns", {
-  expect_false(setequal(tibble(x = 1:2), tibble(y = 1:2)))
+  expect_error(setequal(tibble(x = 1:2), tibble(y = 1:2)))
   expect_false(setequal(tibble(x = 1:2), tibble(x = 2:3)))
-  expect_false(setequal(tibble(x = 1:2), tibble(x = c("a", "b"))))
+  expect_error(setequal(tibble(x = 1:2), tibble(x = c("a", "b"))))
 })
 
 test_that("setequal checks y is a data frame", {