Merge pull request #20 from lsilvest/master

make explicity setting 'tz=""' behave like if missing

R/nanotime.R

@@ -159,7 +159,7 @@ setMethod("show",
 ##' @export
 format.nanotime <- function(x, tz="", ...)
 {
-    if (missing(tz)) {
+    if (tz=="") {
         if (!is.null(tzone <- attr(x, "tzone")))
             tz <- tzone
         else
@@ -186,8 +186,8 @@ index2char.nanotime <- function(x, ...) {
 
 ##' @rdname nanotime
 ##' @export
-as.POSIXct.nanotime <- function(x, tz, ...) {
-    if (missing(tz)) {
+as.POSIXct.nanotime <- function(x, tz="", ...) {
+    if (tz=="") {
         if (!is.null(tzone <- attr(x, "tzone")))
             tz <- tzone
         else
@@ -200,7 +200,7 @@ as.POSIXct.nanotime <- function(x, tz, ...) {
 
 ##' @rdname nanotime
 ##' @export
-as.POSIXlt.nanotime <- function(x, tz, ...) {
+as.POSIXlt.nanotime <- function(x, tz="", ...) {
     as.POSIXlt(as.POSIXct(x, tz=tz))
 }
 

inst/unitTests/test_nanotime.R

@@ -43,17 +43,19 @@ test_format_tz <- function() {
   oldTz <- getOption("nanotimeTz")
   options(nanotimeFormat=NULL)
 
-  a <- nanotime("1970-01-01T00:00:00.000000000+00:00")
+  a_utc = "1970-01-01T00:00:00.000000000+00:00"
+  nt <- nanotime(a_utc)
   a_ny <- "1969-12-31T19:00:00.000000000-05:00"
 
   options(nanotimeTz=NULL)
-  checkEquals(format(a, tz="America/New_York"), a_ny)
+  checkEquals(format(nt, tz="America/New_York"), a_ny)
 
   options(nanotimeTz="UTC")
-  checkEquals(format(a, tz="America/New_York"), a_ny)
+  checkEquals(format(nt, tz="America/New_York"), a_ny)
 
-  attr(a, "tzone") <- "UTC"
-  checkEquals(format(a, tz="America/New_York"), a_ny)
+  attr(nt, "tzone") <- "UTC"
+  checkEquals(format(nt, tz="America/New_York"), a_ny)
+  checkEquals(format(nt, tz=""), a_utc)
 
   options(nanotimeFormat=oldFormat)
   options(nanotimeTz=oldTz)