Minor fixes to tests due to changes in R-base

Author: s-fleck

DESCRIPTION

@@ -2,7 +2,7 @@ Type: Package
 Package: dint
 Title: A Toolkit for Year-Quarter, Year-Month and Year-Isoweek
     Dates
-Version: 2.1.4
+Version: 2.1.5
 Authors@R: 
     person(given = "Stefan",
            family = "Fleck",

NEWS.md

@@ -1,8 +1,13 @@
+# dint 2.1.5
+
+* Minor fixes to tests due to changes in R-base
+  
+  
 # dint 2.1.4
 
 * vectors of length 1 are now recycled when adding or subtracting `date_xx` 
   objects, e.g. `date_yq(2019, 1) + 1:4` is now possible (#5).
-* `qy` can now handle inputs without seperator between quarter and year 
+* `qy` can now handle inputs without sepperator between quarter and year 
   (e.g. `myfile42019`)
 * `as.POSIXlt.date_xx()` and `as.POSIXct.date_xx()` now set UTC timezone by 
   default (for compatibility with `as.POSIXct.Date()` changes in latest R version)

R/scale_date_xx.R

@@ -123,20 +123,36 @@ scale_date_yq <- function(
   limits = NULL,
   position = "bottom"
 ){
-  ggplot2::continuous_scale(
-    aesthetics,
-    scale_name = "date_yq",
-    name = name,
-    palette = identity,
-    labels = labels,
-    guide = default_guide(),
-    trans = date_yq_trans,
-    super = ggplot2::ScaleContinuousDate,
-    position = position,
-    limits = limits,
-    breaks = breaks,
-    expand = c(0.04, 0)
-  )
+  if (utils::packageVersion("ggplot2") < "3.5.0"){
+    ggplot2::continuous_scale(
+      aesthetics,
+      scale_name = "date_yq",
+      name = name,
+      palette = identity,
+      labels = labels,
+      guide = default_guide(),
+      trans = date_yq_trans,
+      super = ggplot2::ScaleContinuousDate,
+      position = position,
+      limits = limits,
+      breaks = breaks,
+      expand = c(0.04, 0)
+    )
+  } else {
+    ggplot2::continuous_scale(
+      aesthetics,
+      name = name,
+      palette = identity,
+      labels = labels,
+      guide = default_guide(),
+      transform = date_yq_trans,
+      super = ggplot2::ScaleContinuousDate,
+      position = position,
+      limits = limits,
+      breaks = breaks,
+      expand = c(0.04, 0)
+    )
+  }
 }
 
 
@@ -196,20 +212,36 @@ scale_date_ym <- function(
   limits = NULL,
   position = "left"
 ){
-  ggplot2::continuous_scale(
-    aesthetics,
-    scale_name = "date_ym",
-    name = name,
-    breaks = breaks,
-    palette = identity,
-    labels = labels,
-    guide = default_guide(),
-    trans = date_ym_trans,
-    super = ggplot2::ScaleContinuousDate,
-    position = position,
-    limits = limits,
-    expand = c(0.04, 0)
-  )
+  if (utils::packageVersion("ggplot2") < "3.5.0"){
+    ggplot2::continuous_scale(
+      aesthetics,
+      scale_name = "date_ym",
+      name = name,
+      breaks = breaks,
+      palette = identity,
+      labels = labels,
+      guide = default_guide(),
+      trans = date_ym_trans,
+      super = ggplot2::ScaleContinuousDate,
+      position = position,
+      limits = limits,
+      expand = c(0.04, 0)
+    )
+  } else {
+    ggplot2::continuous_scale(
+      aesthetics,
+      name = name,
+      breaks = breaks,
+      palette = identity,
+      labels = labels,
+      guide = default_guide(),
+      transform = date_ym_trans,
+      super = ggplot2::ScaleContinuousDate,
+      position = position,
+      limits = limits,
+      expand = c(0.04, 0)
+    )
+  }
 }
 
 
@@ -266,20 +298,36 @@ scale_date_yw <- function(
   limits = NULL,
   position = "bottom"
 ){
-  ggplot2::continuous_scale(
-    aesthetics,
-    scale_name = "date_yw",
-    name = name,
-    breaks = breaks,
-    palette = identity,
-    guide = default_guide(),
-    labels = labels,
-    trans = date_yw_trans,
-    super = ggplot2::ScaleContinuousDate,
-    position = position,
-    limits = limits,
-    expand = ggplot2::waiver()
-  )
+  if (utils::packageVersion("ggplot2") < "3.5.0"){
+    ggplot2::continuous_scale(
+      aesthetics,
+      scale_name = "date_yw",
+      name = name,
+      breaks = breaks,
+      palette = identity,
+      guide = default_guide(),
+      labels = labels,
+      trans = date_yw_trans,
+      super = ggplot2::ScaleContinuousDate,
+      position = position,
+      limits = limits,
+      expand = ggplot2::waiver()
+    )
+  } else {
+    ggplot2::continuous_scale(
+      aesthetics,
+      name = name,
+      breaks = breaks,
+      palette = identity,
+      guide = default_guide(),
+      labels = labels,
+      transform = date_yw_trans,
+      super = ggplot2::ScaleContinuousDate,
+      position = position,
+      limits = limits,
+      expand = ggplot2::waiver()
+    )
+  }
 }
 
 

README.Rmd

@@ -16,8 +16,7 @@ knitr::opts_chunk$set(
 
 [![CRAN status](https://www.r-pkg.org/badges/version/dint)](https://cran.r-project.org/package=dint)
 [![lifecycle](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html#stable)
-[![Travis build status](https://travis-ci.com/s-fleck/dint.svg?branch=master)](https://travis-ci.org/s-fleck/com)
-[![Coverage status](https://codecov.io/gh/s-fleck/dint/branch/master/graph/badge.svg)](https://codecov.io/github/s-fleck/dint?branch=master)
+
 
 A Toolkit for Year-Quarter, Year-Month and Year-Isoweek Dates
 

README.md

@@ -6,10 +6,6 @@
 [![CRAN
 status](https://www.r-pkg.org/badges/version/dint)](https://cran.r-project.org/package=dint)
 [![lifecycle](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html#stable)
-[![Travis build
-status](https://travis-ci.com/s-fleck/dint.svg?branch=master)](https://travis-ci.org/s-fleck/com)
-[![Coverage
-status](https://codecov.io/gh/s-fleck/dint/branch/master/graph/badge.svg)](https://codecov.io/github/s-fleck/dint?branch=master)
 
 A Toolkit for Year-Quarter, Year-Month and Year-Isoweek Dates
 
@@ -96,7 +92,7 @@ last_of_quarter(q)
 first_of_quarter(q)
 #> [1] "2014-10-01"
 first_of_month(Sys.Date())
-#> [1] "2022-10-01"
+#> [1] "2024-11-01"
 first_of_isoweek(w)
 #> [1] "2016-12-26"
 last_of_isoweek(w)

cran-comments.md

@@ -1,8 +1,6 @@
-## Test environments
+* Fix failing tests due to changes in R-devel
+* Compat with ggplot > 3.5.0
+
 
-* rhub (rhub::check_for_cran())
-* winbuilder (R-devel)
 
-## re-submission 
 
-fix moved url in README

tests/testthat/test_date_xx.R

@@ -44,7 +44,7 @@ test_that("date_xx coercion to POSIXt works", {
 
 
 test_that("Sys.date_** return the appropriate types", {
-  is_date_yq(Sys.date_yq())
-  is_date_ym(Sys.date_ym())
-  is_date_yw(Sys.date_yw())
+  expect_true(is_date_yq(Sys.date_yq()))
+  expect_true(is_date_ym(Sys.date_ym()))
+  expect_true(is_date_yw(Sys.date_yw()))
 })

tests/testthat/test_first_of.R

@@ -178,27 +178,27 @@ test_that("test first_of_month against lubridate", {
 test_that("first_of_isoweek works", {
   tdat <- seq(as.Date("2004-12-20"), as.Date("2020-01-06"), by = "7 days")
 
-  expect_identical(
+  expect_equal(
     first_of_isoweek(tdat),
     tdat
   )
 
-  expect_identical(
+  expect_equal(
     last_of_isoweek(tdat),
     tdat + 6L
   )
 
-  expect_identical(
+  expect_equal(
     seq(as.Date("2004-01-05"), as.Date("2004-12-20"), by = "7 days"),
     first_of_yw(2004, 2:52)
   )
-  expect_identical(
+  expect_equal(
     seq(as.Date("2004-01-11"), as.Date("2004-12-26"), by = "7 days"),
     last_of_yw(2004, 2:52)
   )
 
-  expect_identical(first_of_yw("2004-01-07"), as.Date("2004-01-05"))
-  expect_identical(last_of_yw("2004-01-07"), as.Date("2004-01-11"))
+  expect_equal(first_of_yw("2004-01-07"), as.Date("2004-01-05"))
+  expect_equal(last_of_yw("2004-01-07"), as.Date("2004-01-11"))
 })
 
 

tests/testthat/test_scale_date_xx.R

@@ -101,6 +101,11 @@ test_that("date_ym_breaks doesnt fail for a variety of inputs", {
 
 
 test_that("date_ym_trans is reversible", {
+
+  if (!requireNamespace("scales", quietly = TRUE)){
+    skip("test requires scales")
+  }
+
   x <- seq(date_ym(1950, 1), date_ym(2050, 1))
   trn <- date_ym_trans$transform(x)
   inv <- date_ym_trans$inverse(trn)