[Robast-commits] r942 - in branches/robast-1.1/pkg/RobAStBase: . tests

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Fri Jul 13 01:57:08 CEST 2018


Author: ruckdeschel
Date: 2018-07-13 01:57:08 +0200 (Fri, 13 Jul 2018)
New Revision: 942

Modified:
   branches/robast-1.1/pkg/RobAStBase/DESCRIPTION
   branches/robast-1.1/pkg/RobAStBase/NAMESPACE
   branches/robast-1.1/pkg/RobAStBase/tests/doRUnit.R
Log:
[RobAStBase] branch 1.1: first round...

Modified: branches/robast-1.1/pkg/RobAStBase/DESCRIPTION
===================================================================
--- branches/robast-1.1/pkg/RobAStBase/DESCRIPTION	2018-07-08 16:40:31 UTC (rev 941)
+++ branches/robast-1.1/pkg/RobAStBase/DESCRIPTION	2018-07-12 23:57:08 UTC (rev 942)
@@ -1,23 +1,22 @@
 Package: RobAStBase
-Version: 1.1
-Date: 2016-09-01
+Version: 1.1.0
+Date: 2018-07-08
 Title: Robust Asymptotic Statistics
 Description: Base S4-classes and functions for robust asymptotic statistics.
 Depends: R(>= 2.14.0), methods, rrcov, distr(>= 2.5.2), distrEx(>= 2.5), distrMod(>= 2.5.2),
         RandVar(>= 0.9.2)
 Suggests: ROptEst, RUnit (>= 0.4.26)
 Imports: startupmsg
-Authors at R: c(person("Matthias", "Kohl", role=c("cre", "cph"),
-        email="Matthias.Kohl at stamats.de"), person("Peter", "Ruckdeschel", role=c("aut",
-        "cph")), person("Mykhailo", "Pupashenko", role="ctb", comment="contributed wrapper
-        functions for diagnostic plots"), person("Gerald", "Kroisandt", role="ctb",
-        comment="contributed testing routines"), person("Peter", "Ruckdeschel", role=c("aut",
-        "cph")), person("R Core Team", role = c("ctb", "cph"), comment="for source file
-        'format.perc'"))
+Authors at R: c(person("Matthias", "Kohl", role=c("cre", "cph", "aut"),
+        email="Matthias.Kohl at stamats.de"), person("Peter", "Ruckdeschel",role=c("aut", "cph")),
+        person("Mykhailo", "Pupashenko", role="ctb", comment="contributed wrapper functions for
+        diagnostic plots"), person("Gerald", "Kroisandt", role="ctb", comment="contributed
+        testing routines"), person("R Core Team", role = c("ctb", "cph"), comment="for source
+        file 'format.perc'"))
 ByteCompile: yes
 License: LGPL-3
 Encoding: latin1
 URL: http://robast.r-forge.r-project.org/
 LastChangedDate: {$LastChangedDate$}
 LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 874
+SVNRevision: 940

Modified: branches/robast-1.1/pkg/RobAStBase/NAMESPACE
===================================================================
--- branches/robast-1.1/pkg/RobAStBase/NAMESPACE	2018-07-08 16:40:31 UTC (rev 941)
+++ branches/robast-1.1/pkg/RobAStBase/NAMESPACE	2018-07-12 23:57:08 UTC (rev 942)
@@ -85,4 +85,4 @@
 export("getRiskFctBV")
 export(".rescalefct",".plotRescaledAxis",".makedotsP",".makedotsLowLevel",".SelectOrderData")
 export(".merge.lists")
-export("InfoPlot", "ComparePlot", "PlotIC")
\ No newline at end of file
+export("InfoPlot", "ComparePlot", "PlotIC")

Modified: branches/robast-1.1/pkg/RobAStBase/tests/doRUnit.R
===================================================================
--- branches/robast-1.1/pkg/RobAStBase/tests/doRUnit.R	2018-07-08 16:40:31 UTC (rev 941)
+++ branches/robast-1.1/pkg/RobAStBase/tests/doRUnit.R	2018-07-12 23:57:08 UTC (rev 942)
@@ -1,61 +1,62 @@
-## unit tests will not be done if RUnit is not available
-if(require("RUnit", quietly=TRUE)) {
- 
-  ## --- Setup ---
- 
-  pkg <- "RobAStBase"
-
-  if((Sys.getenv("RCMDCHECK") == "")
-     || (Sys.getenv("RCMDCHECK") == "FALSE")) {
-    ## Path to unit tests for standalone running under Makefile (not R CMD check)
-    ## PKG/tests/../inst/unitTests
-    path <- file.path(getwd(), "..", "inst", "unitTests")
-  } else {
-    ## Path to unit tests for R CMD check
-    ## PKG.Rcheck/tests/../PKG/unitTests
-    path <- system.file(package=pkg, "unitTests")
-  }
-  cat("\nRunning unit tests\n")
-  print(list(pkg=pkg, getwd=getwd(), pathToUnitTests=path))
- 
-  library(package=pkg, character.only=TRUE)
- 
-  ## If desired, load the name space to allow testing of private functions
-  ## if (is.element(pkg, loadedNamespaces()))
-  ##     attach(loadNamespace(pkg), name=paste("namespace", pkg, sep=":"), pos=3)
-  ##
-  ## or simply call PKG:::myPrivateFunction() in tests
- 
-  ## --- Testing ---
- 
-  ## Define tests
-  testSuite <- defineTestSuite(name=paste(pkg, "unit testing"),
-                                          dirs=path)
-  ## Run
-  tests <- runTestSuite(testSuite)
- 
-  ## Default report name
-  pathReport <- file.path(path, "report")
- 
-  ## Report to stdout and text files
-  cat("------------------- UNIT TEST SUMMARY ---------------------\n\n")
-  printTextProtocol(tests, showDetails=FALSE)
-  printTextProtocol(tests, showDetails=FALSE,
-                    fileName=paste(pathReport, "Summary.txt", sep=""))
-  printTextProtocol(tests, showDetails=TRUE,
-                    fileName=paste(pathReport, ".txt", sep=""))
- 
-  ## Report to HTML file
-  printHTMLProtocol(tests, fileName=paste(pathReport, ".html", sep=""))
- 
-  ## Return stop() to cause R CMD check stop in case of
-  ##  - failures i.e. FALSE to unit tests or
-  ##  - errors i.e. R errors
-  tmp <- getErrors(tests)
-  if(tmp$nFail > 0 | tmp$nErr > 0) {
-    stop(paste("\n\nunit testing failed (#test failures: ", tmp$nFail,
-               ", #R errors: ",  tmp$nErr, ")\n\n", sep=""))
-  }
-} else {
-  warning("cannot run unit tests -- package RUnit is not available")
-}
+## unit tests will not be done if RUnit is not available
+if(require("RUnit", quietly=TRUE)) {
+ 
+  ## --- Setup ---
+ 
+  pkg <- "RobAStBase"
+
+  if((Sys.getenv("RCMDCHECK") == "")
+     || (Sys.getenv("RCMDCHECK") == "FALSE")) {
+    ## Path to unit tests for standalone running under Makefile (not R CMD check)
+    ## PKG/tests/../inst/unitTests
+    path <- file.path(getwd(), "..", "inst", "unitTests")
+  } else {
+    ## Path to unit tests for R CMD check
+    ## PKG.Rcheck/tests/../PKG/unitTests
+    path <- system.file(package=pkg, "unitTests")
+  }
+  cat("\nRunning unit tests\n")
+  print(list(pkg=pkg, getwd=getwd(), pathToUnitTests=path))
+ 
+  library(package=pkg, character.only=TRUE)
+ 
+  ## If desired, load the name space to allow testing of private functions
+  ## if (is.element(pkg, loadedNamespaces()))
+  ##     attach(loadNamespace(pkg), name=paste("namespace", pkg, sep=":"), pos=3)
+  ##
+  ## or simply call PKG:::myPrivateFunction() in tests
+ 
+  ## --- Testing ---
+  if(length(dir(path))){
+  ## Define tests
+  testSuite <- defineTestSuite(name=paste(pkg, "unit testing"),
+                                          dirs=path)
+  ## Run
+  tests <- runTestSuite(testSuite)
+ 
+  ## Default report name
+  pathReport <- file.path(path, "report")
+ 
+  ## Report to stdout and text files
+  cat("------------------- UNIT TEST SUMMARY ---------------------\n\n")
+  printTextProtocol(tests, showDetails=FALSE)
+  printTextProtocol(tests, showDetails=FALSE,
+                    fileName=paste(pathReport, "Summary.txt", sep=""))
+  printTextProtocol(tests, showDetails=TRUE,
+                    fileName=paste(pathReport, ".txt", sep=""))
+ 
+  ## Report to HTML file
+  printHTMLProtocol(tests, fileName=paste(pathReport, ".html", sep=""))
+ 
+  ## Return stop() to cause R CMD check stop in case of
+  ##  - failures i.e. FALSE to unit tests or
+  ##  - errors i.e. R errors
+  tmp <- getErrors(tests)
+  if(tmp$nFail > 0 | tmp$nErr > 0) {
+    stop(paste("\n\nunit testing failed (#test failures: ", tmp$nFail,
+               ", #R errors: ",  tmp$nErr, ")\n\n", sep=""))
+  }
+  }
+} else {
+  warning("cannot run unit tests -- package RUnit is not available")
+}



More information about the Robast-commits mailing list