Skip to content

Commit 67a9c74

Browse files
author
warnes
committed
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.
1 parent 4813fe7 commit 67a9c74

File tree

5 files changed

+40
-10
lines changed

5 files changed

+40
-10
lines changed

tests/test.humanReadable.Rout.save

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,4 +235,4 @@ The following object is masked from 'package:utils':
235235
>
236236
> proc.time()
237237
user system elapsed
238-
0.390 0.049 0.431
238+
0.414 0.050 0.461

tests/test.read.xls.R

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,27 @@ exampleFileX <- file.path(path.package('gdata'),'xls',
3030
sheetCount(exampleFile)
3131

3232
if( 'XLSX' %in% xlsFormats() )
33-
sheetCount(exampleFileX)
33+
{
34+
sheetCount(exampleFileX)
35+
} else {
36+
cat("************************************************************\n")
37+
cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
38+
cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED **\n")
39+
cat("************************************************************\n")
40+
}
3441

3542
sheetNames(exampleFile)
3643

3744
if( 'XLSX' %in% xlsFormats() )
38-
sheetNames(exampleFileX)
45+
{
46+
sheetNames(exampleFileX)
47+
} else {
48+
cat("************************************************************\n")
49+
cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
50+
cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED **\n")
51+
cat("************************************************************\n")
52+
}
53+
3954

4055
example.1 <- read.xls(exampleFile, sheet=1) # default is first worksheet
4156
example.1
@@ -70,7 +85,7 @@ if( 'XLSX' %in% xlsFormats() )
7085
data <- read.xls(exampleFileX, sheet="Sheet with initial text", skip=2)
7186
print(data)
7287
} else {
73-
cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
88+
cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
7489
cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED **\n")
7590
}
7691

tests/test.read.xls.Rout.save

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -515,18 +515,33 @@ The following object is masked from 'package:utils':
515515
[1] 4
516516
>
517517
> if( 'XLSX' %in% xlsFormats() )
518-
+ sheetCount(exampleFileX)
518+
+ {
519+
+ sheetCount(exampleFileX)
520+
+ } else {
521+
+ cat("************************************************************\n")
522+
+ cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
523+
+ cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED **\n")
524+
+ cat("************************************************************\n")
525+
+ }
519526
[1] 4
520527
>
521528
> sheetNames(exampleFile)
522529
[1] "Sheet First" "Sheet Second"
523530
[3] "Sheet with a very long name!" "Sheet with initial text"
524531
>
525532
> if( 'XLSX' %in% xlsFormats() )
526-
+ sheetNames(exampleFileX)
533+
+ {
534+
+ sheetNames(exampleFileX)
535+
+ } else {
536+
+ cat("************************************************************\n")
537+
+ cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
538+
+ cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED **\n")
539+
+ cat("************************************************************\n")
540+
+ }
527541
[1] "Sheet First" "Sheet Second"
528542
[3] "Sheet with a very long name!" "Sheet with initial text"
529543
>
544+
>
530545
> example.1 <- read.xls(exampleFile, sheet=1) # default is first worksheet
531546
> example.1
532547
A B C
@@ -611,7 +626,7 @@ The following object is masked from 'package:utils':
611626
+ data <- read.xls(exampleFileX, sheet="Sheet with initial text", skip=2)
612627
+ print(data)
613628
+ } else {
614-
+ cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
629+
+ cat("** DIFF IN THIS SECTION IS EXPECTED BECAUSE PERL PACKAGES **\n")
615630
+ cat("** FOR SUPPORTING XLSX ARE NOT INSTALLED **\n")
616631
+ }
617632
A B C
@@ -883,4 +898,4 @@ The following object is masked from 'package:utils':
883898
>
884899
> proc.time()
885900
user system elapsed
886-
13.275 0.831 14.313
901+
14.560 0.980 15.861

tests/test.reorder.factor.Rout.save

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ Levels: c b a
5353
>
5454
> proc.time()
5555
user system elapsed
56-
0.338 0.050 0.380
56+
0.411 0.059 0.489

tests/tests.write.fwf.Rout.save

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,4 +231,4 @@ HI! num1 num2 num3 int1 fac1 fac2 cha1 cha2 Date POSIXt
231231
>
232232
> proc.time()
233233
user system elapsed
234-
0.423 0.048 0.462
234+
0.517 0.054 0.583

0 commit comments

Comments
 (0)