Disambiguate tests

Author: jennybc

tests/testthat/_snaps/expect-inheritance.md

@@ -31,14 +31,6 @@
       Error in `expect_s3_class()`:
       ! `exact` must be `TRUE` or `FALSE`, not the string "yes".
 
----
-
-    Code
-      expect_s4_class(factor("a"), 1)
-    Condition
-      Error in `expect_s4_class()`:
-      ! `class` must be a character vector or NA, not the number 1.
-
 # test_s3_class respects class hierarchy
 
     `x` inherits from 'a'/'b' not 'c'.
@@ -47,6 +39,14 @@
 
     `x` inherits from 'a'/'b' not 'c'/'d'.
 
+# expect_s4_class validates its inputs
+
+    Code
+      expect_s4_class(factor("a"), 1)
+    Condition
+      Error in `expect_s4_class()`:
+      ! `class` must be a character vector or NA, not the number 1.
+
 # expect_r6_class generates useful failures
 
     `x` is not an R6 object.

tests/testthat/_snaps/skip.md

@@ -18,15 +18,15 @@
 
     Reason: a_very_long_argument_name || a_very_long_argument_name || a_very_long_argument_name || a_very_long_argument_name || a_very_long_argument_name || a_very_long_argument_name || a_very_long_argument_name || a_very_long_argument_name || a_very_long_argument_name || a_very_long_argument_name || a_very_long_argument_name || a_very_long_argument_name || a_very_long_argument_name || a_very_long_argument_name is not TRUE
 
-# skip_if_not_installed() works as expected
+# skip_if_not_installed() works as expected, absence and version
 
     Reason: {doesntexist} is not installed
 
 ---
 
     Reason: Installed testthat is version 3.0.0; but 9999.9999.999 is required
 
----
+# skip_if_not_installed() works as expected, offline
 
     Reason: offline
 

tests/testthat/test-expect-inheritance.R

@@ -82,7 +82,7 @@ test_that("expect_s4_class allows unquoting of first argument", {
 })
 
 
-test_that("expect_s3_class validates its inputs", {
+test_that("expect_s4_class validates its inputs", {
   expect_snapshot(error = TRUE, {
     expect_s4_class(factor("a"), 1)
   })

tests/testthat/test-skip.R

@@ -37,15 +37,15 @@ test_that("autogenerated message is always single line", {
 
 # skip helpers ------------------------------------------------------------
 
-test_that("skip_if_not_installed() works as expected", {
+test_that("skip_if_not_installed() works as expected, absence and version", {
   local_mocked_bindings(package_version = function(x) "3.0.0")
 
   expect_snapshot_skip(skip_if_not_installed("doesntexist"))
   expect_snapshot_skip(skip_if_not_installed("testthat", "9999.9999.999"))
   expect_no_skip(skip_if_not_installed("testthat", "1.0.0"))
 })
 
-test_that("skip_if_not_installed() works as expected", {
+test_that("skip_if_not_installed() works as expected, offline", {
   skip_if_not_installed("curl")
   skip_on_cran()