turn on testthat 3e

MichaelChirico · MichaelChirico · commit 8e58a580eb1e · 2023-06-24T20:49:28.000-07:00
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -14,10 +14,11 @@ Imports:
 Suggests: 
     sf,
     sp,
-    testthat,
+    testthat (>= 3.0.0),
     knitr,
     rmarkdown,
     ggplot2
+testthat/config/edition: 3
 VignetteBuilder: knitr
 Encoding: UTF-8
 RoxygenNote: 7.2.3
diff --git a/tests/testthat.R b/tests/testthat.R
@@ -1,4 +1,6 @@
 library(testthat)
 library(geohashTools)
 
+# TODO(#40): activate this
+# options(warn = 2L)
 test_check('geohashTools')
diff --git a/tests/testthat/test-decode.R b/tests/testthat/test-decode.R
@@ -1,5 +1,3 @@
-context('Geohash decoder')
-
 test_that('geohash decoder works', {
   borobudur = 'qqwkex'
   akarenga = 'xpkjd5'
diff --git a/tests/testthat/test-encode.R b/tests/testthat/test-encode.R
@@ -1,5 +1,3 @@
-context('Geohash encoder')
-
 test_that('geohash encoder works', {
   y = 0.1234
   x = 5.6789
diff --git a/tests/testthat/test-gis-tools.R b/tests/testthat/test-gis-tools.R
@@ -1,5 +1,3 @@
-context('GIS tools')
-
 test_that('gh_to_sp works', {
   skip_if_not_installed('sp')
   mauritius = c('mk2u', 'mk2e', 'mk2g', 'mk35', 'mk3h',
diff --git a/tests/testthat/test-neighbors.R b/tests/testthat/test-neighbors.R
@@ -1,5 +1,3 @@
-context('Geohash neighborhood')
-
 test_that('geohash adjacency list works', {
   my_turtle_beach = 'w0zpp8'
   ty_turtle_beach = 'sws374'
diff --git a/tests/testthat/test-utils.R b/tests/testthat/test-utils.R
@@ -1,5 +1,3 @@
-context('Geohash utilities')
-
 test_that('gh_delta works', {
   expect_equal(gh_delta(0L), c(90.0, 180.0))
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-context('Geohash decoder')`
`2`		`-`
`3`	`1`	`test_that('geohash decoder works', {`
`4`	`2`	`borobudur = 'qqwkex'`
`5`	`3`	`akarenga = 'xpkjd5'`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-context('Geohash encoder')`
`2`		`-`
`3`	`1`	`test_that('geohash encoder works', {`
`4`	`2`	`y = 0.1234`
`5`	`3`	`x = 5.6789`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-context('GIS tools')`
`2`		`-`
`3`	`1`	`test_that('gh_to_sp works', {`
`4`	`2`	`skip_if_not_installed('sp')`
`5`	`3`	`mauritius = c('mk2u', 'mk2e', 'mk2g', 'mk35', 'mk3h',`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-context('Geohash neighborhood')`
`2`		`-`
`3`	`1`	`test_that('geohash adjacency list works', {`
`4`	`2`	`my_turtle_beach = 'w0zpp8'`
`5`	`3`	`ty_turtle_beach = 'sws374'`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-context('Geohash utilities')`
`2`		`-`
`3`	`1`	`test_that('gh_delta works', {`
`4`	`2`	`expect_equal(gh_delta(0L), c(90.0, 180.0))`
`5`	`3`