[R-gregmisc-users] SF.net SVN: r-gregmisc:[1835] trunk/SASxport/tests
Brought to you by:
warnes
Menu
▾
▴
[R-gregmisc-users] SF.net SVN: r-gregmisc:[1835] trunk/SASxport/tests
|
From: <wa...@us...> - 2014-07-18 12:10:26
|
Revision: 1835
http://sourceforge.net/p/r-gregmisc/code/1835
Author: warnes
Date: 2014-07-18 12:10:22 +0000 (Fri, 18 Jul 2014)
Log Message:
-----------
Remove SASxport:::assert() and replace all uses with stopifnot()
Modified Paths:
--------------
trunk/SASxport/tests/Alfalfa_Test.Rout.save
trunk/SASxport/tests/Theoph.Rout.save
trunk/SASxport/tests/cars.Rout.save
trunk/SASxport/tests/testDates.Rout.save
trunk/SASxport/tests/testDuplicateNames.Rout.save
trunk/SASxport/tests/testEmpty.Rout.save
trunk/SASxport/tests/testExamples.Rout.save
trunk/SASxport/tests/testManyNames.Rout.save
trunk/SASxport/tests/testNegative.Rout.save
trunk/SASxport/tests/testNumeric.Rout.save
trunk/SASxport/tests/testUnnamedComponents.Rout.save
trunk/SASxport/tests/test_as_is.Rout.save
trunk/SASxport/tests/test_fields.Rout.save
trunk/SASxport/tests/xport.Rout.save
trunk/SASxport/tests/xxx.Rout.save
Modified: trunk/SASxport/tests/Alfalfa_Test.Rout.save
===================================================================
--- trunk/SASxport/tests/Alfalfa_Test.Rout.save 2014-07-18 12:08:03 UTC (rev 1834)
+++ trunk/SASxport/tests/Alfalfa_Test.Rout.save 2014-07-18 12:10:22 UTC (rev 1835)
@@ -34,7 +34,7 @@
format.pval, round.POSIXt, trunc.POSIXt, units
-Loaded SASxport version 1.4.1 (2014-07-16).
+Loaded SASxport version 1.4.2 (2014-07-17).
Type `?SASxport' for usage information.
@@ -57,8 +57,8 @@
> a.2 <- readBin( con="Alfalfa2.xpt", what=raw(), n=3600 )
>
> ## Test that the files are identical
-> SASxport:::assert( all(a.1 == a.2) )
+> stopifnot( all(a.1 == a.2) )
>
> proc.time()
user system elapsed
- 0.478 0.037 0.508
+ 0.487 0.038 0.517
Modified: trunk/SASxport/tests/Theoph.Rout.save
===================================================================
--- trunk/SASxport/tests/Theoph.Rout.save 2014-07-18 12:08:03 UTC (rev 1834)
+++ trunk/SASxport/tests/Theoph.Rout.save 2014-07-18 12:10:22 UTC (rev 1835)
@@ -36,7 +36,7 @@
format.pval, round.POSIXt, trunc.POSIXt, units
-Loaded SASxport version 1.4.1 (2014-07-16).
+Loaded SASxport version 1.4.2 (2014-07-17).
Type `?SASxport' for usage information.
@@ -51,10 +51,10 @@
> ## Test equality, handling the ordered factor Subject separately because
> ## SAS xport files don't provide a mechanism for storing factor orders
>
-> SASxport:::assert( all( as.character(Theoph$Subject) == as.character(Theoph.2$Subject) ))
-> SASxport:::assert( all(Theoph[,-1] == Theoph.2[,-1]) )
+> stopifnot( all( as.character(Theoph$Subject) == as.character(Theoph.2$Subject) ))
+> stopifnot( all(Theoph[,-1] == Theoph.2[,-1]) )
>
>
> proc.time()
user system elapsed
- 0.639 0.039 0.683
+ 0.692 0.045 0.747
Modified: trunk/SASxport/tests/cars.Rout.save
===================================================================
--- trunk/SASxport/tests/cars.Rout.save 2014-07-18 12:08:03 UTC (rev 1834)
+++ trunk/SASxport/tests/cars.Rout.save 2014-07-18 12:10:22 UTC (rev 1835)
@@ -31,7 +31,7 @@
format.pval, round.POSIXt, trunc.POSIXt, units
-Loaded SASxport version 1.4.1 (2014-07-16).
+Loaded SASxport version 1.4.2 (2014-07-17).
Type `?SASxport' for usage information.
@@ -74,8 +74,8 @@
> a.2 <- readBin( con="cars2.xpt", what=raw(), n=1e5)
>
> ## Test that the files are identical
-> SASxport:::assert( all(a.1 == a.2) )
+> stopifnot( all(a.1 == a.2) )
>
> proc.time()
user system elapsed
- 0.482 0.038 0.506
+ 0.496 0.038 0.524
Modified: trunk/SASxport/tests/testDates.Rout.save
===================================================================
--- trunk/SASxport/tests/testDates.Rout.save 2014-07-18 12:08:03 UTC (rev 1834)
+++ trunk/SASxport/tests/testDates.Rout.save 2014-07-18 12:10:22 UTC (rev 1835)
@@ -31,7 +31,7 @@
format.pval, round.POSIXt, trunc.POSIXt, units
-Loaded SASxport version 1.4.1 (2014-07-16).
+Loaded SASxport version 1.4.2 (2014-07-17).
Type `?SASxport' for usage information.
@@ -76,4 +76,4 @@
>
> proc.time()
user system elapsed
- 0.509 0.037 0.541
+ 0.506 0.038 0.534
Modified: trunk/SASxport/tests/testDuplicateNames.Rout.save
===================================================================
--- trunk/SASxport/tests/testDuplicateNames.Rout.save 2014-07-18 12:08:03 UTC (rev 1834)
+++ trunk/SASxport/tests/testDuplicateNames.Rout.save 2014-07-18 12:10:22 UTC (rev 1835)
@@ -31,7 +31,7 @@
format.pval, round.POSIXt, trunc.POSIXt, units
-Loaded SASxport version 1.4.1 (2014-07-16).
+Loaded SASxport version 1.4.2 (2014-07-17).
Type `?SASxport' for usage information.
@@ -84,4 +84,4 @@
>
> proc.time()
user system elapsed
- 0.534 0.038 0.569
+ 0.539 0.042 0.568
Modified: trunk/SASxport/tests/testEmpty.Rout.save
===================================================================
--- trunk/SASxport/tests/testEmpty.Rout.save 2014-07-18 12:08:03 UTC (rev 1834)
+++ trunk/SASxport/tests/testEmpty.Rout.save 2014-07-18 12:10:22 UTC (rev 1835)
@@ -31,7 +31,7 @@
format.pval, round.POSIXt, trunc.POSIXt, units
-Loaded SASxport version 1.4.1 (2014-07-16).
+Loaded SASxport version 1.4.2 (2014-07-17).
Type `?SASxport' for usage information.
@@ -84,4 +84,4 @@
>
> proc.time()
user system elapsed
- 0.555 0.040 0.589
+ 0.560 0.043 0.593
Modified: trunk/SASxport/tests/testExamples.Rout.save
===================================================================
--- trunk/SASxport/tests/testExamples.Rout.save 2014-07-18 12:08:03 UTC (rev 1834)
+++ trunk/SASxport/tests/testExamples.Rout.save 2014-07-18 12:10:22 UTC (rev 1835)
@@ -31,7 +31,7 @@
format.pval, round.POSIXt, trunc.POSIXt, units
-Loaded SASxport version 1.4.1 (2014-07-16).
+Loaded SASxport version 1.4.2 (2014-07-17).
Type `?SASxport' for usage information.
@@ -968,4 +968,4 @@
>
> proc.time()
user system elapsed
- 0.779 0.050 0.833
+ 0.770 0.057 0.816
Modified: trunk/SASxport/tests/testManyNames.Rout.save
===================================================================
--- trunk/SASxport/tests/testManyNames.Rout.save 2014-07-18 12:08:03 UTC (rev 1834)
+++ trunk/SASxport/tests/testManyNames.Rout.save 2014-07-18 12:10:22 UTC (rev 1835)
@@ -31,7 +31,7 @@
format.pval, round.POSIXt, trunc.POSIXt, units
-Loaded SASxport version 1.4.1 (2014-07-16).
+Loaded SASxport version 1.4.2 (2014-07-17).
Type `?SASxport' for usage information.
@@ -109,4 +109,4 @@
>
> proc.time()
user system elapsed
- 4.563 0.056 4.649
+ 4.964 0.063 5.039
Modified: trunk/SASxport/tests/testNegative.Rout.save
===================================================================
--- trunk/SASxport/tests/testNegative.Rout.save 2014-07-18 12:08:03 UTC (rev 1834)
+++ trunk/SASxport/tests/testNegative.Rout.save 2014-07-18 12:10:22 UTC (rev 1835)
@@ -31,7 +31,7 @@
format.pval, round.POSIXt, trunc.POSIXt, units
-Loaded SASxport version 1.4.1 (2014-07-16).
+Loaded SASxport version 1.4.2 (2014-07-17).
Type `?SASxport' for usage information.
@@ -50,7 +50,7 @@
1 1 -1
2 -1 1
>
-> SASxport:::assert(all(df1==df2))
+> stopifnot(all(df1==df2))
>
> df3 <- data.frame(x.continuous=seq(-100,100,by=0.5), x.integer=as.integer(seq(-100,100,by=0.5)) )
> write.xport(df3, file='df3.xpt')
@@ -58,8 +58,8 @@
In makeSASNames(colnames(df)) : Truncated 2 long names to 8 characters.
> df4 <- read.xport(file='df3.xpt')
>
-> SASxport:::assert(all(df3==df4))
+> stopifnot(all(df3==df4))
>
> proc.time()
user system elapsed
- 0.530 0.036 0.560
+ 0.610 0.045 0.644
Modified: trunk/SASxport/tests/testNumeric.Rout.save
===================================================================
--- trunk/SASxport/tests/testNumeric.Rout.save 2014-07-18 12:08:03 UTC (rev 1834)
+++ trunk/SASxport/tests/testNumeric.Rout.save 2014-07-18 12:10:22 UTC (rev 1835)
@@ -31,7 +31,7 @@
format.pval, round.POSIXt, trunc.POSIXt, units
-Loaded SASxport version 1.4.1 (2014-07-16).
+Loaded SASxport version 1.4.2 (2014-07-17).
Type `?SASxport' for usage information.
@@ -55,7 +55,7 @@
2: In xport.numeric(val) : IBM exponent overflow, generating NA
> df.2 <- read.xport(file='testNumeric.xpt')
>
-> SASxport:::assert( all(df == df.2, na.rm=TRUE) )
+> stopifnot( all(df == df.2, na.rm=TRUE) )
> df.2
INTS DBLS CHAR
1 NA NA <NA>
@@ -81,7 +81,7 @@
> df.2 <- read.xport(file='testNumeric.xpt')
>
>
-> SASxport:::assert(all(df==df.2,na.rm=TRUE))
+> stopifnot(all(df==df.2,na.rm=TRUE))
> df.2
INTS DBLS CHAR
1 NA NA <NA>
@@ -101,4 +101,4 @@
>
> proc.time()
user system elapsed
- 0.615 0.037 0.645
+ 0.628 0.042 0.660
Modified: trunk/SASxport/tests/testUnnamedComponents.Rout.save
===================================================================
--- trunk/SASxport/tests/testUnnamedComponents.Rout.save 2014-07-18 12:08:03 UTC (rev 1834)
+++ trunk/SASxport/tests/testUnnamedComponents.Rout.save 2014-07-18 12:10:22 UTC (rev 1835)
@@ -31,7 +31,7 @@
format.pval, round.POSIXt, trunc.POSIXt, units
-Loaded SASxport version 1.4.1 (2014-07-16).
+Loaded SASxport version 1.4.2 (2014-07-17).
Type `?SASxport' for usage information.
@@ -1444,7 +1444,7 @@
> failure <- try( write.xport(5,"a.xpt") ) #10.a
Error in write.xport(5, "a.xpt") :
'5', 'a.xpt' are not data.frame objects.
-> SASxport:::assert( "try-error" %in% class(failure) ) #10.b
+> stopifnot( "try-error" %in% class(failure) ) #10.b
> (tmp <- read.xport("a.xpt")) #10.c
$DATA1
RACE AGE D1 DT1 T1
@@ -1558,7 +1558,7 @@
> failure <- try( write.xport(list(a=5,b=6),"a.xpt") ) #11.a
Error in write.xport(list(a = 5, b = 6), "a.xpt") :
'list(a = 5, b = 6)', 'a.xpt' are not data.frame objects.
-> SASxport:::assert( "try-error" %in% class(failure) ) #11.b
+> stopifnot( "try-error" %in% class(failure) ) #11.b
> (tmp <- read.xport("a.xpt")) #10.c
$DATA1
RACE AGE D1 DT1 T1
@@ -2130,4 +2130,4 @@
>
> proc.time()
user system elapsed
- 1.648 0.070 1.728
+ 1.694 0.074 1.774
Modified: trunk/SASxport/tests/test_as_is.Rout.save
===================================================================
--- trunk/SASxport/tests/test_as_is.Rout.save 2014-07-18 12:08:03 UTC (rev 1834)
+++ trunk/SASxport/tests/test_as_is.Rout.save 2014-07-18 12:10:22 UTC (rev 1835)
@@ -31,7 +31,7 @@
format.pval, round.POSIXt, trunc.POSIXt, units
-Loaded SASxport version 1.4.1 (2014-07-16).
+Loaded SASxport version 1.4.2 (2014-07-17).
Type `?SASxport' for usage information.
@@ -65,7 +65,7 @@
- attr(*, "label")= chr " "
- attr(*, "SAStype")= chr " "
>
-> SASxport:::assert( class(x$STATE)=="factor" )
+> stopifnot( class(x$STATE)=="factor" )
>
> ## When as.is=TRUE, character variable "STATE" should be preserved as
> ## a character variable.
@@ -79,10 +79,10 @@
- attr(*, "label")= chr " "
- attr(*, "SAStype")= chr " "
>
-> SASxport:::assert( class(x$STATE)=="character" )
+> stopifnot( class(x$STATE)=="character" )
>
>
>
> proc.time()
user system elapsed
- 0.465 0.036 0.495
+ 0.471 0.038 0.498
Modified: trunk/SASxport/tests/test_fields.Rout.save
===================================================================
--- trunk/SASxport/tests/test_fields.Rout.save 2014-07-18 12:08:03 UTC (rev 1834)
+++ trunk/SASxport/tests/test_fields.Rout.save 2014-07-18 12:10:22 UTC (rev 1835)
@@ -31,7 +31,7 @@
format.pval, round.POSIXt, trunc.POSIXt, units
-Loaded SASxport version 1.4.1 (2014-07-16).
+Loaded SASxport version 1.4.2 (2014-07-17).
Type `?SASxport' for usage information.
@@ -42,8 +42,8 @@
> .C("doTest",PACKAGE="SASxport")
list()
>
-> ## Successful completion means all SASxport:::assertions have been met
+> ## Successful completion means all assertions have been met
>
> proc.time()
user system elapsed
- 0.404 0.035 0.431
+ 0.445 0.044 0.510
Modified: trunk/SASxport/tests/xport.Rout.save
===================================================================
--- trunk/SASxport/tests/xport.Rout.save 2014-07-18 12:08:03 UTC (rev 1834)
+++ trunk/SASxport/tests/xport.Rout.save 2014-07-18 12:10:22 UTC (rev 1835)
@@ -31,7 +31,7 @@
format.pval, round.POSIXt, trunc.POSIXt, units
-Loaded SASxport version 1.4.1 (2014-07-16).
+Loaded SASxport version 1.4.2 (2014-07-17).
Type `?SASxport' for usage information.
@@ -120,4 +120,4 @@
> q()
> proc.time()
user system elapsed
- 0.467 0.036 0.497
+ 0.566 0.051 0.604
Modified: trunk/SASxport/tests/xxx.Rout.save
===================================================================
--- trunk/SASxport/tests/xxx.Rout.save 2014-07-18 12:08:03 UTC (rev 1834)
+++ trunk/SASxport/tests/xxx.Rout.save 2014-07-18 12:10:22 UTC (rev 1835)
@@ -31,7 +31,7 @@
format.pval, round.POSIXt, trunc.POSIXt, units
-Loaded SASxport version 1.4.1 (2014-07-16).
+Loaded SASxport version 1.4.2 (2014-07-17).
Type `?SASxport' for usage information.
@@ -86,11 +86,11 @@
> a.1[1089] <- as.raw("0x2e")
>
> ## Test that the files are otherwise identical
-> SASxport:::assert( all(a.1 == a.2) )
-> SASxport:::assert( all(a.1 == a.3) )
+> stopifnot( all(a.1 == a.2) )
+> stopifnot( all(a.1 == a.3) )
>
>
>
> proc.time()
user system elapsed
- 0.454 0.038 0.482
+ 0.479 0.038 0.509
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
