Merged origin/main into succeed-fail

Author: hadley

NAMESPACE

@@ -145,16 +145,13 @@ export(is.expectation)
 export(is_a)
 export(is_checking)
 export(is_equivalent_to)
-export(is_false)
 export(is_identical_to)
 export(is_informative_error)
 export(is_less_than)
 export(is_more_than)
-export(is_null)
 export(is_parallel)
 export(is_snapshot)
 export(is_testing)
-export(is_true)
 export(it)
 export(local_edition)
 export(local_mock)
@@ -164,7 +161,6 @@ export(local_snapshotter)
 export(local_test_context)
 export(local_test_directory)
 export(make_expectation)
-export(matches)
 export(mock_output_sequence)
 export(new_expectation)
 export(not)

NEWS.md

@@ -1,5 +1,6 @@
 # testthat (development version)
 
+* `is_null()`/`matches()` deprecated in 2.0.0 (2017-12-19) and `is_true()`/`is_false()` deprecated in 2.1.0 (2019-04-23) have been removed (#2109).
 * `local_edition()` now gives a useful error for bad values (#1547).
 * testthat now requires R 4.1.
 * `expect_s4_class()` now supports unquoting (@stibu81, #2064).

R/expect-self-test.R

@@ -120,7 +120,7 @@ expect_snapshot_reporter <- function(
   paths = test_path("reporters/tests.R")
 ) {
   local_options(rlang_trace_format_srcrefs = FALSE)
-  local_rng_version("3.3")
+  withr::local_rng_version("3.3")
   set.seed(1014)
   # withr::local_seed(1014)
 
@@ -133,12 +133,6 @@ expect_snapshot_reporter <- function(
   )
 }
 
-# to work around https://github.com/r-lib/withr/issues/167
-local_rng_version <- function(version, .local_envir = parent.frame()) {
-  withr::defer(RNGversion(as.character(getRversion())), envir = .local_envir)
-  suppressWarnings(RNGversion(version))
-}
-
 # Use specifically for testthat tests in order to override the
 # defaults found when starting the reporter
 local_output_override <- function(

R/expect-that.R

@@ -76,29 +76,3 @@ succeed <- function(message = "Success has been forced", info = NULL) {
 
   expectation("success", message)
 }
-
-#' Negate an expectation
-#'
-#' This negates an expectation, making it possible to express that you
-#' want the opposite of a standard expectation. This function is deprecated
-#' and will be removed in a future version.
-#'
-#' @param f an existing expectation function
-#' @keywords internal
-#' @export
-not <- function(f) {
-  warning("`not()` is deprecated.", call. = FALSE)
-  stopifnot(is.function(f))
-
-  negate <- function(expt) {
-    expect(
-      !expectation_success(expt),
-      failure_message = paste0("NOT(", expt$message, ")"),
-      srcref = expt$srcref
-    )
-  }
-
-  function(...) {
-    negate(capture_expectation(f(...)))
-  }
-}

R/old-school.R

@@ -14,46 +14,12 @@
 #' @keywords internal
 NULL
 
-#' @export
-#' @rdname oldskool
-is_null <- function() {
-  warning(
-    "`is_null()` is deprecated. Please use `expect_null()` instead.",
-    call. = FALSE
-  )
-  function(x) expect_null(x)
-}
-
 #' @export
 #' @rdname oldskool
 is_a <- function(class) {
   function(x) expect_is(x, class)
 }
 
-#' @export
-#' @rdname oldskool
-is_true <- function() {
-  function(x) {
-    warning(
-      "`is_true()` is deprecated. Please use `expect_true()` instead.",
-      call. = FALSE
-    )
-    expect_true(x)
-  }
-}
-
-#' @export
-#' @rdname oldskool
-is_false <- function() {
-  function(x) {
-    warning(
-      "`is_false()` is deprecated. Please use `expect_false()` instead.",
-      call. = FALSE
-    )
-    expect_false(x)
-  }
-}
-
 #' @export
 #' @rdname oldskool
 has_names <- function(expected, ignore.order = FALSE, ignore.case = FALSE) {
@@ -127,17 +93,6 @@ throws_error <- function(regexp = NULL, ...) {
   function(x) expect_error(x, regexp, ...)
 }
 
-#' @export
-#' @rdname oldskool
-matches <- function(regexp, all = TRUE, ...) {
-  warning(
-    "`matches()` is deprecated. Please use `expect_match()` instead.",
-    call. = FALSE
-  )
-  function(x) expect_match(x, regexp, all = all, ...)
-}
-
-
 #' Does code take less than the expected amount of time to run?
 #'
 #' This is useful for performance regression testing.
@@ -160,3 +115,29 @@ takes_less_than <- function(amount) {
     )
   }
 }
+
+#' Negate an expectation
+#'
+#' This negates an expectation, making it possible to express that you
+#' want the opposite of a standard expectation. This function is deprecated
+#' and will be removed in a future version.
+#'
+#' @param f an existing expectation function
+#' @keywords internal
+#' @export
+not <- function(f) {
+  warning("`not()` is deprecated.", call. = FALSE)
+  stopifnot(is.function(f))
+
+  negate <- function(expt) {
+    expect(
+      !expectation_success(expt),
+      failure_message = paste0("NOT(", expt$message, ")"),
+      srcref = expt$srcref
+    )
+  }
+
+  function(...) {
+    negate(capture_expectation(f(...)))
+  }
+}

man/not.Rd

@@ -1,41 +1,9 @@
-test_that("old school logical works", {
-  local_edition(2L)
-
-  expect_warning(
-    expect_success(expect_that(TRUE, is_true())),
-    "deprecated"
-  )
-
-  expect_warning(
-    expect_success(expect_that(FALSE, is_false())),
-    "deprecated"
-  )
-})
-
 test_that("old school types still work", {
   local_edition(2L)
 
   expect_success(expect_that(1L, is_a("integer")))
 })
 
-test_that("tidyverse conflicts throw warnings", {
-  local_edition(2L)
-
-  expect_warning(
-    expect_that(NULL, is_null()),
-    "deprecated"
-  )
-
-  expect_warning(
-    expect_that("te*st", matches("e*", fixed = TRUE)),
-    "deprecated"
-  )
-  expect_warning(
-    expect_that("test", matches("TEST", ignore.case = TRUE)),
-    "deprecated"
-  )
-})
-
 test_that("old school names still work", {
   local_edition(2L)