[R-gregmisc-commits] r2054 - pkg/gdata/tests

[noreply at r-forge.r-project.org]

Author: warnes
Date: 2015-06-30 00:39:55 +0200 (Tue, 30 Jun 2015)
New Revision: 2054

Modified:
   pkg/gdata/tests/test.humanReadable.Rout.save
   pkg/gdata/tests/test.read.xls.R
   pkg/gdata/tests/test.read.xls.Rout.save
   pkg/gdata/tests/test.reorder.factor.Rout.save
   pkg/gdata/tests/tests.write.fwf.Rout.save
Log:
Add note for R CMD check to help reviewers not freak out when diffs occur because of absence of a PERL library needed to support XLSX files.

Modified: pkg/gdata/tests/test.humanReadable.Rout.save
===================================================================
--- pkg/gdata/tests/test.humanReadable.Rout.save	2015-06-29 22:30:00 UTC (rev 2053)
+++ pkg/gdata/tests/test.humanReadable.Rout.save	2015-06-29 22:39:55 UTC (rev 2054)
@@ -235,4 +235,4 @@
 > 
 > proc.time()
    user  system elapsed 
-  0.390   0.049   0.431 
+  0.414   0.050   0.461 

Modified: pkg/gdata/tests/test.read.xls.R
===================================================================
--- pkg/gdata/tests/test.read.xls.R	2015-06-29 22:30:00 UTC (rev 2053)
+++ pkg/gdata/tests/test.read.xls.R	2015-06-29 22:39:55 UTC (rev 2054)
@@ -30,13 +30,28 @@
 sheetCount(exampleFile)
 
 if( 'XLSX' %in% xlsFormats() )
-  sheetCount(exampleFileX)
+  {
+    sheetCount(exampleFileX)
+  } else {
+      cat("************************************************************\n")
+      cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
+      cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED                  **\n")
+      cat("************************************************************\n")
+  }
 
 sheetNames(exampleFile)
 
 if( 'XLSX' %in% xlsFormats() )
-  sheetNames(exampleFileX)
+  {
+    sheetNames(exampleFileX)
+  } else {
+      cat("************************************************************\n")
+      cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
+      cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED                  **\n")
+      cat("************************************************************\n")
+  }
 
+
 example.1 <- read.xls(exampleFile, sheet=1) # default is first worksheet
 example.1
 
@@ -70,7 +85,7 @@
     data <- read.xls(exampleFileX, sheet="Sheet with initial text", skip=2)
     print(data)
   } else {
-      cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
+    cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
     cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED **\n")
   }
 

Modified: pkg/gdata/tests/test.read.xls.Rout.save
===================================================================
--- pkg/gdata/tests/test.read.xls.Rout.save	2015-06-29 22:30:00 UTC (rev 2053)
+++ pkg/gdata/tests/test.read.xls.Rout.save	2015-06-29 22:39:55 UTC (rev 2054)
@@ -515,7 +515,14 @@
 [1] 4
 > 
 > if( 'XLSX' %in% xlsFormats() )
-+   sheetCount(exampleFileX)
++   {
++     sheetCount(exampleFileX)
++   } else {
++       cat("************************************************************\n")
++       cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
++       cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED                  **\n")
++       cat("************************************************************\n")
++   }
 [1] 4
 > 
 > sheetNames(exampleFile)
@@ -523,10 +530,18 @@
 [3] "Sheet with a very long name!" "Sheet with initial text"     
 > 
 > if( 'XLSX' %in% xlsFormats() )
-+   sheetNames(exampleFileX)
++   {
++     sheetNames(exampleFileX)
++   } else {
++       cat("************************************************************\n")
++       cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
++       cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED                  **\n")
++       cat("************************************************************\n")
++   }
 [1] "Sheet First"                  "Sheet Second"                
 [3] "Sheet with a very long name!" "Sheet with initial text"     
 > 
+> 
 > example.1 <- read.xls(exampleFile, sheet=1) # default is first worksheet
 > example.1
   A  B   C
@@ -611,7 +626,7 @@
 +     data <- read.xls(exampleFileX, sheet="Sheet with initial text", skip=2)
 +     print(data)
 +   } else {
-+       cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
++     cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
 +     cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED **\n")
 +   }
   A  B   C
@@ -883,4 +898,4 @@
 > 
 > proc.time()
    user  system elapsed 
- 13.275   0.831  14.313 
+ 14.560   0.980  15.861 

Modified: pkg/gdata/tests/test.reorder.factor.Rout.save
===================================================================
--- pkg/gdata/tests/test.reorder.factor.Rout.save	2015-06-29 22:30:00 UTC (rev 2053)
+++ pkg/gdata/tests/test.reorder.factor.Rout.save	2015-06-29 22:39:55 UTC (rev 2054)
@@ -53,4 +53,4 @@
 > 
 > proc.time()
    user  system elapsed 
-  0.338   0.050   0.380 
+  0.411   0.059   0.489 

Modified: pkg/gdata/tests/tests.write.fwf.Rout.save
===================================================================
--- pkg/gdata/tests/tests.write.fwf.Rout.save	2015-06-29 22:30:00 UTC (rev 2053)
+++ pkg/gdata/tests/tests.write.fwf.Rout.save	2015-06-29 22:39:55 UTC (rev 2054)
@@ -231,4 +231,4 @@
 > 
 > proc.time()
    user  system elapsed 
-  0.423   0.048   0.462 
+  0.517   0.054   0.583