Fix #1174: Don't use CET and EST in tests to comply with the tzdata u…

…pgrade

NEWS.md

@@ -1,6 +1,9 @@
 Version 1.9.3.9000 (development)
 ==============================
 
+### Changes
+* Don't use CET and EST as timezones to accomodate the upgrade of tzdata in the R-devel
+
 
 Version 1.9.3
 =============

R/format_ISO8601.r

@@ -7,8 +7,8 @@
 #' @references \url{https://en.wikipedia.org/wiki/ISO_8601}
 #' @examples
 #' format_ISO8601(as.Date("02-01-2018", format = "%m-%d-%Y"))
-#' format_ISO8601(as.POSIXct("2018-02-01 03:04:05", tz = "EST"), usetz = TRUE)
-#' format_ISO8601(as.POSIXct("2018-02-01 03:04:05", tz = "EST"), precision = "ymdhm")
+#' format_ISO8601(as.POSIXct("2018-02-01 03:04:05", tz = "America/New_York"), usetz = TRUE)
+#' format_ISO8601(as.POSIXct("2018-02-01 03:04:05", tz = "America/New_York"), precision = "ymdhm")
 #' @aliases format_ISO8601,Date-method format_ISO8601,POSIXt-method format_ISO8601,Interval-method
 #' format_ISO8601,Duration-method format_ISO8601,Period-method
 #' @export

tests/testthat/test-format_ISO8601.R

@@ -32,28 +32,28 @@ test_that("Formatting a date works", {
 })
 
 test_that("Formatting a datetime works", {
-  expect_equal(format_ISO8601(as.POSIXct("2018-02-01 03:04:05", tz = "EST")),
+  expect_equal(format_ISO8601(as.POSIXct("2018-02-01 03:04:05", tz = "America/New_York")),
     "2018-02-01T03:04:05",
     info = "Standard datetime formatting works"
   )
-  expect_equal(format_ISO8601(as.POSIXct("2018-02-01 03:04:05", tz = "EST"), usetz = TRUE),
+  expect_equal(format_ISO8601(as.POSIXct("2018-02-01 03:04:05", tz = "America/New_York"), usetz = TRUE),
     "2018-02-01T03:04:05-0500",
     info = "usetz is respected with datetimes"
   )
-  expect_equal(format_ISO8601(as.POSIXct("2018-02-01 03:04:05", tz="EST"), usetz="Z"),
+  expect_equal(format_ISO8601(as.POSIXct("2018-02-01 03:04:05", tz="America/New_York"), usetz="Z"),
                "2018-02-01T08:04:05Z",
                info="usetz='Z' is respected with datetimes")
-  expect_equal(format_ISO8601(as.POSIXct("2018-02-01 03:04:05", tz = "EST"), precision = "y"),
+  expect_equal(format_ISO8601(as.POSIXct("2018-02-01 03:04:05", tz = "America/New_York"), precision = "y"),
     "2018",
     info = "precision is respected (y)"
   )
   # Uncertain if this is the best result; including a test so that if it changes
   # the change is caught.
-  expect_equal(format_ISO8601(as.POSIXct("2018-02-01 03:04:05", tz = "EST"), precision = "y", usetz = TRUE),
+  expect_equal(format_ISO8601(as.POSIXct("2018-02-01 03:04:05", tz = "America/New_York"), precision = "y", usetz = TRUE),
     "2018-0500",
     info = "precision is respected (y) with timezone"
   )
-  expect_equal(format_ISO8601(as.POSIXct("2018-02-01 03:04:05", tz = "EST"), precision = "ymdhm"),
+  expect_equal(format_ISO8601(as.POSIXct("2018-02-01 03:04:05", tz = "America/New_York"), precision = "ymdhm"),
     "2018-02-01T03:04",
     info = "precision is respected (ymdhm)"
   )
@@ -125,11 +125,11 @@ test_that("Formatting an Interval works", {
     "2018-02-01/2018-03-04",
     info = "interval formatting respects precision (ymd)"
   )
-  expect_equal(format_ISO8601(interval(start = "2018-02-01", end = "2018-03-04", tzone = "EST"), usetz = TRUE),
+  expect_equal(format_ISO8601(interval(start = "2018-02-01", end = "2018-03-04", tzone = "America/New_York"), usetz = TRUE),
     "2018-02-01T00:00:00-0500/2018-03-04T00:00:00-0500",
     info = "interval formatting respects timezone"
   )
-  expect_equal(format_ISO8601(interval(start="2018-02-01", end="2018-03-04", tzone="EST"), usetz="Z"),
+  expect_equal(format_ISO8601(interval(start="2018-02-01", end="2018-03-04", tzone="America/New_York"), usetz="Z"),
                "2018-02-01T05:00:00Z/2018-03-04T05:00:00Z",
                info="interval formatting respects usetz='Z'")
 })

tests/testthat/test-parsers.R

@@ -517,8 +517,8 @@ test_that("AM/PM indicators are parsed correctly", {
     ymd_hms("1996-12-17 04:00:00")
   )
   expect_equal(
-    parse_date_time2("12/17/1996 04:00:00  PM", "mdYHMSp", tz = "CET"),
-    ymd_hms("1996-12-17 16:00:00", tz = "CET")
+    parse_date_time2("12/17/1996 04:00:00  PM", "mdYHMSp", tz = "Europe/Berlin"),
+    ymd_hms("1996-12-17 16:00:00", tz = "Europe/Berlin")
   )
   expect_equal(
     parse_date_time2("12/17/1996 04:00:00  TM", "mdYHMSp"),