Be more explicit about returned values

Author: hadley

R/expect-comparison.R

@@ -40,8 +40,6 @@ expect_compare_ <- function(
   } else {
     pass()
   }
-
-  invisible(act$val)
 }
 
 failure_compare <- function(act, exp, operator) {
@@ -83,6 +81,7 @@ expect_lt <- function(object, expected, label = NULL, expected.label = NULL) {
   exp <- quasi_label(enquo(expected), expected.label)
 
   expect_compare_("<", act, exp)
+  invisible(act$val)
 }
 
 #' @export
@@ -92,6 +91,7 @@ expect_lte <- function(object, expected, label = NULL, expected.label = NULL) {
   exp <- quasi_label(enquo(expected), expected.label)
 
   expect_compare_("<=", act, exp)
+  invisible(act$val)
 }
 
 #' @export
@@ -101,6 +101,7 @@ expect_gt <- function(object, expected, label = NULL, expected.label = NULL) {
   exp <- quasi_label(enquo(expected), expected.label)
 
   expect_compare_(">", act, exp)
+  invisible(act$val)
 }
 
 #' @export
@@ -110,6 +111,7 @@ expect_gte <- function(object, expected, label = NULL, expected.label = NULL) {
   exp <- quasi_label(enquo(expected), expected.label)
 
   expect_compare_(">=", act, exp)
+  invisible(act$val)
 }
 
 

R/expect-constant.R

@@ -31,15 +31,19 @@ NULL
 expect_true <- function(object, info = NULL, label = NULL) {
   act <- quasi_label(enquo(object), label)
   exp <- labelled_value(TRUE, "TRUE")
+
   expect_waldo_constant_(act, exp, info = info, ignore_attr = TRUE)
+  invisible(act$val)
 }
 
 #' @export
 #' @rdname logical-expectations
 expect_false <- function(object, info = NULL, label = NULL) {
   act <- quasi_label(enquo(object), label)
   exp <- labelled_value(FALSE, "FALSE")
+
   expect_waldo_constant_(act, exp, info = info, ignore_attr = TRUE)
+  invisible(act$val)
 }
 
 #' Do you expect `NULL`?
@@ -59,7 +63,9 @@ expect_false <- function(object, info = NULL, label = NULL) {
 expect_null <- function(object, info = NULL, label = NULL) {
   act <- quasi_label(enquo(object), label)
   exp <- labelled_value(NULL, "NULL")
+
   expect_waldo_constant_(act, exp, info = info)
+  invisible(act$val)
 }
 
 expect_waldo_constant_ <- function(
@@ -86,5 +92,4 @@ expect_waldo_constant_ <- function(
   } else {
     pass()
   }
-  invisible(act$val)
 }

R/expect-equality.R

@@ -86,8 +86,8 @@ expect_equal <- function(
       )
       fail(msg, info = info)
     }
-    invisible(act$val)
   }
+  invisible(act$val)
 }
 
 
@@ -124,8 +124,8 @@ expect_identical <- function(
       )
       fail(msg, info = info)
     }
-    invisible(act$val)
   }
+  invisible(act$val)
 }
 
 expect_waldo_equal_ <- function(
@@ -153,8 +153,6 @@ expect_waldo_equal_ <- function(
     )
     fail(msg, info = info, trace_env = trace_env)
   }
-
-  invisible(act$val)
 }
 
 #' Is an object equal to the expected value, ignoring attributes?

R/expect-named.R

@@ -38,20 +38,27 @@ expect_named <- function(
   act <- quasi_label(enquo(object), label)
 
   if (missing(expected)) {
-    return(expect_has_names_(act))
-  }
+    act_names <- names(act$val)
+    if (is.null(act_names)) {
+      msg <- sprintf("Expected %s to have names.", act$lab)
+      fail(msg)
+    } else {
+      pass()
+    }
+  } else {
+    exp <- quasi_label(enquo(expected), arg = "expected")
 
-  exp <- quasi_label(enquo(expected), arg = "expected")
+    exp$val <- normalise_names(exp$val, ignore.order, ignore.case)
+    act_names <- labelled_value(
+      normalise_names(names(act$val), ignore.order, ignore.case),
+      paste0("names of ", act$lab)
+    )
 
-  exp$val <- normalise_names(exp$val, ignore.order, ignore.case)
-  act_names <- labelled_value(
-    normalise_names(names(act$val), ignore.order, ignore.case),
-    paste0("names of ", act$lab)
-  )
-  if (ignore.order) {
-    expect_setequal_(act_names, exp)
-  } else {
-    expect_waldo_equal_("equal", act_names, exp)
+    if (ignore.order) {
+      expect_setequal_(act_names, exp)
+    } else {
+      expect_waldo_equal_("equal", act_names, exp)
+    }
   }
 
   invisible(act$val)
@@ -71,14 +78,3 @@ normalise_names <- function(x, ignore.order = FALSE, ignore.case = FALSE) {
 
   x
 }
-
-expect_has_names_ <- function(act, trace_env = caller_env()) {
-  act_names <- names(act$val)
-  if (is.null(act_names)) {
-    msg <- sprintf("Expected %s to have names.", act$lab)
-    fail(msg, trace_env = trace_env)
-  } else {
-    pass()
-  }
-  invisible(act$val)
-}

R/expect-setequal.R

@@ -90,6 +90,7 @@ expect_mapequal <- function(object, expected) {
   exp <- quasi_label(enquo(expected))
 
   expect_waldo_equal_("equal", act, exp, list_as_map = TRUE)
+  invisible(act$val)
 }
 
 #' @export