switch over to testthat 3

wilkelab · Nov 26, 2020 · 1347723 · 1347723
1 parent e12e676
commit 1347723
Show file tree

Hide file tree

Showing 30 changed files with 587 additions and 28 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: gridtext
 Type: Package
 Title: Improved Text Rendering Support for 'Grid' Graphics
-Version: 0.1.1.9000
+Version: 0.1.2
 Authors@R: 
     person(
       given = "Claus O.",
@@ -25,6 +25,7 @@ Imports:
     rlang,
     Rcpp,
     RCurl,
+    systemfonts,
     png,
     jpeg,
     stringr,
@@ -41,6 +42,7 @@ LinkingTo:
 Encoding: UTF-8
 LazyData: true
 RoxygenNote: 7.0.2
+Config/testthat/edition: 3
 Roxygen: list(markdown = TRUE)
 SystemRequirements: C++11
 
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# gridtext 0.1.2
+
+- Fix build for testthat 3.0.
+
 # gridtext 0.1.1
 
 - `richtext_grob()` and `textbox_grob()` now gracefully handle empty strings

diff --git a/R/catch-routine-registration.R b/R/catch-routine-registration.R
@@ -2,5 +2,5 @@
 # 'tools::package_native_routine_registration_skeleton()' generates the required
 # registration info for the 'run_testthat_tests' symbol.
 (function() {
-  .Call("run_testthat_tests", PACKAGE = "gridtext")
+  .Call("run_testthat_tests", FALSE, PACKAGE = "gridtext")
 })
diff --git a/cran-comments.md b/cran-comments.md
@@ -1,9 +1,9 @@
-Minor fixes required for upcoming changes in R devel grid.
+This is a minor update making this package compatible with testthat 3.0.0.
 
 ## Test environments
 * ubuntu 14.04 (on travis-ci), devel and release
 * win-builder (devel and release)
-* local OS X install, R 3.6.0
+* R version 4.0.2 on x86_64-apple-darwin15.6.0 (64-bit) (local install)
 
 ## R CMD check results
 

diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -405,7 +405,7 @@ BEGIN_RCPP
 END_RCPP
 }
 
-RcppExport SEXP run_testthat_tests();
+RcppExport SEXP run_testthat_tests(SEXP);
 
 static const R_CallMethodDef CallEntries[] = {
     {"_gridtext_bl_make_null_box", (DL_FUNC) &_gridtext_bl_make_null_box, 2},
@@ -438,7 +438,7 @@ static const R_CallMethodDef CallEntries[] = {
     {"_gridtext_rect_grob", (DL_FUNC) &_gridtext_rect_grob, 6},
     {"_gridtext_roundrect_grob", (DL_FUNC) &_gridtext_roundrect_grob, 7},
     {"_gridtext_set_grob_coords", (DL_FUNC) &_gridtext_set_grob_coords, 3},
-    {"run_testthat_tests", (DL_FUNC) &run_testthat_tests, 0},
+    {"run_testthat_tests", (DL_FUNC) &run_testthat_tests, 1},
     {NULL, NULL, 0}
 };
 

diff --git a/src/test-runner.cpp b/src/test-runner.cpp
@@ -3,5 +3,6 @@
  * 'run_testthat_tests()' C routine that can be used to run the Catch unit tests
  * available in your package.
  */
+#define CATCH_CONFIG_RUNNER
 #define TESTTHAT_TEST_RUNNER
 #include <testthat.h>
diff --git a/tests/figs/aligned-heights.svg b/tests/figs/aligned-heights.svg
diff --git a/tests/figs/aligned-widths.svg b/tests/figs/aligned-widths.svg