Merge pull request #416 from r-dbi/testthat-3e

test: `use_testthat(3)`
r-dbi · Nov 8, 2023 · 7d6454e · 7d6454e
2 parents 7048fae + e1e37ab
commit 7d6454e
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 17 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -35,7 +35,7 @@ Suggests:
     rmarkdown,
     rprojroot,
     RSQLite (>= 1.1-2),
-    testthat,
+    testthat (>= 3.0.0),
     vctrs,
     xml2
 VignetteBuilder: 
@@ -70,3 +70,4 @@ Config/Needs/website:
     sergeant,
     sparklyr,
     withr
+Config/testthat/edition: 3
diff --git a/tests/testthat.R b/tests/testthat.R
@@ -1,2 +1,12 @@
+# 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/testing-design.html#sec-tests-files-overview
+# * https://testthat.r-lib.org/articles/special-files.html
+
 library(testthat)
+library(DBI)
+
 test_check("DBI")
diff --git a/tests/testthat/test-arrow.R b/tests/testthat/test-arrow.R
@@ -1,5 +1,3 @@
-context("arrow")
-
 test_that("write arrow to sqlite", {
   skip_if_not_installed("nanoarrow")
   skip_if_not_installed("RSQLite")

diff --git a/tests/testthat/test-data-type.R b/tests/testthat/test-data-type.R
@@ -1,5 +1,3 @@
-context("dbDataType")
-
 test_that("dbDataType works on a data frame", {
   df <- data.frame(x = 1:10, y = runif(10))
   types <- dbDataType(MockDriver(), df)

diff --git a/tests/testthat/test-interpolate.R b/tests/testthat/test-interpolate.R
@@ -1,5 +1,3 @@
-context("sqlInterpolate")
-
 test_that("parameter names matched", {
   expect_equal(
     sqlInterpolate(ANSI(), "?a ?b", a = 1, b = 2),

diff --git a/tests/testthat/test-methods.R b/tests/testthat/test-methods.R
@@ -1,5 +1,3 @@
-context("methods")
-
 expect_ellipsis <- function(name, method) {
   sym <- as.name(name)
   eval(bquote({

diff --git a/tests/testthat/test-quote.R b/tests/testthat/test-quote.R
@@ -1,5 +1,3 @@
-context("quote")
-
 test_that("identifier", {
   expect_equal(dbQuoteIdentifier(ANSI(), character()), SQL(character()))
   expect_equal(dbQuoteIdentifier(ANSI(), "a"), SQL('"a"'))

diff --git a/tests/testthat/test-quoting.R b/tests/testthat/test-quoting.R
@@ -1,5 +1,3 @@
-context("Quoting")
-
 test_that("NA becomes NULL", {
   expect_equal(dbQuoteString(ANSI(), NA_character_), SQL("NULL"))
 })

diff --git a/tests/testthat/test-rownames.R b/tests/testthat/test-rownames.R
@@ -1,5 +1,3 @@
-context("Rowname translation")
-
 test_that("logical row names uses default name", {
   df <- data.frame(x = c(a = 1))
 

diff --git a/tests/testthat/test-sql-df.R b/tests/testthat/test-sql-df.R
@@ -1,5 +1,3 @@
-context("sqlData")
-
 test_that("NAs turn in NULLs", {
   df <- data.frame(
     x = c(1, NA),