Merge branch 'main' into skip-r

Author: MichaelChirico

NEWS.md

@@ -1,5 +1,9 @@
 # testthat (development version)
 
+* `expect_s4_class()` now supports unquoting (@stibu81, #2064).
+* `it()` now finds the correct evaluation environment in more cases (@averissimo, #2085).
+* Fixed an issue preventing compilation from succeeding due to deprecation / removal of `std::uncaught_exception()` (@kevinushey, #2047).
+
 # testthat 3.2.3
 
 * Fixed an issue where `expect_no_error(1)` was failing (#2037).

R/describe.R

@@ -94,5 +94,5 @@ it <- function(description, code = NULL) {
   check_string(description, allow_empty = FALSE)
 
   code <- substitute(code)
-  describe_it(description, code)
+  describe_it(description, code, env = parent.frame())
 }

R/expect-inheritance.R

@@ -125,7 +125,7 @@ expect_s7_class <- function(object, class) {
 #' @rdname inheritance-expectations
 expect_s4_class <- function(object, class) {
   act <- quasi_label(enquo(object), arg = "object")
-  act_val_lab <- format_class(methods::is(object))
+  act$class <- format_class(methods::is(act$val))
   exp_lab <- format_class(class)
 
   if (identical(class, NA)) {
@@ -139,7 +139,7 @@ expect_s4_class <- function(object, class) {
     } else {
       expect(
         methods::is(act$val, class),
-        sprintf("%s inherits from %s not %s.", act$lab, act_val_lab, exp_lab)
+        sprintf("%s inherits from %s not %s.", act$lab, act$class, exp_lab)
       )
     }
   } else {

R/expect-known.R

@@ -215,5 +215,5 @@ expect_known_hash <- function(object, hash = NULL) {
 }
 
 all_utf8 <- function(x) {
-  ! any(is.na(iconv(x, "UTF-8", "UTF-8")))
+  !anyNA(iconv(x, "UTF-8", "UTF-8"))
 }

R/expect-self-test.R

@@ -19,7 +19,7 @@ new_capture("expectation_success")
 #' Tools for testing expectations
 #'
 #' @description
-#' * `expect_sucess()` and `expect_failure()` check that there's at least
+#' * `expect_success()` and `expect_failure()` check that there's at least
 #'   one success or failure respectively.
 #' * `expect_snapshot_failure()` records the failure message so that you can
 #'   manually check that it is informative.

R/mock2.R

@@ -144,7 +144,7 @@ local_mocked_bindings <- function(..., .package = NULL, .env = caller_env()) {
     local_bindings_rebind(!!!bindings, .env = test_env, .frame = .env)
   }
 
-  if (any(!bindings_found)) {
+  if (!all(bindings_found)) {
     missing <- names(bindings)[!bindings_found]
     cli::cli_abort("Can't find binding for {.arg {missing}}")
   }

R/praise.R

@@ -21,8 +21,8 @@ praise <- function() {
     "\U0001f9ff Your tests look perfect \U0001f9ff",
     "\U0001f3af Your tests hit the mark \U0001f3af",
     "\U0001f41d Your tests are the bee's knees \U0001f41d",
-    "\U0001f4a3 Your tests are da bomb \U0001f4a3",
-    "\U0001f525 Your tests are lit \U0001f525"
+    "\U0001f3b8 Your tests rock \U0001f3b8",
+    "\U0001f44f Your tests get an ovation \U0001f44f"
   )
 
   x <- if (cli::is_utf8_output()) c(plain, utf8) else plain

R/reporter-list.R

@@ -126,7 +126,7 @@ all_passed <- function(res) {
   }
 
   df <- as.data.frame.testthat_results(res)
-  sum(df$failed) == 0 && all(!df$error)
+  sum(df$failed) == 0 && !any(df$error)
 }
 
 any_warnings <- function(res) {

inst/include/testthat/vendor/catch.h

@@ -379,6 +379,15 @@
 
 namespace Catch {
 
+    inline bool HasUncaughtException()
+    {
+#if __cplusplus >= 202002L
+        return std::uncaught_exceptions() > 0;
+#else
+        return std::uncaught_exception();
+#endif
+    }
+
     struct IConfig;
 
     struct CaseSensitive { enum Choice {
@@ -8379,7 +8388,7 @@ namespace Catch {
     {}
 
     ScopedMessage::~ScopedMessage() {
-        if ( !std::uncaught_exception() ){
+        if ( !HasUncaughtException() ){
             getResultCapture().popScopedMessage(m_info);
         }
     }
@@ -8702,7 +8711,7 @@ namespace Catch {
     Section::~Section() {
         if( m_sectionIncluded ) {
             SectionEndInfo endInfo( m_info, m_assertions, m_timer.getElapsedSeconds() );
-            if( std::uncaught_exception() )
+            if( HasUncaughtException() )
                 getResultCapture().sectionEndedEarly( endInfo );
             else
                 getResultCapture().sectionEnded( endInfo );