Refactor to_singular and to_plural so that they return values, and te…

…st those function during builds

R/utils.R

@@ -50,25 +50,27 @@ validate_pv_data <- function(data) {
 
 #' @noRd
 to_singular <- function(plural) {
-  # assignees is an exception, singular isn't assigne
-
-  if (endsWith(plural, "ies")) {
-    singular <- sub("ies$", "y", plural)
-  } else if (endsWith(plural, "es") && !endsWith(plural, "ees")) {
-    singular <- sub("es$", "", plural)
+  if (endsWith(plural, "ees")) {
+    sub("ees$", "ee", plural)
+  } else if (endsWith(plural, "ies")) {
+    sub("ies$", "y", plural)
+  } else if (endsWith(plural, "es")) {
+    sub("es$", "", plural)
+  } else if (endsWith(plural, "s")) {
+    sub("s$", "", plural)
   } else {
-    singular <- sub("s$", "", plural)
+    plural
   }
 }
 
 
 #' @noRd
 to_plural <- function(singular) {
   if (endsWith(singular, "y")) {
-    plural <- sub("y$", "ies", singular)
+    sub("y$", "ies", singular)
   } else if (endsWith(singular, "s")) {
-    plural <- paste0(singular, "es")
+    paste0(singular, "es")
   } else {
-    plural <- paste0(singular, "s")
+    paste0(singular, "s")
   }
 }

tests/testthat/test-utils.R

@@ -1,18 +1,9 @@
-context("validate_args")
-
-eps <- (get_endpoints())
-eps <- eps[eps != "locations"]
+context("utils")
 
 test_that("we can convert endpoints to their singular form and back", {
-  skip_on_cran()
-  skip_on_ci()
-
-  # the endpoints are plural so if we convert to singular and back they should be unchanged
-
+  eps <- get_endpoints()
   z <- vapply(eps, function(x) {
-    # say what?  only to_singular is used by the package.  remove the others?
     to_plural(to_singular(x))
   }, FUN.VALUE = character(1), USE.NAMES = FALSE)
-
   expect_equal(eps, z)
 })