Merge pull request #1033 from RcppCore/feature/better_test_messages

Feature/better test messages

Author: eddelbuettel

ChangeLog

@@ -1,6 +1,15 @@
 2019-12-08  Dirk Eddelbuettel  <[email protected]>
 
+	* tests/tinytest.R: Turn verbose tests on in dev and on Travis
+
 	* inst/tinytest/test_client_package.R: Finer-grained skip messages
+	* inst/tinytest/test_module_client_package.R: Idem
+	* inst/tinytest/test_expose_class.R: Idem
+	* inst/tinytest/test_interface.R: Idem
+	* inst/tinytest/test_rcpp_package_skeleton.R: Idem
+	* inst/tinytest/test_reference.R: Idem
+
+	* inst/tinytest/test_*.R: Streamlined initial test and sourceCpp call
 
 	* src/attributes.cpp: Remove dangling '#nocov end'
 

inst/tinytest/test_algorithm.R

@@ -16,12 +16,9 @@
 ##  You should have received a copy of the GNU General Public License
 ##  along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
+if (Sys.getenv("RunAllRcppTests") != "yes") exit_file("Set 'RunAllRcppTests' to 'yes' to run.")
 
-if (!.runThisTest) exit_file("Skipping 'test_algorithm.R'")
-
-library(Rcpp)
-sourceCpp("cpp/algorithm.cpp")
+Rcpp::sourceCpp("cpp/algorithm.cpp")
 
 #    test.sum <- function() {
 v <- c(1.0, 2.0, 3.0, 4.0, 5.0)

inst/tinytest/test_as.R

@@ -16,12 +16,9 @@
 ##  You should have received a copy of the GNU General Public License
 ##  along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
+if (Sys.getenv("RunAllRcppTests") != "yes") exit_file("Set 'RunAllRcppTests' to 'yes' to run.")
 
-if (!.runThisTest) exit_file("Skipping 'test_as.R'")
-
-library(Rcpp)
-sourceCpp("cpp/as.cpp")
+Rcpp::sourceCpp("cpp/as.cpp")
 
 #    test.as.int <- function(){
 expect_equal( as_int(10), 10L, info = "as<int>( REALSXP ) " )

inst/tinytest/test_attributes.R

@@ -16,12 +16,9 @@
 ##  You should have received a copy of the GNU General Public License
 ##  along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
+if (Sys.getenv("RunAllRcppTests") != "yes") exit_file("Set 'RunAllRcppTests' to 'yes' to run.")
 
-if (!.runThisTest) exit_file("Skipping 'test_attributes.R'")
-
-library(Rcpp)
-sourceCpp("cpp/attributes.cpp")
+Rcpp::sourceCpp("cpp/attributes.cpp")
 
 #test.attributes <- function() {
 expect_equal(comments_test(),

inst/tinytest/test_client_package.R

@@ -22,7 +22,7 @@
 .runThisTest <- Sys.getenv("RunAllRcppTests") == "yes" && Sys.getenv("RunVerboseRcppTests") == "yes"
 
 if (! .runThisTest) exit_file("Set 'RunVerboseRcppTests' and 'RunAllRcppTests' to 'yes' to run.")
-if (.onWindow)      exit_file("Skipping on Windows.'")
+if (.onWindows)     exit_file("Skipping on Windows.'")
 
 #.client.package <- function(pkg = "testRcppPackage") {
 td <- tempfile()

inst/tinytest/test_dataframe.R

@@ -16,12 +16,9 @@
 ##  You should have received a copy of the GNU General Public License
 ##  along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
+if (Sys.getenv("RunAllRcppTests") != "yes") exit_file("Set 'RunAllRcppTests' to 'yes' to run.")
 
-if (!.runThisTest) exit_file("Skipping 'test_dataframe.R'")
-
-library(Rcpp)
-sourceCpp("cpp/DataFrame.cpp")
+Rcpp::sourceCpp("cpp/DataFrame.cpp")
 
 #test.DataFrame.FromSEXP <- function() {
 DF <- data.frame(a=1:3, b=c("a","b","c"))

inst/tinytest/test_date.R

@@ -16,12 +16,9 @@
 ##  You should have received a copy of the GNU General Public License
 ##  along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
+if (Sys.getenv("RunAllRcppTests") != "yes") exit_file("Set 'RunAllRcppTests' to 'yes' to run.")
 
-if (!.runThisTest) exit_file("Skipping 'test_date.R'")
-
-library(Rcpp)
-sourceCpp("cpp/dates.cpp")
+Rcpp::sourceCpp("cpp/dates.cpp")
 
 #    test.Date.ctor.sexp <- function() {
 fun <- ctor_sexp

inst/tinytest/test_dispatch.R

@@ -18,12 +18,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
+if (Sys.getenv("RunAllRcppTests") != "yes") exit_file("Set 'RunAllRcppTests' to 'yes' to run.")
 
-if (!.runThisTest) exit_file("Skipping 'test_dispatch.R'")
-
-library(Rcpp)
-sourceCpp("cpp/dispatch.cpp")
+Rcpp::sourceCpp("cpp/dispatch.cpp")
 
 #    test.RawVector <- function() {
 x <- as.raw(0:9)

inst/tinytest/test_embedded_r.R

@@ -16,9 +16,7 @@
 ##  You should have received a copy of the GNU General Public License
 ##  along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
-
-if (!.runThisTest) exit_file("Skipping, set 'RunAllRcppTests=yes' to run.")
+if (Sys.getenv("RunAllRcppTests") != "yes") exit_file("Set 'RunAllRcppTests' to 'yes' to run.")
 
 library(Rcpp)
 

inst/tinytest/test_environments.R

@@ -16,12 +16,9 @@
 ##  You should have received a copy of the GNU General Public License
 ##  along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-.runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
+if (Sys.getenv("RunAllRcppTests") != "yes") exit_file("Set 'RunAllRcppTests' to 'yes' to run.")
 
-if (!.runThisTest) exit_file("Skipping 'test_environment.R'")
-
-library(Rcpp)
-sourceCpp("cpp/Environment.cpp")
+Rcpp::sourceCpp("cpp/Environment.cpp")
 
 #    test.environment.ls <- function(){
 e <- new.env( )