tinytest step eight: convert internal_function{,_cpp11}

eddelbuettel · eddelbuettel · commit 6027a55077d8 · 2019-11-24T11:42:18.000-06:00
diff --git a/ChangeLog b/ChangeLog
@@ -14,8 +14,10 @@
 	* inst/tinytest/test_exceptions_nocall.R: Idem
 	* inst/tinytest/test_expose_class.R: Idem
 	* inst/tinytest/test_function.R: Idem
-	* inst/tinytest/test_interface.R: Idem
-
+	* inst/tinytest/test_interface.R: Idem (but inactive for now)
+	* inst/tinytest/test_internal_function.R: Idem
+	* inst/tinytest/test_internal_function_cpp11.R: Idem
+	
 2019-11-23  Dirk Eddelbuettel  <edd@debian.org>
 
 	* docker/ci/Dockerfile: Add tinytest to ci Docker image
diff --git a/inst/tinytest/cpp/InternalFunction.cpp b/inst/tinytest/cpp/InternalFunction.cpp
diff --git a/inst/tinytest/cpp/InternalFunctionCPP11.cpp b/inst/tinytest/cpp/InternalFunctionCPP11.cpp
diff --git a/inst/tinytest/test_algorithm.R b/inst/tinytest/test_algorithm.R
@@ -18,7 +18,7 @@
 
 .runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
 
-if (.runThisTest) exit_file("Skipping 'test_algorithm.R'")
+if (!.runThisTest) exit_file("Skipping 'test_algorithm.R'")
 
 library(Rcpp)
 sourceCpp("cpp/algorithm.cpp")
diff --git a/inst/tinytest/test_as.R b/inst/tinytest/test_as.R
@@ -18,7 +18,7 @@
 
 .runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
 
-if (.runThisTest) exit_file("Skipping 'test_as.R'")
+if (!.runThisTest) exit_file("Skipping 'test_as.R'")
 
 library(Rcpp)
 sourceCpp("cpp/as.cpp")
diff --git a/inst/tinytest/test_attributes.R b/inst/tinytest/test_attributes.R
@@ -18,7 +18,7 @@
 
 .runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
 
-if (.runThisTest) exit_file("Skipping 'test_attributes.R'")
+if (!.runThisTest) exit_file("Skipping 'test_attributes.R'")
 
 library(Rcpp)
 sourceCpp("cpp/attributes.cpp")
diff --git a/inst/tinytest/test_dataframe.R b/inst/tinytest/test_dataframe.R
@@ -18,7 +18,7 @@
 
 .runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
 
-if (.runThisTest) exit_file("Skipping 'test_dataframe.R'")
+if (!.runThisTest) exit_file("Skipping 'test_dataframe.R'")
 
 library(Rcpp)
 sourceCpp("cpp/DataFrame.cpp")
diff --git a/inst/tinytest/test_date.R b/inst/tinytest/test_date.R
@@ -18,7 +18,7 @@
 
 .runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
 
-if (.runThisTest) exit_file("Skipping 'test_date.R'")
+if (!.runThisTest) exit_file("Skipping 'test_date.R'")
 
 library(Rcpp)
 sourceCpp("cpp/dates.cpp")
diff --git a/inst/tinytest/test_dispatch.R b/inst/tinytest/test_dispatch.R
@@ -20,7 +20,7 @@
 
 .runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
 
-if (.runThisTest) exit_file("Skipping 'test_dispatch.R'")
+if (!.runThisTest) exit_file("Skipping 'test_dispatch.R'")
 
 library(Rcpp)
 sourceCpp("cpp/dispatch.cpp")
diff --git a/inst/tinytest/test_embedded_r.R b/inst/tinytest/test_embedded_r.R
@@ -18,7 +18,7 @@
 
 .runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
 
-if (.runThisTest) exit_file("Skipping 'test_embedded_r.R'")
+if (!.runThisTest) exit_file("Skipping 'test_embedded_r.R'")
 
 library(Rcpp)
 
diff --git a/inst/tinytest/test_environments.R b/inst/tinytest/test_environments.R
@@ -18,7 +18,7 @@
 
 .runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
 
-if (.runThisTest) exit_file("Skipping 'test_environment.R'")
+if (!.runThisTest) exit_file("Skipping 'test_environment.R'")
 
 library(Rcpp)
 sourceCpp("cpp/Environment.cpp")
diff --git a/inst/tinytest/test_exceptions.R b/inst/tinytest/test_exceptions.R
@@ -18,7 +18,7 @@
 
 .runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
 
-if (.runThisTest) exit_file("Skipping 'test_exceptions.R'")
+if (!.runThisTest) exit_file("Skipping 'test_exceptions.R'")
 
 library(Rcpp)
 sourceCpp("cpp/exceptions.cpp")
diff --git a/inst/tinytest/test_exceptions_nocall.R b/inst/tinytest/test_exceptions_nocall.R
@@ -18,7 +18,7 @@
 
 .runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
 
-if (.runThisTest) exit_file("Skipping 'test_exceptions_nocall.R'")
+if (!.runThisTest) exit_file("Skipping 'test_exceptions_nocall.R'")
 
 library(Rcpp)
 sourceCpp("cpp/Exceptions_nocall.cpp")
diff --git a/inst/tinytest/test_expose_class.R b/inst/tinytest/test_expose_class.R
@@ -21,7 +21,7 @@
 ## override -- skipping test for now
 .runThisTest <- FALSE
 
-if (.runThisTest) exit_file("Skipping 'test_expose_class.R")
+if (!.runThisTest) exit_file("Skipping 'test_expose_class.R")
 
 library(Rcpp)
 
diff --git a/inst/tinytest/test_function.R b/inst/tinytest/test_function.R
@@ -18,7 +18,7 @@
 
 .runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
 
-if (.runThisTest) exit_file("Skipping 'test_function.R'")
+if (!.runThisTest) exit_file("Skipping 'test_function.R'")
 
 library(Rcpp)
 sourceCpp("cpp/Function.cpp")
diff --git a/inst/tinytest/test_interface.R b/inst/tinytest/test_interface.R
@@ -18,7 +18,10 @@
 
 .runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
 
-if (.runThisTest) exit_file("Skipping 'test_interface.R'")
+## override -- skipping test for now as noisy
+.runThisTest <- FALSE
+
+if (!.runThisTest) exit_file("Skipping 'test_interface.R'")
 
 library(Rcpp)
 
diff --git a/inst/tinytest/test_internal_function.R b/inst/tinytest/test_internal_function.R
@@ -0,0 +1,32 @@
+
+##  Copyright (C) 2014 - 2019  Christian Authmann
+##
+##  This file is part of Rcpp.
+##
+##  Rcpp is free software: you can redistribute it and/or modify it
+##  under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 2 of the License, or
+##  (at your option) any later version.
+##
+##  Rcpp is distributed in the hope that it will be useful, but
+##  WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  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 'test_internal_function.R'")
+
+library(Rcpp)
+sourceCpp("cpp/InternalFunction.cpp")
+
+#    test.internal_function_add <- function(){
+fun <- getAdd()
+expect_equal( fun(10,32), 42 )
+
+#    test.internal_function_concatenate <- function(){
+fun <- getConcatenate()
+expect_equal( fun("Hello"," World"), "Hello World" )
diff --git a/inst/tinytest/test_internal_function_cpp11.R b/inst/tinytest/test_internal_function_cpp11.R
@@ -0,0 +1,34 @@
+
+##  Copyright (C) 2014 - 2019  Christian Authmann
+##
+##  This file is part of Rcpp.
+##
+##  Rcpp is free software: you can redistribute it and/or modify it
+##  under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 2 of the License, or
+##  (at your option) any later version.
+##
+##  Rcpp is distributed in the hope that it will be useful, but
+##  WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  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 'test_internal_function.R'")
+
+if (!Rcpp:::capabilities()[["Full C++11 support"]]) exit_file("No C++11 support")
+
+library(Rcpp)
+sourceCpp("cpp/InternalFunctionCPP11.cpp")
+
+#    test.internal_function_add <- function(){
+fun <- getAdd4()
+expect_equal( fun(38), 42 )
+
+#    test.internal_function_concatenate <- function(){
+fun <- getConcatenate()
+expect_equal( fun("Hello"," World"), "Hello World" )
diff --git a/inst/unitTests/runit.InternalFunction.R b/inst/unitTests/runit.InternalFunction.R
diff --git a/inst/unitTests/runit.InternalFunctionCPP11.R b/inst/unitTests/runit.InternalFunctionCPP11.R
