Merge branch 'main' into dev

ropensci · Feb 5, 2025 · 3acb895 · 3acb895
2 parents f9fa89d + 71338ae
commit 3acb895
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 4 deletions.
diff --git a/R/weather.R b/R/weather.R
@@ -196,10 +196,9 @@ weather_dl <- function(station_ids,
     }
 
     if(is.null(end)) {
-      s.end <- Sys.Date()
+        s.end <- Sys.Date()
     } else {
-      s.end <- as.Date(end)
-      if(s.end > Sys.Date()) s.end <- Sys.Date()
+        s.end <- as.Date(end)
     }
     msg.end <- as.character(s.end)
 
@@ -337,7 +336,11 @@ weather_dl <- function(station_ids,
   }
 
   if(length(end_dates) > 0 & !quiet) {
-    if(all(station_ids %in% missing)) type <- "all" else type <- "some"
+    if(all(station_ids %in% missing)) {
+        type <- "all"
+    } else {
+        type <- "some"
+    }
 
     message(paste0("The end dates (", msg.end, ") are earlier than the ",
                    "start dates (", msg.start, ") for ", type, " stations (",

diff --git a/tests/testthat/test_07_weather_args.R b/tests/testthat/test_07_weather_args.R
@@ -95,3 +95,64 @@ test_that("weather_dl() month string_as = NULL", {
   })
 
 })
+
+
+test_that("weather_dl() (invalid start day) returns error when start is not a valid date day", {
+  skip_on_cran()
+
+  vcr::use_cassette("weather_month_5401", {
+    expect_error(weather_dl(station_ids = 5401,
+                                  start = "2017-01-99",
+                                  end = "2017-05-01",
+                                  interval = "month", format = FALSE),
+      "'start' and 'end' must be either a standard date format ")
+  })
+})
+
+test_that("weather_dl() (invalid start string) returns error when start is not a valid date string", {
+  skip_on_cran()
+
+  vcr::use_cassette("weather_month_5401", {
+    expect_error(weather_dl(station_ids = 5401,
+                                  start = "2017-01-NN",
+                                  end = "2017-05-01",
+                                  interval = "month", format = FALSE),
+      "'start' and 'end' must be either a standard date format ")
+  })
+})
+
+test_that("weather_dl() (invalid end day) returns error when end is not a valid date day", {
+  skip_on_cran()
+  vcr::use_cassette("weather_month_5401", {
+    expect_error(weather_dl(station_ids = 5401,
+                                  start = "2017-01-01",
+                                  end = "2017-04-99",
+                                  interval = "month", format = FALSE),
+      "'start' and 'end' must be either a standard date format ")
+  })
+})
+
+
+test_that("weather_dl() (invalid end string) verifies error return when end is not a valid date string", {
+  skip_on_cran()
+  vcr::use_cassette("weather_month_5401", {
+    expect_error(weather_dl(station_ids = 5401,
+                                  start = "2017-01-01",
+                                  end = "2017-04-NN",
+                                  interval = "month", format = FALSE),
+      "'start' and 'end' must be either a standard date format ")
+  })
+})
+
+
+test_that("weather_dl() (invalid stn) verifies error return when defunct stn", {
+  skip_on_cran()
+  vcr::use_cassette("weather_month_5401", {
+    expect_error(weather_dl(station_ids = 5401,
+                                  start = "2017-01-01",
+                                  end = "2017-05-01",
+                                  stn = "invalid defunct",
+                                  interval = "month", format = FALSE),
+      "`stn` is defunct, to use an updated stations data frame use ")
+  })
+})