[R-gregmisc-users] SF.net SVN: r-gregmisc: [1125] trunk/SASxport/tests

[<wa...@us...>]

Revision: 1125
          http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1125&view=rev
Author:   warnes
Date:     2007-08-08 11:54:23 -0700 (Wed, 08 Aug 2007)

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

Modified Paths:
--------------
    trunk/SASxport/tests/Alfalfa_Test.R
    trunk/SASxport/tests/Alfalfa_Test.Rout.save
    trunk/SASxport/tests/cars.R
    trunk/SASxport/tests/cars.Rout.save
    trunk/SASxport/tests/datetime.xpt
    trunk/SASxport/tests/testDates.R
    trunk/SASxport/tests/test_fields.R
    trunk/SASxport/tests/test_fields.Rout.save
    trunk/SASxport/tests/xport.R
    trunk/SASxport/tests/xxx.R
    trunk/SASxport/tests/xxx.Rout.save

Modified: trunk/SASxport/tests/Alfalfa_Test.R
===================================================================
--- trunk/SASxport/tests/Alfalfa_Test.R	2007-08-08 18:54:00 UTC (rev 1124)
+++ trunk/SASxport/tests/Alfalfa_Test.R	2007-08-08 18:54:23 UTC (rev 1125)
@@ -19,4 +19,4 @@
 a.2 <- readBin( con="Alfalfa2.xpt", what=raw(), n=3600 )
 
 ## Test that the files are identical
-assert( all(a.1 == a.2) )
+SASxport:::assert( all(a.1 == a.2) )

Modified: trunk/SASxport/tests/Alfalfa_Test.Rout.save
===================================================================
--- trunk/SASxport/tests/Alfalfa_Test.Rout.save	2007-08-08 18:54:00 UTC (rev 1124)
+++ trunk/SASxport/tests/Alfalfa_Test.Rout.save	2007-08-08 18:54:23 UTC (rev 1125)
@@ -43,7 +43,7 @@
 > a.2 <- readBin( con="Alfalfa2.xpt", what=raw(), n=3600 )
 > 
 > ## Test that the files are identical
-> assert( all(a.1 == a.2) )
+> SASxport:::assert( all(a.1 == a.2) )
 > 
 > proc.time()
 [1] 0.939 0.103 1.212 0.000 0.000

Modified: trunk/SASxport/tests/cars.R
===================================================================
--- trunk/SASxport/tests/cars.R	2007-08-08 18:54:00 UTC (rev 1124)
+++ trunk/SASxport/tests/cars.R	2007-08-08 18:54:23 UTC (rev 1125)
@@ -22,4 +22,4 @@
 a.2 <- readBin( con="cars2.xpt", what=raw(), n=1e5)
 
 ## Test that the files are identical
-assert( all(a.1 == a.2) )
+SASxport:::assert( all(a.1 == a.2) )

Modified: trunk/SASxport/tests/cars.Rout.save
===================================================================
--- trunk/SASxport/tests/cars.Rout.save	2007-08-08 18:54:00 UTC (rev 1124)
+++ trunk/SASxport/tests/cars.Rout.save	2007-08-08 18:54:23 UTC (rev 1125)
@@ -62,7 +62,7 @@
 > a.2 <- readBin( con="cars2.xpt", what=raw(), n=1e5)
 > 
 > ## Test that the files are identical
-> assert( all(a.1 == a.2) )
+> SASxport:::assert( all(a.1 == a.2) )
 > 
 > proc.time()
 [1] 0.920 0.097 1.079 0.000 0.000

Modified: trunk/SASxport/tests/datetime.xpt
===================================================================
(Binary files differ)

Modified: trunk/SASxport/tests/testDates.R
===================================================================
--- trunk/SASxport/tests/testDates.R	2007-08-08 18:54:00 UTC (rev 1124)
+++ trunk/SASxport/tests/testDates.R	2007-08-08 18:54:23 UTC (rev 1125)
@@ -15,7 +15,7 @@
 print(temp)
 
 write.xport( DATETIME=temp, filename="datetime.xpt")
-temp2 <- read.xport(file="datetime.xpt")
+temp2 <- read.xport(file="datetime.xpt", names.tolower=FALSE)
 
 print(temp2)
 

Modified: trunk/SASxport/tests/test_fields.R
===================================================================
--- trunk/SASxport/tests/test_fields.R	2007-08-08 18:54:00 UTC (rev 1124)
+++ trunk/SASxport/tests/test_fields.R	2007-08-08 18:54:23 UTC (rev 1125)
@@ -4,4 +4,4 @@
 
 .C("doTest",PACKAGE="SASxport")
 
-## Successful completion means all assertions have been met
+## Successful completion means all SASxport:::assertions have been met

Modified: trunk/SASxport/tests/test_fields.Rout.save
===================================================================
--- trunk/SASxport/tests/test_fields.Rout.save	2007-08-08 18:54:00 UTC (rev 1124)
+++ trunk/SASxport/tests/test_fields.Rout.save	2007-08-08 18:54:23 UTC (rev 1125)
@@ -31,7 +31,7 @@
 > .C("doTest",PACKAGE="SASxport")
 list()
 > 
-> ## Successful completion means all assertions have been met
+> ## Successful completion means all SASxport:::assertions have been met
 > 
 > proc.time()
 [1] 0.843 0.093 0.925 0.000 0.000

Modified: trunk/SASxport/tests/xport.R
===================================================================
--- trunk/SASxport/tests/xport.R	2007-08-08 18:54:00 UTC (rev 1124)
+++ trunk/SASxport/tests/xport.R	2007-08-08 18:54:23 UTC (rev 1125)
@@ -1,9 +1,15 @@
 library(SASxport)
+
 lookup.xport("Alfalfa.xpt")
+
 Alfalfa <- read.xport("Alfalfa.xpt")
+
 summary(Alfalfa)
+
 ## test data provided by FR...@bi...
+
 lookup.xport("test.xpt")
 testdata <- read.xport("test.xpt")
 summary(testdata)
+
 q()

Modified: trunk/SASxport/tests/xxx.R
===================================================================
--- trunk/SASxport/tests/xxx.R	2007-08-08 18:54:00 UTC (rev 1124)
+++ trunk/SASxport/tests/xxx.R	2007-08-08 18:54:23 UTC (rev 1125)
@@ -18,11 +18,10 @@
             )
 
 # read the original SAS data file
-abc.SAS <- read.xport("xxx.xpt")
+abc.SAS <- read.xport("xxx.xpt", names.tolower=FALSE)
 
-## read.xport currently doesn't store the format and label attributes...
+## read.xport currently doesn't store the format attribute...
 attr(abc.SAS$X, 'format') <- 'date7.'
-attr(abc.SAS$Y, 'label')  <- 'character variable'
 
 # create a SAS XPORT file from the SAS data
 write.xport(abc=abc.SAS,
@@ -48,7 +47,7 @@
 a.1[1089] <- as.raw("0x2e")
 
 ## Test that the files are otherwise identical
-assert( all(a.1 == a.2) )
-assert( all(a.1 == a.3) )
+SASxport:::assert( all(a.1 == a.2) )
+SASxport:::assert( all(a.1 == a.3) )
 
 

Modified: trunk/SASxport/tests/xxx.Rout.save
===================================================================
--- trunk/SASxport/tests/xxx.Rout.save	2007-08-08 18:54:00 UTC (rev 1124)
+++ trunk/SASxport/tests/xxx.Rout.save	2007-08-08 18:54:23 UTC (rev 1125)
@@ -74,8 +74,8 @@
 > a.1[1089] <- as.raw("0x2e")
 > 
 > ## Test that the files are otherwise identical
-> assert( all(a.1 == a.2) )
-> assert( all(a.1 == a.3) )
+> SASxport:::assert( all(a.1 == a.2) )
+> SASxport:::assert( all(a.1 == a.3) )
 > 
 > 
 > 


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