[R-gregmisc-users] SF.net SVN: r-gregmisc:[1599] trunk/gdata/tests

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

Revision: 1599
          http://r-gregmisc.svn.sourceforge.net/r-gregmisc/?rev=1599&view=rev
Author:   warnes
Date:     2012-08-22 16:41:30 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
Add XLSX test for latin-1 characters, and look for them in their new
location in inst/xls/.

Modified Paths:
--------------
    trunk/gdata/tests/test.read.xls.R
    trunk/gdata/tests/test.read.xls.Rout.save

Removed Paths:
-------------
    trunk/gdata/tests/latin-1.xls

Deleted: trunk/gdata/tests/latin-1.xls
===================================================================
(Binary files differ)

Modified: trunk/gdata/tests/test.read.xls.R
===================================================================
--- trunk/gdata/tests/test.read.xls.R	2012-08-22 16:35:59 UTC (rev 1598)
+++ trunk/gdata/tests/test.read.xls.R	2012-08-22 16:41:30 UTC (rev 1599)
@@ -86,7 +86,14 @@
 
 ## Check handing of fileEncoding for latin-1 characters
 
-example.latin1 <- read.xls('latin-1.xls', fileEncoding='latin1')
+latin1File <- file.path(.path.package('gdata'),'xls', 'latin-1.xls')
+latin1FileX <- file.path(.path.package('gdata'),'xls', 'latin-1.xlsx')
 
+example.latin1 <- read.xls(latin1File, fileEncoding='latin1')
 
+if( 'XLSX' %in% xlsFormats() )
+  {
+    example.latin1.x <- read.xls(latin1FileX, fileEncoding='latin1')
+  }
 
+

Modified: trunk/gdata/tests/test.read.xls.Rout.save
===================================================================
--- trunk/gdata/tests/test.read.xls.Rout.save	2012-08-22 16:35:59 UTC (rev 1598)
+++ trunk/gdata/tests/test.read.xls.Rout.save	2012-08-22 16:41:30 UTC (rev 1599)
@@ -669,11 +669,18 @@
 > 
 > ## Check handing of fileEncoding for latin-1 characters
 > 
-> example.latin1 <- read.xls('latin-1.xls', fileEncoding='latin1')
+> latin1File <- file.path(.path.package('gdata'),'xls', 'latin-1.xls')
+> latin1FileX <- file.path(.path.package('gdata'),'xls', 'latin-1.xlsx')
 > 
+> example.latin1 <- read.xls(latin1File, fileEncoding='latin1')
 > 
+> if( 'XLSX' %in% xlsFormats() )
++   {
++     example.latin1.x <- read.xls(latin1FileX, fileEncoding='latin1')
++   }
 > 
 > 
+> 
 > proc.time()
    user  system elapsed 
-  3.256   0.392   3.788 
+  3.564   0.436   4.186 

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