Process check.attributes in compare.numeric

Fixes #485

NEWS.md

@@ -1,5 +1,8 @@
 # testthat 1.0.2.9000
 
+* `compare.numeric()` respects `check.attributes()` so `expect_equivalent()`
+  correctly ignores attributes of numeric vectors (#485).
+
 * Properly report endless recursion, limiting the stack trace to the first and last 10 entries (#474).
 
 * Fix context test (#494).

R/compare-numeric.R

@@ -16,8 +16,12 @@
 #' # Compare ignores minor numeric differences in the same way
 #' # as all.equal.
 #' compare(x, x + 1e-9)
-compare.numeric <- function(x, y, tolerance = .Machine$double.eps ^ 0.5, ..., max_diffs = 9) {
-  all_equal <- all.equal(x, y, tolerance = tolerance, ...)
+compare.numeric <- function(x, y,
+                            tolerance = .Machine$double.eps ^ 0.5,
+                            check.attributes = TRUE,
+                            ..., max_diffs = 9) {
+  all_equal <- all.equal(x, y, tolerance = tolerance,
+    check.attributes = check.attributes, ...)
   if (isTRUE(all_equal)) {
     return(no_difference())
   }
@@ -31,7 +35,7 @@ compare.numeric <- function(x, y, tolerance = .Machine$double.eps ^ 0.5, ..., ma
   if (!same_length(x, y)) {
     return(diff_length(x, y))
   }
-  if (!same_attr(x, y)) {
+  if (check.attributes && !same_attr(x, y)) {
     return(diff_attr(x, y))
   }
 

tests/testthat/test-compare-numeric.R

@@ -37,6 +37,16 @@ test_that("attributes must be identical", {
   expect_match(compare(x4, x5)$message, "Names: 1 string mismatch")
 })
 
+test_that("unless check.attributes is FALSE", {
+  x1 <- 1L
+  x2 <- c(a = 1L)
+  x3 <- structure(1L, a = 1)
+
+  expect_equal(compare(x1, x2, check.attributes = FALSE)$message, "Equal")
+  expect_equal(compare(x1, x3, check.attributes = FALSE)$message, "Equal")
+  expect_equal(compare(x2, x3, check.attributes = FALSE)$message, "Equal")
+})
+
 # Values ------------------------------------------------------------------
 
 test_that("two identical vectors are the same", {