More polishing

Author: hadley

tests/testthat/test-method-ops.R

@@ -43,20 +43,19 @@ test_that("Ops generics dispatch to S3 methods", {
 })
 
 test_that("operator methods on S3/S4 classes work when neither operand is S7", {
-  local_methods(base_ops[["+"]], base_ops[["*"]])
+  local_methods(base_ops[["+"]])
 
   class_foo <- new_S3_class("foo")
   foo <- structure(list(), class = "foo")
   method(`+`, list(class_foo, class_any)) <- function(e1, e2) "foo+any"
-
-  # Primitive `+` dispatches into S7 even though `foo` is not an S7 object
   expect_equal(foo + 10, "foo+any")
-  # An unregistered operator falls back to the base behaviour
-  expect_error(foo * 10, regexp = "non-numeric argument")
 
   fooS4 <- local_S4_class("fooS4")
   method(`+`, list(fooS4, class_any)) <- function(e1, e2) "fooS4+any"
   expect_equal(fooS4("x") + 10, "fooS4+any")
+
+  # An unregistered operator still falls back to the base behaviour
+  expect_error(foo * 10, regexp = "non-numeric argument")
 })
 
 test_that("operator bridge does not clobber an existing group method", {