testthat edition 3, parallel tests

Author: sckott

DESCRIPTION

@@ -44,6 +44,8 @@ Suggests:
     withr
 Remotes: ropensci/vcr
 RoxygenNote: 7.3.2
+Config/testthat/edition: 3
+Config/testthat/parallel: true
 X-schema.org-applicationCategory: Web
 X-schema.org-keywords: http, https, API, web-services, curl, mock, mocking, fakeweb, http-mocking, testing, testing-tools, tdd
 X-schema.org-isPartOf: https://ropensci.org

tests/testthat/test-Adapter.R

@@ -1,7 +1,5 @@
-context("Adapter class")
-
 test_that("Adapter class can't be instantiated", {
-  expect_is(Adapter, "R6ClassGenerator")
+  expect_s3_class(Adapter, "R6ClassGenerator")
   expect_error(
     Adapter$new(),
     "Adapter parent class should not be called directly"

tests/testthat/test-CrulAdapter.R

@@ -1,20 +1,18 @@
-context("CrulAdapter")
-
 aa <- CrulAdapter$new()
 
 test_that("CrulAdapter bits are correct", {
   skip_on_cran()
 
-  expect_is(CrulAdapter, "R6ClassGenerator")
+  expect_s3_class(CrulAdapter, "R6ClassGenerator")
 
-  expect_is(aa, "CrulAdapter")
+  expect_s3_class(aa, "CrulAdapter")
   expect_null(aa$build_crul_request) # pulled out of object, so should be NULL
   expect_null(aa$build_crul_response) # pulled out of object, so should be NULL
-  expect_is(aa$disable, "function")
-  expect_is(aa$enable, "function")
-  expect_is(aa$handle_request, "function")
-  expect_is(aa$remove_stubs, "function")
-  expect_is(aa$name, "character")
+  expect_type(aa$disable, "closure")
+  expect_type(aa$enable, "closure")
+  expect_type(aa$handle_request, "closure")
+  expect_type(aa$remove_stubs, "closure")
+  expect_type(aa$name, "character")
 
   expect_equal(aa$name, "CrulAdapter")
 })
@@ -52,17 +50,16 @@ test_that("CrulAdapter: works when vcr is loaded but no cassette is inserted", {
   cli <- crul::HttpClient$new(hb())
 
   expect_silent(x <- cli$get("get"))
-  expect_is(x, "HttpResponse")
+  expect_s3_class(x, "HttpResponse")
 
   # works when empty cassette is loaded
   vcr::vcr_configure(dir = tempdir())
   vcr::insert_cassette("empty")
   expect_silent(x <- cli$get("get"))
   vcr::eject_cassette()
-  expect_is(x, "HttpResponse")
+  expect_s3_class(x, "HttpResponse")
 })
 
-context("CrulAdapter - with real data")
 test_that("CrulAdapter works", {
   skip_on_cran()
   skip_if_not_installed("vcr")
@@ -90,8 +87,8 @@ test_that("CrulAdapter works", {
 
   aa <- res$handle_request(crul_obj)
 
-  expect_is(res, "CrulAdapter")
-  expect_is(aa, "HttpResponse")
+  expect_s3_class(res, "CrulAdapter")
+  expect_s3_class(aa, "HttpResponse")
   expect_equal(aa$method, "get")
   expect_equal(aa$url, "http://localhost:9000/get")
 
@@ -109,17 +106,17 @@ test_that("CrulAdapter works", {
 
   aa <- res$handle_request(crul_obj)
 
-  expect_is(res, "CrulAdapter")
-  expect_is(aa, "HttpResponse")
+  expect_s3_class(res, "CrulAdapter")
+  expect_s3_class(aa, "HttpResponse")
   expect_equal(aa$method, "get")
   expect_equal(aa$url, "http://localhost:9000/get")
 
   # has response_headers and response_headers_all
   expect_equal(length(aa$response_headers), 1)
-  expect_is(aa$response_headers, "list")
+  expect_type(aa$response_headers, "list")
   expect_named(aa$response_headers, "user-agent")
   expect_equal(length(aa$response_headers_all), 1)
-  expect_is(aa$response_headers_all, "list")
+  expect_type(aa$response_headers_all, "list")
   expect_named(aa$response_headers_all, NULL)
   expect_named(aa$response_headers_all[[1]], "user-agent")
 
@@ -145,12 +142,12 @@ test_that("CrulAdapter works", {
 
   # has response_headers and response_headers_all
   expect_equal(length(aa$response_headers), 2)
-  expect_is(aa$response_headers, "list")
+  expect_type(aa$response_headers, "list")
   expect_equal(sort(names(aa$response_headers)), c("location", "status"))
   expect_equal(length(aa$response_headers_all), 1)
   expect_equal(length(aa$response_headers_all[[1]]), 2)
-  expect_is(aa$response_headers_all, "list")
-  expect_is(aa$response_headers_all[[1]], "list")
+  expect_type(aa$response_headers_all, "list")
+  expect_type(aa$response_headers_all[[1]], "list")
   expect_named(aa$response_headers_all, NULL)
   expect_equal(
     sort(names(aa$response_headers_all[[1]])),

tests/testthat/test-HashCounter.R

@@ -1,16 +1,16 @@
-context("HashCounter")
+
 
 test_that("HashCounter: structure", {
-  expect_is(HashCounter, "R6ClassGenerator")
+  expect_s3_class(HashCounter, "R6ClassGenerator")
 
   x <- HashCounter$new()
-  expect_is(x, "HashCounter")
+  expect_s3_class(x, "HashCounter")
 
-  expect_is(x$clone, "function")
-  expect_is(x$get, "function")
-  expect_is(x$put, "function")
+  expect_type(x$clone, "closure")
+  expect_type(x$get, "closure")
+  expect_type(x$put, "closure")
 
-  expect_is(x$hash, "list")
+  expect_type(x$hash, "list")
 })
 
 test_that("HashCounter: works as expected", {

tests/testthat/test-HttpLibAdapaterRegistry.R

@@ -1,16 +1,15 @@
-context("HttpLibAdapaterRegistry")
 
 test_that("HttpLibAdapaterRegistry: structure", {
-  expect_is(HttpLibAdapaterRegistry, "R6ClassGenerator")
+  expect_s3_class(HttpLibAdapaterRegistry, "R6ClassGenerator")
 
   aa <- HttpLibAdapaterRegistry$new()
 
-  expect_is(aa, "HttpLibAdapaterRegistry")
+  expect_s3_class(aa, "HttpLibAdapaterRegistry")
 
   expect_null(aa$adapters)
-  expect_is(aa$clone, "function")
-  expect_is(aa$print, "function")
-  expect_is(aa$register, "function")
+  expect_type(aa$clone, "closure")
+  expect_type(aa$print, "closure")
+  expect_type(aa$register, "closure")
 
   expect_output(print(aa), "HttpLibAdapaterRegistry")
 })
@@ -22,7 +21,7 @@ test_that("HttpLibAdapaterRegistry: behaves as expected", {
   aa$register(CrulAdapter$new())
 
   expect_length(aa$adapters, 1)
-  expect_is(aa$adapters[[1]], "CrulAdapter")
+  expect_s3_class(aa$adapters[[1]], "CrulAdapter")
   expect_equal(aa$adapters[[1]]$name, "CrulAdapter")
 
   expect_output(print(aa), "HttpLibAdapaterRegistry")
@@ -36,7 +35,7 @@ test_that("HttpLibAdapaterRegistry: behaves as expected", {
   aa$register(HttrAdapter$new())
 
   expect_length(aa$adapters, 1)
-  expect_is(aa$adapters[[1]], "HttrAdapter")
+  expect_s3_class(aa$adapters[[1]], "HttrAdapter")
   expect_equal(aa$adapters[[1]]$name, "HttrAdapter")
 
   expect_output(print(aa), "HttpLibAdapaterRegistry")
@@ -50,7 +49,7 @@ test_that("HttpLibAdapaterRegistry: behaves as expected", {
   aa$register(Httr2Adapter$new())
 
   expect_length(aa$adapters, 1)
-  expect_is(aa$adapters[[1]], "Httr2Adapter")
+  expect_s3_class(aa$adapters[[1]], "Httr2Adapter")
   expect_equal(aa$adapters[[1]]$name, "Httr2Adapter")
 
   expect_output(print(aa), "HttpLibAdapaterRegistry")

tests/testthat/test-Httr2Adapter.R

@@ -1,5 +1,3 @@
-context("Httr2Adapter")
-
 skip_if_not_installed("httr2")
 library("httr2")
 
@@ -8,16 +6,16 @@ aa <- Httr2Adapter$new()
 test_that("Httr2Adapter bits are correct", {
   skip_on_cran()
 
-  expect_is(Httr2Adapter, "R6ClassGenerator")
+  expect_s3_class(Httr2Adapter, "R6ClassGenerator")
 
-  expect_is(aa, "Httr2Adapter")
+  expect_s3_class(aa, "Httr2Adapter")
   expect_null(aa$build_httr_request) # pulled out of object, so should be NULL
   expect_null(aa$build_httr_response) # pulled out of object, so should be NULL
-  expect_is(aa$disable, "function")
-  expect_is(aa$enable, "function")
-  expect_is(aa$handle_request, "function")
-  expect_is(aa$remove_stubs, "function")
-  expect_is(aa$name, "character")
+  expect_type(aa$disable, "closure")
+  expect_type(aa$enable, "closure")
+  expect_type(aa$handle_request, "closure")
+  expect_type(aa$remove_stubs, "closure")
+  expect_type(aa$name, "character")
 
   expect_equal(aa$name, "Httr2Adapter")
 })
@@ -64,7 +62,6 @@ test_that("Httr2Adapter: works when vcr is loaded but no cassette is inserted",
 })
 
 
-context("Httr2Adapter: date slot")
 test_that("Httr2Adapter date slot works", {
   skip_on_cran()
   skip_if_not_installed("vcr")
@@ -79,7 +76,7 @@ test_that("Httr2Adapter date slot works", {
   x <- request(hb("/get")) %>% req_perform()
 
   # $headers$date is a different format
-  expect_is(x$headers$date, "character")
+  expect_type(x$headers$date, "character")
   expect_error(format(x$headers$date, "%Y-%m-%d %H:%M"), "invalid 'trim'")
 })
 
@@ -89,7 +86,6 @@ test_that("Httr2Adapter date slot works", {
 # httr2_obj <- z$request
 # save(httr2_obj, file = "tests/testthat/httr2_obj.rda", version = 2)
 
-context("Httr2Adapter: works with real data")
 test_that("Httr2Adapter works", {
   skip_on_cran()
   skip_if_not_installed("vcr")
@@ -117,8 +113,8 @@ test_that("Httr2Adapter works", {
 
   aa <- res$handle_request(httr2_obj)
 
-  expect_is(res, "Httr2Adapter")
-  expect_is(aa, "httr2_response")
+  expect_s3_class(res, "Httr2Adapter")
+  expect_s3_class(aa, "httr2_response")
   expect_null(aa$request$method)
   expect_equal(aa$url, hb("/get"))
 
@@ -135,8 +131,8 @@ test_that("Httr2Adapter works", {
 
   aa <- res$handle_request(httr2_obj)
 
-  expect_is(res, "Httr2Adapter")
-  expect_is(aa, "httr2_response")
+  expect_s3_class(res, "Httr2Adapter")
+  expect_s3_class(aa, "httr2_response")
   expect_null(aa$request$method)
   expect_equal(aa$url, hb("/get"))
 
@@ -191,7 +187,7 @@ test_that("Httr2Adapter works with req_auth_basic", {
   x <- request(hb("/basic-auth/foo/bar")) %>%
     req_auth_basic("foo", "bar") %>%
     req_perform()
-  expect_is(x, "httr2_response")
+  expect_s3_class(x, "httr2_response")
   expect_equal(
     jsonlite::fromJSON(rawToChar(x$body)),
     list(authenticated = TRUE, user = "foo")
@@ -209,7 +205,7 @@ test_that("Httr2Adapter works with req_auth_basic", {
   load("httr2_obj_auth.rda")
   zz <- Httr2Adapter$new()
   z <- zz$handle_request(httr2_obj_auth)
-  expect_is(z, "httr2_response")
+  expect_s3_class(z, "httr2_response")
   expect_equal(
     jsonlite::fromJSON(rawToChar(z$body)),
     list(foo = "bar")