[rkward-cvs] SF.net SVN: rkward:[3121] trunk/rkward/rkward/rbackend/rpackages/ rkwardtests

[m-eik at users.sourceforge.net]

Revision: 3121
          http://rkward.svn.sourceforge.net/rkward/?rev=3121&view=rev
Author:   m-eik
Date:     2010-10-12 14:36:15 +0000 (Tue, 12 Oct 2010)

Log Message:
-----------


Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rpackages/rkwardtests/DESCRIPTION
    trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rktest.makeplugintests.R
    trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rktest.runRKTestSuite.R
    trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rkwardtests-internal.R
    trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rkwardtests-package.R
    trunk/rkward/rkward/rbackend/rpackages/rkwardtests/man/rkwardtests-package.Rd

Modified: trunk/rkward/rkward/rbackend/rpackages/rkwardtests/DESCRIPTION
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkwardtests/DESCRIPTION	2010-10-11 09:14:33 UTC (rev 3120)
+++ trunk/rkward/rkward/rbackend/rpackages/rkwardtests/DESCRIPTION	2010-10-12 14:36:15 UTC (rev 3121)
@@ -2,7 +2,7 @@
 Type: Package
 Title: RKWard Plugin Test Suite Framework
 Version: 0.5.5
-Date: 2010-10-07
+Date: 2010-10-12
 Author: Thomas Friedrichsmeier, Meik Michalke
 Maintainer: Thomas Friedrichsmeier <thomas.friedrichsmeier at ruhr-uni-bochum.de>, Meik Michalke <meik.michalke at uni-duesseldorf.de>
 Depends: R (>= 2.9.0),methods

Modified: trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rktest.makeplugintests.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rktest.makeplugintests.R	2010-10-11 09:14:33 UTC (rev 3120)
+++ trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rktest.makeplugintests.R	2010-10-12 14:36:15 UTC (rev 3121)
@@ -33,6 +33,7 @@
 
   ## initialize
   rktest.initializeEnvironment()
+  on.exit(rktest.resetEnvironment(), add=TRUE)
 
   sink (file = outfile, append=append, type="output", split=TRUE)
   cat ("RKWard Version:\n")

Modified: trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rktest.runRKTestSuite.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rktest.runRKTestSuite.R	2010-10-11 09:14:33 UTC (rev 3120)
+++ trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rktest.runRKTestSuite.R	2010-10-12 14:36:15 UTC (rev 3121)
@@ -20,7 +20,13 @@
 #' }
 
 rktest.runRKTestSuite <- function (suite, basedir=getwd (), test.id=NULL) {
-	rktest.initializeEnvironment ()
+	# check wheter test environment is already set,
+	# otherwise initialize
+	if(!exists(".rktest.tmp.dump", where=globalenv())){
+	  rktest.initializeEnvironment()
+	  on.exit(rktest.resetEnvironment())
+	}
+
 	result <- new ("RKTestResult")		# FALSE by default
 
 	if (!inherits (suite, "RKTestSuite")) return (result)
@@ -30,7 +36,7 @@
 	rktest.cleanRKTestSuite (suite, basedir)
 
 	oldwd = getwd ()
-	on.exit (setwd (oldwd))
+	on.exit (setwd (oldwd), add=TRUE)
 	setwd (paste (basedir, suite at id, sep="/"))
 
 	if (length (suite at initCalls) > 0) {
@@ -52,7 +58,5 @@
 		for (i in 1:length (suite at postCalls)) try (suite at postCalls[[i]]())
 	}
 
-	rktest.resetEnvironment ()
-
 	result
 }

Modified: trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rkwardtests-internal.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rkwardtests-internal.R	2010-10-11 09:14:33 UTC (rev 3120)
+++ trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rkwardtests-internal.R	2010-10-12 14:36:15 UTC (rev 3121)
@@ -140,9 +140,9 @@
 	on.exit (setwd (oldwd))
 	setwd (paste (basedir, suite at id, sep="/"))
 
-	files <- list.files ()
+	files <-  list.files(pattern="\\.(rkcommands.R|rkout|messages.txt)$")
 	# do not delete the standards!
-	files <- grep ("^RKTestStandard\\..*\\.(messages.txt|rkcommands.R|rkout)$", files, value=TRUE, invert=TRUE)
+	files <- grep ("^RKTestStandard\\.", files, value=TRUE, invert=TRUE)
 
 	unlink (files)
 

Modified: trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rkwardtests-package.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rkwardtests-package.R	2010-10-11 09:14:33 UTC (rev 3120)
+++ trunk/rkward/rkward/rbackend/rpackages/rkwardtests/R/rkwardtests-package.R	2010-10-12 14:36:15 UTC (rev 3121)
@@ -4,7 +4,7 @@
 #' Package: \tab rkwardtests\cr
 #' Type: \tab Package\cr
 #' Version: \tab 0.5.5\cr
-#' Date: \tab 2010-10-07\cr
+#' Date: \tab 2010-10-12\cr
 #' Depends: \tab R (>= 2.9.0),methods\cr
 #' Encoding: \tab UTF-8\cr
 #' License: \tab GPL (>= 3)\cr

Modified: trunk/rkward/rkward/rbackend/rpackages/rkwardtests/man/rkwardtests-package.Rd
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkwardtests/man/rkwardtests-package.Rd	2010-10-11 09:14:33 UTC (rev 3120)
+++ trunk/rkward/rkward/rbackend/rpackages/rkwardtests/man/rkwardtests-package.Rd	2010-10-12 14:36:15 UTC (rev 3121)
@@ -7,7 +7,7 @@
 Package: \tab rkwardtests\cr
 Type: \tab Package\cr
 Version: \tab 0.5.5\cr
-Date: \tab 2010-10-07\cr
+Date: \tab 2010-10-12\cr
 Depends: \tab R (>= 2.9.0),methods\cr
 Encoding: \tab UTF-8\cr
 License: \tab GPL (>= 3)\cr


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