Finally updated commented tests to pass, as well as added a few additional tests.

Author: kenmawer

R/utils.R

@@ -39,10 +39,12 @@ guess_geo_type = function(geo_value) {
     if (all(geo_value %in% state_values)) return("state")
 
     # Else if all geo values are 2 letters, then use "nation"
-    else if (all(grepl("[a-z]{2}", geo_value))) return("nation")
+    else if (all(grepl("[a-z]{2}", geo_value))
+             & !any(grepl("[a-z]{3}", geo_value))) return("nation")
 
     # Else if all geo values are 5 numbers, then use "county"
-    else if (all(grepl("[0-9]{5}", geo_value))) return("county")
+    else if (all(grepl("[0-9]{5}", geo_value)) &
+             !any(grepl("[0-9]{6}", geo_value))) return("county")
   }
 
   else if (is.numeric(geo_value)) {
@@ -79,7 +81,7 @@ guess_time_type = function(time_value) {
 
   # Else, if a Date class, then use "week" or "day" depending on gaps 
   else if (inherits(time_value, "Date")) {
-    return(ifelse(all(diff(sort(time_value)) == -7), "week", "day"))
+    return(ifelse(all(diff(sort(time_value)) == 7), "week", "day"))
   }
 
   # Else, check whether it's one of the tsibble classes

tests/testthat/test-utils.R

@@ -49,20 +49,24 @@ test_that("guess_geo_type tests for different types of geo_value's",{
   # HRR regions
   hrr <- c(100,200)
 
+  # Long numbers should be custom
+  long_nums <- c(123456789,111222333)
+  
   # Health regions in British Columbia
   bc <- c("Vancouver Coastal","Interior","Fraser",
               "Northern","Vancouver Island")
 
-  # Long numbers as strings that should also be custom
-  long_nums <- c("123456789","111222333")
+  # Long numbers as strings should also be custom
+  long_num_strings <- c("123456789","111222333")
 
   expect_equal(guess_geo_type(states),"state")
   expect_equal(guess_geo_type(nations),"nation")
   expect_equal(guess_geo_type(counties),"county")
   expect_equal(guess_geo_type(hhs),"hhs")
   expect_equal(guess_geo_type(hrr),"hrr")
-  # expect_equal(guess_geo_type(bc),"custom") # EDIT LINE 42
-  # expect_equal(guess_geo_type(long_nums),"custom") # EDIT LINE 45
+  expect_equal(guess_geo_type(long_num_strings),"custom")
+  expect_equal(guess_geo_type(bc),"custom")
+  expect_equal(guess_geo_type(long_nums),"custom")
 })
 
 test_that("guess_time_type works for different types",{
@@ -83,7 +87,7 @@ test_that("guess_time_type works for different types",{
   not_a_date <- "asdf"
 
   expect_equal(guess_time_type(days),"day")
-  # expect_equal(guess_time_type(weeks),"week") # EDIT LINE 82
+  expect_equal(guess_time_type(weeks),"week")
 
   expect_equal(guess_time_type(yearweeks),"yearweek")  
   expect_equal(guess_time_type(yearmonths),"yearmonth")