[rkward-cvs] SF.net SVN: rkward:[2823] trunk/rkward/tests

[tfry at users.sourceforge.net]

Revision: 2823
          http://rkward.svn.sourceforge.net/rkward/?rev=2823&view=rev
Author:   tfry
Date:     2010-04-19 20:40:59 +0000 (Mon, 19 Apr 2010)

Log Message:
-----------
require R2HTML package centrally for the plugin tests

Modified Paths:
--------------
    trunk/rkward/tests/analysis_plugins.R
    trunk/rkward/tests/distributions.R
    trunk/rkward/tests/import_export_plugins.R
    trunk/rkward/tests/item_response_theory.R
    trunk/rkward/tests/plots.R
    trunk/rkward/tests/rkward_application_tests.R
    trunk/rkward/tests/test_framework.R

Modified: trunk/rkward/tests/analysis_plugins.R
===================================================================
--- trunk/rkward/tests/analysis_plugins.R	2010-04-19 14:20:24 UTC (rev 2822)
+++ trunk/rkward/tests/analysis_plugins.R	2010-04-19 20:40:59 UTC (rev 2823)
@@ -7,7 +7,7 @@
 ## definition of the test suite
 suite <- new ("RKTestSuite", id="analysis_plugins",
 	# place here libraries that are required for *all* tests in this suite, or highly likely to be installed
-	libraries = c ("R2HTML", "datasets", "stats"),
+	libraries = c ("datasets", "stats"),
 	# initCalls are run *before* any tests. Use this to set up the environment
 	initCalls = list (
 		function () {

Modified: trunk/rkward/tests/distributions.R
===================================================================
--- trunk/rkward/tests/distributions.R	2010-04-19 14:20:24 UTC (rev 2822)
+++ trunk/rkward/tests/distributions.R	2010-04-19 20:40:59 UTC (rev 2823)
@@ -7,7 +7,7 @@
 ## definition of the test suite
 suite <- new ("RKTestSuite", id="distributions",
 	# place here libraries that are required for *all* tests in this suite, or highly likely to be installed
-	libraries = c ("R2HTML", "datasets", "stats"),
+	libraries = c ("datasets", "stats"),
 	# initCalls are run *before* any tests. Use this to set up the environment
 	initCalls = list (
 		function () {

Modified: trunk/rkward/tests/import_export_plugins.R
===================================================================
--- trunk/rkward/tests/import_export_plugins.R	2010-04-19 14:20:24 UTC (rev 2822)
+++ trunk/rkward/tests/import_export_plugins.R	2010-04-19 20:40:59 UTC (rev 2823)
@@ -7,7 +7,7 @@
 ## definition of the test suite
 suite <- new ("RKTestSuite", id="import_export_plugins",
 	# place here libraries that are required for *all* tests in this suite, or highly likely to be installed
-	libraries = c ("R2HTML", "datasets"),
+	libraries = c ("datasets"),
 	# initCalls are run *before* any tests. Use this to set up the environment
 	initCalls = list (
 		function () {

Modified: trunk/rkward/tests/item_response_theory.R
===================================================================
--- trunk/rkward/tests/item_response_theory.R	2010-04-19 14:20:24 UTC (rev 2822)
+++ trunk/rkward/tests/item_response_theory.R	2010-04-19 20:40:59 UTC (rev 2823)
@@ -3,7 +3,7 @@
 
 ## definition of the test suite
 suite <- new ("RKTestSuite", id="item_response_theory",
-	libraries = c ("R2HTML", "ltm", "eRm"),
+	libraries = c ("ltm", "eRm"),
         # initCalls are run *before* any tests. Use this to set up the environment
         initCalls = list (
                 function () {

Modified: trunk/rkward/tests/plots.R
===================================================================
--- trunk/rkward/tests/plots.R	2010-04-19 14:20:24 UTC (rev 2822)
+++ trunk/rkward/tests/plots.R	2010-04-19 20:40:59 UTC (rev 2823)
@@ -7,7 +7,7 @@
 ## definition of the test suite
 suite <- new ("RKTestSuite", id="plots",
 	# place here libraries that are required for *all* tests in this suite, or highly likely to be installed
-	libraries = c ("R2HTML", "datasets", "graphics"),
+	libraries = c ("datasets", "graphics"),
 	# initCalls are run *before* any tests. Use this to set up the environment
 	initCalls = list (
 		function () {

Modified: trunk/rkward/tests/rkward_application_tests.R
===================================================================
--- trunk/rkward/tests/rkward_application_tests.R	2010-04-19 14:20:24 UTC (rev 2822)
+++ trunk/rkward/tests/rkward_application_tests.R	2010-04-19 20:40:59 UTC (rev 2823)
@@ -7,7 +7,7 @@
 ## definition of the test suite
 suite <- new ("RKTestSuite", id="rkward_application_tests",
 	# place here libraries that are required for *all* tests in this suite, or highly likely to be installed
-	libraries = c("R2HTML"),
+	libraries = character (0),
 	# initCalls are run *before* any tests. Use this to set up the environment
 	initCalls = list (
 		function () {

Modified: trunk/rkward/tests/test_framework.R
===================================================================
--- trunk/rkward/tests/test_framework.R	2010-04-19 14:20:24 UTC (rev 2822)
+++ trunk/rkward/tests/test_framework.R	2010-04-19 20:40:59 UTC (rev 2823)
@@ -271,6 +271,9 @@
 
 ## Initialize test environment
 rktest.initializeEnvironment <- function () {
+	# Almost all tests depend on R2HTML, indirectly, so we should really assume it (or have the user install it) at the start
+	stopifnot (require (R2HTML))
+
 	# By default .rk.rerun.plugin.link() and .rk.make.hr() are silenced during the test runs
 	.rk.rerun.plugin.link <<- .rk.make.hr <<- function (...) { list (...) }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.