Remove more by hand

Author: hadley

R/expect-inheritance.R

@@ -116,22 +116,21 @@ expect_s7_class <- function(object, class) {
 
   if (!S7::S7_inherits(object)) {
     fail(sprintf("%s is not an S7 object", act$lab))
-  } else {
-    if (!S7::S7_inherits(object, class)) {
-      obj_class <- setdiff(base::class(object), "S7_object")
-      class_desc <- paste0("<", obj_class, ">", collapse = "/")
-      msg <- sprintf(
-        "%s inherits from %s not <%s>.",
-        act$lab,
-        class_desc,
-        attr(class, "name", TRUE)
-      )
-      fail(msg)
-    }
-    succeed()
   }
 
-  invisible(act$val)
+  if (!S7::S7_inherits(object, class)) {
+    obj_class <- setdiff(base::class(object), "S7_object")
+    class_desc <- paste0("<", obj_class, ">", collapse = "/")
+    msg <- sprintf(
+      "%s inherits from %s not <%s>.",
+      act$lab,
+      class_desc,
+      attr(class, "name", TRUE)
+    )
+    fail(msg)
+  }
+
+  pass(act$val)
 }
 
 #' @export
@@ -146,7 +145,6 @@ expect_s4_class <- function(object, class) {
       msg <- sprintf("%s is an S4 object", act$lab)
       fail(msg)
     }
-    succeed()
   } else if (is.character(class)) {
     if (!isS4(act$val)) {
       fail(sprintf("%s is not an S4 object", act$lab))
@@ -160,13 +158,12 @@ expect_s4_class <- function(object, class) {
         )
         fail(msg)
       }
-      succeed()
     }
   } else {
     abort("`class` must be a NA or a character vector")
   }
 
-  invisible(act$val)
+  pass(act$val)
 }
 
 isS3 <- function(x) is.object(x) && !isS4(x)

R/expect-known.R

@@ -77,8 +77,7 @@ compare_file <- function(path, lines, ..., update = TRUE, info = NULL) {
   if (!file.exists(path)) {
     warning("Creating reference output", call. = FALSE)
     brio::write_lines(lines, path)
-    succeed()
-    return()
+    return(pass(NULL))
   }
 
   old_lines <- brio::read_lines(path)
@@ -107,7 +106,7 @@ compare_file <- function(path, lines, ..., update = TRUE, info = NULL) {
     )
     fail(msg, info = info, trace_env = caller_env())
   }
-  succeed()
+  pass(NULL)
 }
 
 #' Expectations: is the output or the value equal to a known good value?
@@ -170,7 +169,6 @@ expect_known_value <- function(
   if (!file.exists(file)) {
     warning("Creating reference value", call. = FALSE)
     saveRDS(object, file, version = version)
-    succeed()
   } else {
     ref_val <- readRDS(file)
     comp <- compare(act$val, ref_val, ...)
@@ -187,10 +185,9 @@ expect_known_value <- function(
       )
       fail(msg, info = info)
     }
-    succeed()
   }
 
-  invisible(act$value)
+  pass(act$value)
 }
 
 #' @export
@@ -225,16 +222,14 @@ expect_known_hash <- function(object, hash = NULL) {
 
   if (is.null(hash)) {
     warning(paste0("No recorded hash: use ", substr(act_hash, 1, 10)))
-    succeed()
   } else {
     if (hash != act_hash) {
       msg <- sprintf("Value hashes to %s, not %s", act_hash, hash)
       fail(msg)
     }
-    succeed()
   }
 
-  invisible(act$value)
+  pass(act$value)
 }
 
 all_utf8 <- function(x) {

R/expect-output.R

@@ -37,16 +37,20 @@ expect_output <- function(
       msg <- sprintf("%s produced output.\n%s", act$lab, encodeString(act$cap))
       fail(msg, info = info)
     }
-    succeed()
   } else if (is.null(regexp) || identical(act$cap, "")) {
     if (identical(act$cap, "")) {
       msg <- sprintf("%s produced no output", act$lab)
       fail(msg, info = info)
     }
-    succeed()
   } else {
-    expect_match(act$cap, enc2native(regexp), ..., info = info, label = act$lab)
+    return(expect_match(
+      act$cap,
+      enc2native(regexp),
+      ...,
+      info = info,
+      label = act$lab
+    ))
   }
 
-  invisible(act$val)
+  pass(act$val)
 }

R/expect-setequal.R

@@ -144,11 +144,9 @@ expect_contains <- function(object, expected) {
       paste0("* Missing from `actual`: ", values(exp$val[exp_miss]), "\n"),
       paste0("* Present in `actual`:   ", values(act$val), "\n")
     ))
-  } else {
-    succeed()
   }
 
-  invisible(act$val)
+  pass(act$val)
 }
 
 #' @export
@@ -172,9 +170,7 @@ expect_in <- function(object, expected) {
       paste0("* Missing from `expected`: ", values(act$val[act_miss]), "\n"),
       paste0("* Present in `expected`:   ", values(exp$val), "\n")
     ))
-  } else {
-    succeed()
   }
 
-  invisible(act$val)
+  pass(act$val)
 }

R/expect-vector.R

@@ -29,5 +29,5 @@ expect_vector <- function(object, ptype = NULL, size = NULL) {
   if (!is.null(message)) {
     fail(message)
   }
-  succeed()
+  pass(act$val)
 }

R/old-school.R

@@ -113,7 +113,7 @@ takes_less_than <- function(amount) {
       msg <- paste0("took ", duration, " seconds, which is more than ", amount)
       fail(msg)
     }
-    succeed()
+    pass(expr)
   }
 }
 
@@ -135,7 +135,7 @@ not <- function(f) {
       msg <- paste0("NOT(", expt$message, ")")
       fail(msg, srcref = expt$srcref)
     }
-    succeed()
+    pass(NULL)
   }
 
   function(...) {

R/snapshot-file.R

@@ -146,7 +146,7 @@ expect_snapshot_file <- function(
     )
     fail(msg)
   }
-  succeed()
+  pass(NULL)
 }
 
 #' @rdname expect_snapshot_file

R/snapshot.R

@@ -335,7 +335,8 @@ expect_snapshot_helper <- function(
     )
     fail(msg, trace_env = trace_env)
   }
-  succeed()
+
+  pass(NULL)
 }
 
 snapshot_accept_hint <- function(variant, file, reset_output = TRUE) {

R/test-compiled-code.R

@@ -26,7 +26,7 @@ expect_cpp_tests_pass <- function(package) {
     msg <- paste("C++ unit tests:", info, sep = "\n")
     fail(msg)
   }
-  succeed()
+  pass(NULL)
 }
 
 #' Do C++ tests past?