[Roxygen-commits] r76 - in pkg/tests: . collate runit runit/collate
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Jul 22 20:29:18 CEST 2008
Author: pcd
Date: 2008-07-22 20:29:18 +0200 (Tue, 22 Jul 2008)
New Revision: 76
Added:
pkg/tests/runit.R
pkg/tests/runit/
pkg/tests/runit/Rd.R
pkg/tests/runit/collate/
pkg/tests/runit/collate/belt.R
pkg/tests/runit/collate/jacket.R
pkg/tests/runit/collate/pants.R
pkg/tests/runit/collate/shirt.R
pkg/tests/runit/collate/shoes.R
pkg/tests/runit/collate/socks.R
pkg/tests/runit/collate/tie.R
pkg/tests/runit/collate/undershorts.R
pkg/tests/runit/collate/watch.R
pkg/tests/runit/namespace.R
pkg/tests/runit/runit.all.R
Removed:
pkg/tests/Rd.R
pkg/tests/collate/belt.R
pkg/tests/collate/jacket.R
pkg/tests/collate/pants.R
pkg/tests/collate/shirt.R
pkg/tests/collate/shoes.R
pkg/tests/collate/socks.R
pkg/tests/collate/tie.R
pkg/tests/collate/undershorts.R
pkg/tests/collate/watch.R
pkg/tests/main.R
pkg/tests/namespace.R
pkg/tests/tests.R
Log:
reconcile runit with CMD CHECK
Deleted: pkg/tests/Rd.R
===================================================================
--- pkg/tests/Rd.R 2008-07-22 18:29:01 UTC (rev 75)
+++ pkg/tests/Rd.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -1,19 +0,0 @@
-#' description
-#'
-#' details
-#' @name test
-#' @title test
-#' @usage test
-#' @return test
-#' @references test
-#' @note test
-#' @author test@@example.com
-#' @seealso test
-#' @examples test
-#' @concept test
-#' @keywords test1 test2
-#' @aliases test1 test2
-#' @param p1 first param
-#' @param p2 second param
-#' @param p3 third param
-roxygen()
Deleted: pkg/tests/collate/belt.R
===================================================================
--- pkg/tests/collate/belt.R 2008-07-22 18:29:01 UTC (rev 75)
+++ pkg/tests/collate/belt.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -1,3 +0,0 @@
-#' @include collate/pants.R
-#' @include collate/shirt.R
-roxygen()
Deleted: pkg/tests/collate/jacket.R
===================================================================
--- pkg/tests/collate/jacket.R 2008-07-22 18:29:01 UTC (rev 75)
+++ pkg/tests/collate/jacket.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -1,3 +0,0 @@
-#' @include collate/tie.R
-#' @include collate/belt.R
-roxygen()
Deleted: pkg/tests/collate/pants.R
===================================================================
--- pkg/tests/collate/pants.R 2008-07-22 18:29:01 UTC (rev 75)
+++ pkg/tests/collate/pants.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -1,2 +0,0 @@
-#' @include collate/undershorts.R
-roxygen()
Deleted: pkg/tests/collate/shirt.R
===================================================================
--- pkg/tests/collate/shirt.R 2008-07-22 18:29:01 UTC (rev 75)
+++ pkg/tests/collate/shirt.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -1 +0,0 @@
-roxygen()
Deleted: pkg/tests/collate/shoes.R
===================================================================
--- pkg/tests/collate/shoes.R 2008-07-22 18:29:01 UTC (rev 75)
+++ pkg/tests/collate/shoes.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -1,4 +0,0 @@
-#' @include collate/socks.R
-#' @include collate/undershorts.R
-#' @include collate/pants.R
-roxygen()
Deleted: pkg/tests/collate/socks.R
===================================================================
--- pkg/tests/collate/socks.R 2008-07-22 18:29:01 UTC (rev 75)
+++ pkg/tests/collate/socks.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -1 +0,0 @@
-roxygen()
Deleted: pkg/tests/collate/tie.R
===================================================================
--- pkg/tests/collate/tie.R 2008-07-22 18:29:01 UTC (rev 75)
+++ pkg/tests/collate/tie.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -1,2 +0,0 @@
-#' @include collate/shirt.R
-roxygen()
Deleted: pkg/tests/collate/undershorts.R
===================================================================
--- pkg/tests/collate/undershorts.R 2008-07-22 18:29:01 UTC (rev 75)
+++ pkg/tests/collate/undershorts.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -1 +0,0 @@
-roxygen()
Deleted: pkg/tests/collate/watch.R
===================================================================
--- pkg/tests/collate/watch.R 2008-07-22 18:29:01 UTC (rev 75)
+++ pkg/tests/collate/watch.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -1 +0,0 @@
-roxygen()
Deleted: pkg/tests/main.R
===================================================================
--- pkg/tests/main.R 2008-07-22 18:29:01 UTC (rev 75)
+++ pkg/tests/main.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -1,12 +0,0 @@
-library(RUnit)
-
-source('../R/functional.R')
-source('../R/list.R')
-source('../R/string.R')
-source('../R/parse.R')
-source('../R/roclet.R')
-source('../R/collate.R')
-source('../R/namespace.R')
-source('../R/Rd.R')
-
-runTestFile('tests.R')
Deleted: pkg/tests/namespace.R
===================================================================
--- pkg/tests/namespace.R 2008-07-22 18:29:01 UTC (rev 75)
+++ pkg/tests/namespace.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -1,10 +0,0 @@
-#' @exportClass test
-#' @exportMethod test
-#' @export test
-#' @exportPattern test
-#' @S3method test
-#' @import test
-#' @importFrom test
-#' @importClassesFrom test
-#' @importMethodsFrom test
-roxygen()
Copied: pkg/tests/runit/Rd.R (from rev 75, pkg/tests/Rd.R)
===================================================================
--- pkg/tests/runit/Rd.R (rev 0)
+++ pkg/tests/runit/Rd.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -0,0 +1,19 @@
+#' description
+#'
+#' details
+#' @name test
+#' @title test
+#' @usage test
+#' @return test
+#' @references test
+#' @note test
+#' @author test@@example.com
+#' @seealso test
+#' @examples test
+#' @concept test
+#' @keywords test1 test2
+#' @aliases test1 test2
+#' @param p1 first param
+#' @param p2 second param
+#' @param p3 third param
+roxygen()
Added: pkg/tests/runit/collate/belt.R
===================================================================
--- pkg/tests/runit/collate/belt.R (rev 0)
+++ pkg/tests/runit/collate/belt.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -0,0 +1,3 @@
+#' @include runit/collate/pants.R
+#' @include runit/collate/shirt.R
+roxygen()
Added: pkg/tests/runit/collate/jacket.R
===================================================================
--- pkg/tests/runit/collate/jacket.R (rev 0)
+++ pkg/tests/runit/collate/jacket.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -0,0 +1,3 @@
+#' @include runit/collate/tie.R
+#' @include runit/collate/belt.R
+roxygen()
Added: pkg/tests/runit/collate/pants.R
===================================================================
--- pkg/tests/runit/collate/pants.R (rev 0)
+++ pkg/tests/runit/collate/pants.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -0,0 +1,2 @@
+#' @include runit/collate/undershorts.R
+roxygen()
Copied: pkg/tests/runit/collate/shirt.R (from rev 75, pkg/tests/collate/shirt.R)
===================================================================
--- pkg/tests/runit/collate/shirt.R (rev 0)
+++ pkg/tests/runit/collate/shirt.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -0,0 +1 @@
+roxygen()
Added: pkg/tests/runit/collate/shoes.R
===================================================================
--- pkg/tests/runit/collate/shoes.R (rev 0)
+++ pkg/tests/runit/collate/shoes.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -0,0 +1,4 @@
+#' @include runit/collate/socks.R
+#' @include runit/collate/undershorts.R
+#' @include runit/collate/pants.R
+roxygen()
Copied: pkg/tests/runit/collate/socks.R (from rev 75, pkg/tests/collate/socks.R)
===================================================================
--- pkg/tests/runit/collate/socks.R (rev 0)
+++ pkg/tests/runit/collate/socks.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -0,0 +1 @@
+roxygen()
Added: pkg/tests/runit/collate/tie.R
===================================================================
--- pkg/tests/runit/collate/tie.R (rev 0)
+++ pkg/tests/runit/collate/tie.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -0,0 +1,2 @@
+#' @include runit/collate/shirt.R
+roxygen()
Copied: pkg/tests/runit/collate/undershorts.R (from rev 75, pkg/tests/collate/undershorts.R)
===================================================================
--- pkg/tests/runit/collate/undershorts.R (rev 0)
+++ pkg/tests/runit/collate/undershorts.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -0,0 +1 @@
+roxygen()
Copied: pkg/tests/runit/collate/watch.R (from rev 75, pkg/tests/collate/watch.R)
===================================================================
--- pkg/tests/runit/collate/watch.R (rev 0)
+++ pkg/tests/runit/collate/watch.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -0,0 +1 @@
+roxygen()
Copied: pkg/tests/runit/namespace.R (from rev 75, pkg/tests/namespace.R)
===================================================================
--- pkg/tests/runit/namespace.R (rev 0)
+++ pkg/tests/runit/namespace.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -0,0 +1,10 @@
+#' @exportClass test
+#' @exportMethod test
+#' @export test
+#' @exportPattern test
+#' @S3method test
+#' @import test
+#' @importFrom test
+#' @importClassesFrom test
+#' @importMethodsFrom test
+roxygen()
Copied: pkg/tests/runit/runit.all.R (from rev 75, pkg/tests/tests.R)
===================================================================
--- pkg/tests/runit/runit.all.R (rev 0)
+++ pkg/tests/runit/runit.all.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -0,0 +1,55 @@
+test.namespace <- function() {
+ roclet <- make.namespace.roclet()
+ checkEquals(capture.output(roclet$parse('runit/namespace.R')),
+ c('exportClasses(test)',
+ 'exportMethods(test)',
+ 'export(test)',
+ 'exportPattern(test)',
+ 'S3method(test)',
+ 'import(test)',
+ 'importFrom(test)',
+ 'importClassesFrom(test)',
+ 'importMethodsFrom(test)'))
+}
+
+test.Rd <- function() {
+ roclet <- make.Rd.roclet()
+ checkEquals(capture.output(roclet$parse('runit/Rd.R')),
+ c('\\description{description}',
+ '\\details{details}',
+ '\\name{test}',
+ '\\title{test}',
+ '\\usage{test}',
+ '\\value{test}',
+ '\\references{test}',
+ '\\note{test}',
+ '\\author{test at example.com}',
+ '\\seealso{test}',
+ '\\examples{test}',
+ '\\concept{test}',
+ '\\keyword{test1}',
+ '\\keyword{test2}',
+ '\\alias{test1}',
+ '\\alias{test2}',
+ '\\arguments{\\item{p1}{first param}',
+ '\\item{p2}{second param}',
+ '\\item{p3}{third param}}'))
+}
+
+test.collate <- function() {
+ roclet <- make.collate.roclet()
+ checkEquals(capture.output(roclet$parse('runit/collate/belt.R',
+ 'runit/collate/jacket.R',
+ 'runit/collate/pants.R',
+ 'runit/collate/shirt.R',
+ 'runit/collate/shoes.R',
+ 'runit/collate/socks.R',
+ 'runit/collate/tie.R',
+ 'runit/collate/undershorts.R',
+ 'runit/collate/watch.R')),
+ paste('Collate: runit/collate/undershorts.R',
+ 'runit/collate/pants.R runit/collate/belt.R',
+ 'runit/collate/shirt.R runit/collate/tie.R',
+ 'runit/collate/jacket.R runit/collate/socks.R',
+ 'runit/collate/shoes.R runit/collate/watch.R'))
+}
Added: pkg/tests/runit.R
===================================================================
--- pkg/tests/runit.R (rev 0)
+++ pkg/tests/runit.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -0,0 +1,9 @@
+if (require('RUnit')) {
+ library(roxygen)
+ roclets <- defineTestSuite('roclets', 'runit')
+ results <- runTestSuite(roclets)
+ printTextProtocol(results)
+ errors <- getErrors(results)
+ if (errors$nFail > 0 || errors$nErr > 0)
+ stop('roclet unit suite failed')
+}
Deleted: pkg/tests/tests.R
===================================================================
--- pkg/tests/tests.R 2008-07-22 18:29:01 UTC (rev 75)
+++ pkg/tests/tests.R 2008-07-22 18:29:18 UTC (rev 76)
@@ -1,57 +0,0 @@
-cat('Try, for instance, `R --slave < main.R\' to run the tests.',
- '\n')
-
-test.namespace <- function() {
- roclet <- make.namespace.roclet()
- checkEquals(capture.output(roclet$parse('namespace.R')),
- c('exportClasses(test)',
- 'exportMethods(test)',
- 'export(test)',
- 'exportPattern(test)',
- 'S3method(test)',
- 'import(test)',
- 'importFrom(test)',
- 'importClassesFrom(test)',
- 'importMethodsFrom(test)'))
-}
-
-test.Rd <- function() {
- roclet <- make.Rd.roclet()
- checkEquals(capture.output(roclet$parse('Rd.R')),
- c('\\description{description}',
- '\\details{details}',
- '\\name{test}',
- '\\title{test}',
- '\\usage{test}',
- '\\value{test}',
- '\\references{test}',
- '\\note{test}',
- '\\author{test at example.com}',
- '\\seealso{test}',
- '\\examples{test}',
- '\\concept{test}',
- '\\keyword{test1}',
- '\\keyword{test2}',
- '\\alias{test1}',
- '\\alias{test2}',
- '\\arguments{\\item{p1}{first param}',
- '\\item{p2}{second param}',
- '\\item{p3}{third param}}'))
-}
-
-test.collate <- function() {
- roclet <- make.collate.roclet()
- checkEquals(capture.output(roclet$parse('collate/belt.R',
- 'collate/jacket.R',
- 'collate/pants.R',
- 'collate/shirt.R',
- 'collate/shoes.R',
- 'collate/socks.R',
- 'collate/tie.R',
- 'collate/undershorts.R',
- 'collate/watch.R')),
- paste('collate collate/undershorts.R collate/pants.R',
- 'collate/belt.R collate/shirt.R collate/tie.R',
- 'collate/jacket.R collate/socks.R collate/shoes.R',
- 'collate/watch.R'))
-}
More information about the Roxygen-commits
mailing list