Skip to content

comparison() accepts messages of length > 1 #453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 18, 2016
Merged

comparison() accepts messages of length > 1 #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfb5574
explicit fmt argument with safe default to difference()
Apr 9, 2016
b80c637
add test
Apr 9, 2016
5700234
comparison() accepts messages of length > 1
Apr 16, 2016
933ae45
add test
Apr 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions R/compare.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ compare <- function(x, y, ...) {

comparison <- function(equal = TRUE, message = "Equal") {
stopifnot(is.logical(equal), length(equal) == 1)
stopifnot(is.character(message), length(message) == 1)
stopifnot(is.character(message))

structure(
list(
equal = equal,
message = message
message = paste(message, collapse = "\n")
),
class = "comparison"
)
}
difference <- function(...) {
comparison(FALSE, sprintf(...))
difference <- function(..., fmt = "%s") {
comparison(FALSE, sprintf(fmt, ...))
}
no_difference <- function() {
comparison()
Expand Down Expand Up @@ -56,18 +56,18 @@ print_out <- function(x, ...) {
# Common helpers ---------------------------------------------------------------

same_length <- function(x, y) length(x) == length(y)
diff_length <- function(x, y) difference("Lengths differ: %i vs %i", length(x), length(y))
diff_length <- function(x, y) difference(fmt = "Lengths differ: %i vs %i", length(x), length(y))

same_type <- function(x, y) identical(typeof(x), typeof(y))
diff_type <- function(x, y) difference("Types not compatible: %s vs %s", typeof(x), typeof(y))
diff_type <- function(x, y) difference(fmt = "Types not compatible: %s vs %s", typeof(x), typeof(y))

same_class <- function(x, y) {
if (!is.object(x) && !is.object(y))
return(TRUE)
identical(class(x), class(y))
}
diff_class <- function(x, y) {
difference("Classes differ: %s vs %s", klass(x), klass(y))
difference(fmt = "Classes differ: %s vs %s", klass(x), klass(y))
}

same_attr <- function(x, y) {
Expand Down
12 changes: 12 additions & 0 deletions tests/testthat/test-expect-equality.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,15 @@ test_that("useful message if objects equal but not identical", {
expect_failure(expect_identical(f, g), "not identical")
})

test_that("% is not treated as sprintf format specifier (#445)", {
expect_failure(expect_equal("+", "%"))
expect_failure(expect_equal("%", "+"))
expect_equal("%", "%")
})

test_that("attributes for object (#452)", {
oops <- structure(0, oops = "oops")
expect_equal(oops, oops)
expect_failure(expect_equal(oops, 0))
expect_equal(as.numeric(oops), 0)
})