Re-align tests and R files

R/expect-equality.R

@@ -201,42 +201,3 @@ expect_equivalent <- function(
   }
   pass(act$val)
 }
-
-
-#' Does code return a reference to the expected object?
-#'
-#' `expect_reference()` compares the underlying memory addresses of
-#' two symbols. It is for expert use only.
-#'
-#' @section 3rd edition:
-#' `r lifecycle::badge("deprecated")`
-#'
-#' `expect_reference()` is deprecated in the third edition. If you know what
-#' you're doing, and you really need this behaviour, just use `is_reference()`
-#' directly: `expect_true(rlang::is_reference(x, y))`.
-#'
-#' @inheritParams expect_equal
-#' @family expectations
-#' @keywords internal
-#' @export
-expect_reference <- function(
-  object,
-  expected,
-  info = NULL,
-  label = NULL,
-  expected.label = NULL
-) {
-  edition_deprecate(3, "expect_reference()")
-
-  act <- quasi_label(enquo(object), label, arg = "object")
-  exp <- quasi_label(enquo(expected), expected.label, arg = "expected")
-
-  if (!is_reference(act$val, exp$val)) {
-    msg <- sprintf("%s not a reference to %s.", act$lab, exp$lab)
-    return(fail(msg, info = info))
-  }
-  pass(act$val)
-}
-
-# expect_reference() needs dev version of rlang
-utils::globalVariables("is_reference")

R/expect-reference.R

@@ -0,0 +1,37 @@
+#' Does code return a reference to the expected object?
+#'
+#' `expect_reference()` compares the underlying memory addresses of
+#' two symbols. It is for expert use only.
+#'
+#' @section 3rd edition:
+#' `r lifecycle::badge("deprecated")`
+#'
+#' `expect_reference()` is deprecated in the third edition. If you know what
+#' you're doing, and you really need this behaviour, just use `is_reference()`
+#' directly: `expect_true(rlang::is_reference(x, y))`.
+#'
+#' @inheritParams expect_equal
+#' @family expectations
+#' @keywords internal
+#' @export
+expect_reference <- function(
+  object,
+  expected,
+  info = NULL,
+  label = NULL,
+  expected.label = NULL
+) {
+  edition_deprecate(3, "expect_reference()")
+
+  act <- quasi_label(enquo(object), label, arg = "object")
+  exp <- quasi_label(enquo(expected), expected.label, arg = "expected")
+
+  if (!is_reference(act$val, exp$val)) {
+    msg <- sprintf("%s not a reference to %s.", act$lab, exp$lab)
+    return(fail(msg, info = info))
+  }
+  pass(act$val)
+}
+
+# expect_reference() needs dev version of rlang
+utils::globalVariables("is_reference")

tests/testthat/test-expect-constant.R

@@ -30,3 +30,8 @@ test_that("expect_null works", {
   expect_snapshot_failure(expect_null(1L))
   expect_snapshot_failure(expect_null(environment()))
 })
+
+test_that("returns the input value", {
+  res <- expect_true(TRUE)
+  expect_equal(res, TRUE)
+})

tests/testthat/test-local.R

@@ -51,3 +51,10 @@ test_that("can force cli to display RStudio style hyperlinks", {
     str(cli::ansi_hyperlink_types())
   })
 })
+
+test_that("browser() usages are errors in tests", {
+  skip_if(getRversion() < "4.3.0")
+  if (!interactive()) {
+    expect_error(browser())
+  }
+})

tests/testthat/test-quasi-label.R

@@ -48,6 +48,22 @@ test_that("other inlined other objects are deparsed", {
   )
 })
 
+test_that("labelling compound {} expression gives single string", {
+  out <- expr_label(quote({
+    1 + 2
+  }))
+
+  expect_length(out, 1)
+  expect_type(out, "character")
+})
+
+test_that("can label multiline functions", {
+  expect_equal(
+    expr_label(quote(function(x, y) {})),
+    "function(x, y) ..."
+  )
+})
+
 test_that("informative error for missing arg", {
   expect_snapshot(error = TRUE, expect_equal())
 })

tests/testthat/test-source.R

@@ -113,3 +113,27 @@ test_that("errors if duplicate labels", {
 
   expect_snapshot(filter_desc(code, "baz"), error = TRUE)
 })
+
+test_that("source_dir()", {
+  res <- source_dir("test_dir", pattern = "hello", chdir = TRUE, wrap = FALSE)
+  expect_equal(res[[1]](), "Hello World")
+
+  res <- source_dir(
+    normalizePath("test_dir"),
+    pattern = "hello",
+    chdir = TRUE,
+    wrap = FALSE
+  )
+  expect_equal(res[[1]](), "Hello World")
+
+  res <- source_dir("test_dir", pattern = "hello", chdir = FALSE, wrap = FALSE)
+  expect_equal(res[[1]](), "Hello World")
+
+  res <- source_dir(
+    normalizePath("test_dir"),
+    pattern = "hello",
+    chdir = FALSE,
+    wrap = FALSE
+  )
+  expect_equal(res[[1]](), "Hello World")
+})