modified old RcppTestA package to testRcppPackage

eddelbuettel · eddelbuettel · commit 91eb1831f01f · 2014-11-02T10:47:14.000-06:00
updated test for source package slightly
diff --git a/inst/unitTests/RcppTestA/DESCRIPTION b/inst/unitTests/RcppTestA/DESCRIPTION
diff --git a/inst/unitTests/RcppTestA/NAMESPACE b/inst/unitTests/RcppTestA/NAMESPACE
diff --git a/inst/unitTests/RcppTestA/R/rcpp_hello_world.R b/inst/unitTests/RcppTestA/R/rcpp_hello_world.R
diff --git a/inst/unitTests/RcppTestA/src/rcpp_hello_world.cpp b/inst/unitTests/RcppTestA/src/rcpp_hello_world.cpp
diff --git a/inst/unitTests/runit.client.package.R b/inst/unitTests/runit.client.package.R
@@ -1,6 +1,6 @@
 #!/usr/bin/r -t
 #
-# Copyright (C) 2010 - 2012  Dirk Eddelbuettel and Romain Francois
+# Copyright (C) 2010 - 2014  Dirk Eddelbuettel and Romain Francois
 #
 # This file is part of Rcpp.
 #
@@ -22,28 +22,28 @@
 
 .runThisTest <- Sys.getenv("RunAllRcppTests") == "yes"
 
-.client.package <- function( pkg = "RcppTestA" ){
+.client.package <- function(pkg = "testRcppPackage") {
     td <- tempfile()
     cwd <- getwd()
-    dir.create( td )
-    file.copy( system.file( "unitTests", pkg, package = "Rcpp" ) , td, recursive = TRUE)
-    setwd( td )
-    on.exit( { setwd( cwd) ; unlink( td, recursive = TRUE ) } )
-    R <- shQuote( file.path( R.home( component = "bin" ), "R" ))
-    cmd <- paste( R , "CMD build", pkg )
-    system( cmd )
-    dir.create( "templib" )
-    install.packages( paste( pkg, "_1.0.tar.gz", sep = "" ), "templib", repos = NULL, type = "source" )
-    require( pkg, "templib", character.only = TRUE )
+    dir.create(td)
+    file.copy(system.file("unitTests", pkg, package = "Rcpp"), td, recursive = TRUE)
+    setwd(td)
+    on.exit( { setwd(cwd); unlink(td, recursive = TRUE) } )
+    R <- shQuote(file.path( R.home(component = "bin"), "R"))
+    cmd <- paste(R, "CMD build", pkg)
+    system(cmd)
+    dir.create("templib")
+    install.packages(paste0(pkg, "_1.0.tar.gz"), "templib", repos = NULL, type = "source")
+    require(pkg, lib.loc = "templib", character.only = TRUE)
+    hello_world <- get("rcpp_hello_world", asNamespace(pkg))
+    checkEquals(hello_world(), list(c("foo", "bar"), c(0.0, 1.0)),
+                msg = "code from client package")
 
-    hello_world <- get( "rcpp_hello_world", asNamespace( pkg ) )
-    checkEquals( hello_world(), list( c("foo", "bar"), c(0.0, 1.0) ), msg = "code from client package" )
-
-    checkException( .Call("hello_world_ex", PACKAGE = pkg ), msg = "exception in client package" )
+    checkException(.Call("hello_world_ex", PACKAGE = pkg), msg = "exception in client package")
 }
 
-if ( .runThisTest && ! .onWindows ) {
-    test.client.packageA <- function(){
-        .client.package( "RcppTestA" )
+if (.runThisTest && ! .onWindows) {
+    test.client.testRcppPackage <- function() {
+        .client.package("testRcppPackage")
     }
 }
diff --git a/inst/unitTests/testRcppPackage/DESCRIPTION b/inst/unitTests/testRcppPackage/DESCRIPTION
@@ -0,0 +1,12 @@
+Package: testRcppPackage
+Type: Package
+Title: Small Test Package for Rcpp and Part of Rcpp Unit Tests
+Version: 1.0
+Date: 2010-04-10
+Author: Dirk Eddelbuettel and Romain Francois
+Maintainer: Dirk Eddelbuettel <edd@debian.org>
+Description: Small test package uses as part of Rcpp unit tests
+License: GPL (>= 2)
+LazyLoad: yes
+Imports: Rcpp
+LinkingTo: Rcpp
diff --git a/inst/unitTests/testRcppPackage/NAMESPACE b/inst/unitTests/testRcppPackage/NAMESPACE
@@ -0,0 +1,2 @@
+useDynLib(testRcppPackage)
+import(Rcpp)
diff --git a/inst/unitTests/testRcppPackage/R/rcpp_hello_world.R b/inst/unitTests/testRcppPackage/R/rcpp_hello_world.R
@@ -0,0 +1,3 @@
+rcpp_hello_world <- function() {
+    .Call("rcpp_hello_world", PACKAGE = "testRcppPackage")
+}
diff --git a/inst/unitTests/testRcppPackage/debian/changelog b/inst/unitTests/testRcppPackage/debian/changelog
@@ -0,0 +1,9 @@
+r-cran-testrcpppackage (0.1.0-1) unstable; urgency=low
+
+  * Initial version
+  
+  * debian/control: Remove (Build-)Depends: on r-cran-rcpp as this package is
+    internal and just used for testing from source when the packaged R binary
+    may not be installed
+
+ -- Dirk Eddelbuettel <edd@debian.org>  Fri, 03 Oct 2014 08:25:46 -0500
diff --git a/inst/unitTests/testRcppPackage/debian/compat b/inst/unitTests/testRcppPackage/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/inst/unitTests/testRcppPackage/debian/control b/inst/unitTests/testRcppPackage/debian/control
@@ -0,0 +1,12 @@
+Source: r-cran-testrcpppackage
+Section: gnu-r
+Priority: optional
+Maintainer: Dirk Eddelbuettel <edd@debian.org>
+Build-Depends: debhelper (>= 7.0.0), r-base-dev (>= 3.1.1), cdbs
+Standards-Version: 3.9.6
+
+Package: r-cran-testrcpppackage
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${R:Depends}
+Description: GNU R package to test Rcpp during Unit Tests
+
diff --git a/inst/unitTests/testRcppPackage/debian/copyright b/inst/unitTests/testRcppPackage/debian/copyright
@@ -0,0 +1,42 @@
+This is the Debian GNU/Linux r-cran-testrcpppackage package of
+testRcppPackage, an internal test package for the Rcpp package.
+
+This package was created by Dirk Eddelbuettel <edd@debian.org>.
+The sources were taken from the main Rcpp source repository, they are also
+on thee main CRAN site
+	http://cran.r-project.org/src/contrib/
+and are also available from all CRAN mirrors as e.g.
+	http://cran.us.r-project.org/src/contrib/
+and GitHub at 
+	http://github.com/RcppCore/Rcpp
+
+The package was renamed from its upstream name 'testRcppPackage' to
+'r-cran-testrcpppackage' to fit the pattern of CRAN (and non-CRAN) packages for
+R.
+
+Files: *
+Copyright: 2010 - 2014  Dirk Eddelbuettel and Romain Francois
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2014  Dirk Eddelbuettel <edd@debian.org>
+License: GPL-2+
+
+
+On a Debian GNU/Linux system, the GPL license (version 2) is included
+in the file /usr/share/common-licenses/GPL-2.
+
+For reference, the upstream DESCRIPTION file is included below:
+
+  Package: testRcppPackage
+  Type: Package
+  Title: Small Test Package for Rcpp and Part of Rcpp Unit Tests
+  Version: 1.0
+  Date: 2010-04-10
+  Author: Dirk Eddelbuettel and Romain Francois
+  Maintainer: Dirk Eddelbuettel <edd@debian.org>
+  Description: Small test package uses as part of Rcpp unit tests
+  License: GPL (>= 2)
+  LazyLoad: yes
+  Depends: Rcpp
+  LinkingTo: Rcpp
diff --git a/inst/unitTests/testRcppPackage/debian/rules b/inst/unitTests/testRcppPackage/debian/rules
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+# 							-*- makefile -*-
+# debian/rules file for the Debian/GNU Linux testRcppPackage package
+# Copyright 2003 - 2014 by Dirk Eddelbuettel <edd@debian.org>
+
+include /usr/share/R/debian/r-cran.mk
diff --git a/inst/unitTests/testRcppPackage/debian/source/format b/inst/unitTests/testRcppPackage/debian/source/format
@@ -0,0 +1 @@
+1.0
diff --git a/inst/unitTests/testRcppPackage/man/testRcppPackage-package.Rd b/inst/unitTests/testRcppPackage/man/testRcppPackage-package.Rd
@@ -1,6 +1,6 @@
-\name{RcppTestA-package}
-\alias{RcppTestA-package}
-\alias{RcppTestA}
+\name{testRcppPackage-package}
+\alias{testRcppPackage-package}
+\alias{testRcppPackage}
 \docType{package}
 \title{
 Dummy package part of Rcpp unit tests
@@ -10,10 +10,10 @@ Dummy package part of Rcpp unit tests
 }
 \details{
 \tabular{ll}{
-Package: \tab RcppTestA\cr
+Package: \tab testRcppPackage\cr
 Type: \tab Package\cr
-Version: \tab 1.0\cr
-Date: \tab 2010-04-10\cr
+Version: \tab 0.1.0\cr
+Date: \tab 2014-11-02\cr
 License: \tab GPL (>= 2)\cr
 LazyLoad: \tab yes\cr
 }
diff --git a/inst/unitTests/testRcppPackage/src/rcpp_hello_world.cpp b/inst/unitTests/testRcppPackage/src/rcpp_hello_world.cpp
@@ -0,0 +1,19 @@
+#include "rcpp_hello_world.h"
+
+SEXP rcpp_hello_world(){
+    using namespace Rcpp ;
+    CharacterVector x = CharacterVector::create( "foo", "bar" )  ;
+    NumericVector y   = NumericVector::create( 0.0, 1.0 ) ;
+    List z = List::create( x, y ) ;
+    return z ;
+}
+
+SEXP hello_world_ex(){
+    try{
+        throw std::range_error( "boom" ) ;
+    } catch( std::exception& __ex__ ){
+        forward_exception_to_r( __ex__ ) ;
+    }
+    return R_NilValue ;
+}
+
diff --git a/inst/unitTests/testRcppPackage/src/rcpp_hello_world.h b/inst/unitTests/testRcppPackage/src/rcpp_hello_world.h
@@ -1,5 +1,5 @@
-#ifndef _RcppTestA_RCPP_HELLO_WORLD_H
-#define _RcppTestA_RCPP_HELLO_WORLD_H
+#ifndef _testRcppPackage_RCPP_HELLO_WORLD_H
+#define _testRcppPackage_RCPP_HELLO_WORLD_H
 
 #include <Rcpp.h>
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+useDynLib(testRcppPackage)`
	`2`	`+import(Rcpp)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+rcpp_hello_world <- function() {`
	`2`	`+ .Call("rcpp_hello_world", PACKAGE = "testRcppPackage")`
	`3`	`+}`