remove all cpp tests

jrhub · Mar 11, 2024 · 2cd303b · 2cd303b
1 parent b309ea3
commit 2cd303b
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 51 deletions.
diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
@@ -1,3 +1,3 @@
 Version: 0.2.0
-Date: 2024-02-23 00:44:01 UTC
-SHA: ef7f48479c8a5dd2514cdf09fd47ac7d457d2fe9
+Date: 2024-02-23 21:50:02 UTC
+SHA: b309ea36d3261075ab00163bc06bb28fa91d6727
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -26,5 +26,6 @@ URL: https://github.com/jrhub/spinBayes
 BugReports: https://github.com/jrhub/spinBayes/issues
 RoxygenNote: 7.3.1
 Suggests: 
-    testthat (>= 2.1.0),
+    testthat (>= 3.0.0),
     covr
+Config/testthat/edition: 3
diff --git a/R/catch-routine-registration.R b/R/catch-routine-registration.R
diff --git a/spinBayes.pdf b/spinBayes.pdf
diff --git a/src/Makevars b/src/Makevars
@@ -8,7 +8,12 @@
 ##
 ## And with R 3.4.0, and RcppArmadillo 0.7.960.*, we turn C++11 on as OpenMP
 ## support within Armadillo prefers / requires it
-## CXX_STD = CXX11
+##
+## R 4.0.0 made C++11 the default, R 4.1.0 switched to C++14, R 4.3.0 to C++17
+## _In general_ we should no longer need to set a standard as any recent R
+## installation will do the right thing. Should you need it, uncomment it and
+## set the appropriate value, possibly CXX17.
+#CXX_STD = CXX11
 
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -8,7 +8,12 @@
 ##
 ## And with R 3.4.0, and RcppArmadillo 0.7.960.*, we turn C++11 on as OpenMP
 ## support within Armadillo prefers / requires it
-## CXX_STD = CXX11
+##
+## R 4.0.0 made C++11 the default, R 4.1.0 switched to C++14, R 4.3.0 to C++17
+## _In general_ we should no longer need to set a standard as any recent R
+## installation will do the right thing. Should you need it, uncomment it and
+## set the appropriate value, possibly CXX17.
+#CXX_STD = CXX11
 
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
@@ -373,8 +373,6 @@ BEGIN_RCPP
 END_RCPP
 }
 
-RcppExport SEXP run_testthat_tests(void);
-
 static const R_CallMethodDef CallEntries[] = {
     {"_spinBayes_BVCStr", (DL_FUNC) &_spinBayes_BVCStr, 28},
     {"_spinBayes_BVCStr_NoE", (DL_FUNC) &_spinBayes_BVCStr_NoE, 25},
@@ -386,7 +384,6 @@ static const R_CallMethodDef CallEntries[] = {
     {"_spinBayes_BVCNoStr_NoE", (DL_FUNC) &_spinBayes_BVCNoStr_NoE, 20},
     {"_spinBayes_BayesLasso", (DL_FUNC) &_spinBayes_BayesLasso, 24},
     {"_spinBayes_BayesRefit", (DL_FUNC) &_spinBayes_BayesRefit, 17},
-    {"run_testthat_tests", (DL_FUNC) &run_testthat_tests, 0},
     {NULL, NULL, 0}
 };
 

diff --git a/src/test-runner.cpp b/src/test-runner.cpp
diff --git a/src/test-utilities.cpp b/src/test-utilities.cpp
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/testing-design.html#sec-tests-files-overview
+# * https://testthat.r-lib.org/articles/special-files.html
+
 library(testthat)
 library(spinBayes)
 

diff --git a/tests/testthat/test-cpp.R b/tests/testthat/test-cpp.R