r-dbi · krlmlr · Oct 15, 2022 · Oct 15, 2022 · Oct 15, 2022 · Oct 15, 2022
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -43,10 +43,10 @@ Imports:
 Suggests: 
  callr,
  covr,
- DBItest (>= 1.7.1),
+ DBItest (>= 1.7.2.9001),
  knitr,
  rmarkdown,
- testthat
+ testthat (>= 3.0.0)
 LinkingTo: 
  plogr (>= 0.2.0),
  Rcpp
@@ -116,3 +116,6 @@ Collate:
  'utils.R'
 Config/autostyle/scope: line_breaks
 Config/autostyle/strict: false
+Config/testthat/edition: 3
+Remotes: 
+ r-dbi/DBItest
diff --git a/tests/testthat.R b/tests/testthat.R
@@ -1,3 +1,11 @@
+# This file is part of the standard setup for testthat.
+# It is recommended that you do not modify it.
+#
+# Where should you do additional test configuration?
+# Learn more about the roles of various files in:
+# * https://r-pkgs.org/tests.html
+# * https://testthat.r-lib.org/reference/test_package.html#special-files
+
 library(testthat)
 library(RPostgres)
 

diff --git a/tests/testthat/test-bigint.R b/tests/testthat/test-bigint.R
@@ -1,5 +1,3 @@
-context("bigint")
-
 test_that("integer", {
  con <- postgresDefault(bigint = "integer")
  on.exit(dbDisconnect(con))

diff --git a/tests/testthat/test-checkInterrupts.R b/tests/testthat/test-checkInterrupts.R
@@ -1,5 +1,3 @@
-context("checkInterrupts")
-
 test_that("check_interrupts = TRUE works with queries < 1 second", {
  con <- postgresDefault(check_interrupts = TRUE)
  time <- system.time(

diff --git a/tests/testthat/test-data-type.R b/tests/testthat/test-data-type.R
@@ -1,5 +1,3 @@
-context("dbDataType")
-
 # Taken from DBI
 test_that("dbDataType works on a data frame", {
  con <- postgresDefault()

diff --git a/tests/testthat/test-dbConnect.R b/tests/testthat/test-dbConnect.R
@@ -1,5 +1,3 @@
-context("Connection")
-
 test_that("querying closed connection throws error", {
  db <- postgresDefault()
  dbDisconnect(db)

diff --git a/tests/testthat/test-dbGetQuery.R b/tests/testthat/test-dbGetQuery.R
@@ -1,5 +1,3 @@
-context("dbGetQuery")
-
 test_that("special characters work", {
  con <- postgresDefault()
 

diff --git a/tests/testthat/test-dbQuoteIdentifier.R b/tests/testthat/test-dbQuoteIdentifier.R
@@ -1,5 +1,3 @@
-context("dbQuoteIdentifier")
-
 test_that("quoting string", {
  con <- postgresDefault()
 

diff --git a/tests/testthat/test-dbWriteTable.R b/tests/testthat/test-dbWriteTable.R
@@ -1,5 +1,3 @@
-context("dbWriteTable")
-
 if (postgresHasDefault()) {
 
  with_database_connection({

diff --git a/tests/testthat/test-encoding.R b/tests/testthat/test-encoding.R
@@ -1,5 +1,3 @@
-context("Encoding")
-
 # Specific to RPostgres
 test_that("NAs encoded as NULLs", {
  expect_equal(encode_vector(NA), "\\N")

diff --git a/tests/testthat/test-isTransacting.R b/tests/testthat/test-isTransacting.R
@@ -1,5 +1,3 @@
-context("isTransacting")
-
 test_that("isTransacting detects transactions correctly", {
  skip_on_cran()
  con <- postgresDefault()

diff --git a/tests/testthat/test-transactions.R b/tests/testthat/test-transactions.R
@@ -1,5 +1,3 @@
-context("transactions")
-
 test_that("autocommit", {
  skip_on_cran()
  con <- postgresDefault()

diff --git a/tests/testthat/test-types.R b/tests/testthat/test-types.R
@@ -1,7 +1,5 @@
-context("exotic types")
-
 test_that("can manipulate classes", {
- expect_is(set_class(1, "A"), "A")
+ expect_s3_class(set_class(1, "A"), "A")
 })
 
 test_that("dbColumnInfo() knows about typnames", {
@@ -12,7 +10,7 @@ test_that("dbColumnInfo() knows about typnames", {
  expect_equal(dbColumnInfo(rs)[[".typname"]], c("int4", "json"))
 
  res <- dbFetch(rs)
- expect_is(res$js, "pq_json")
+ expect_s3_class(res$js, "pq_json")
 
  dbClearResult(rs)
 })
diff --git a/tests/testthat/test-waitForNotify.R b/tests/testthat/test-waitForNotify.R
@@ -1,5 +1,3 @@
-context("waitForNotify")
-
 test_that("WaitForNotify without anything to do returns NULL", {
  db <- postgresDefault()
  n <- RPostgres::postgresWaitForNotify(db, 1)