adjusting geocode() tests

ipeaGIT · Jan 23, 2025 · f68fa7f · f68fa7f
1 parent 37f4963
commit f68fa7f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 14 deletions.
diff --git a/R/geocode.R b/R/geocode.R
@@ -67,10 +67,11 @@ geocode <- function(enderecos,
 
   # check input
   checkmate::assert_data_frame(enderecos)
-  checkmate::assert_number(n_cores, lower = 1, finite = TRUE)
+  checkmate::assert_logical(resultado_completo, any.missing = FALSE, len = 1)
+  checkmate::assert_logical(resultado_sf, any.missing = FALSE, len = 1)
   checkmate::assert_logical(verboso, any.missing = FALSE, len = 1)
   checkmate::assert_logical(cache, any.missing = FALSE, len = 1)
-  checkmate::assert_logical(resultado_completo, any.missing = FALSE, len = 1)
+  checkmate::assert_number(n_cores, lower = 1, finite = TRUE)
   campos_endereco <- assert_and_assign_address_fields(
     campos_endereco,
     enderecos

diff --git a/tests/testthat/test-geocode.R b/tests/testthat/test-geocode.R
@@ -13,24 +13,31 @@ campos <- listar_campos(
 tester <- function(enderecos = input_df,
                    campos_endereco = campos,
                    resultado_completo = FALSE,
-                   verboso = TRUE,
+                   resultado_sf = FALSE,
+                   verboso = FALSE,
                    cache = TRUE,
                    n_cores = 1) {
-  geocode(enderecos, campos_endereco, resultado_completo, verboso, cache, n_cores)
+  geocode(
+    enderecos,
+    campos_endereco,
+    resultado_completo,
+    resultado_sf,
+    verboso,
+    cache,
+    n_cores
+  )
 }
 
 test_that("expected output", {
-
-  testthat::succeed( std_output <- tester() )
+  std_output <- tester()
 
   # find expected match cases
   match_types_found <- unique(std_output$tipo_resultado)
   testthat::expect_true(length(match_types_found) == 16)
 
-  # ful results
-  testthat::succeed( full_output <- tester(resultado_completo = TRUE) )
+  # full results
+  full_output <- tester(resultado_completo = TRUE)
   testthat::expect_true('endereco_encontrado' %in% names(full_output))
-
 })
 
 
@@ -44,6 +51,14 @@ test_that("errors with incorrect input", {
   expect_error(tester(campos_endereco = c(hehe = "nm_logradouro")))
   expect_error(tester(campos_endereco = c(logradouro = "hehe")))
 
+  expect_error(tester(resultado_completo = 1))
+  expect_error(tester(resultado_completo = NA))
+  expect_error(tester(resultado_completo = c(TRUE, TRUE)))
+
+  expect_error(tester(resultado_sf = 1))
+  expect_error(tester(resultado_sf = NA))
+  expect_error(tester(resultado_sf = c(TRUE, TRUE)))
+
   expect_error(tester(n_cores = "a"))
   expect_error(tester(n_cores = 0))
   expect_error(tester(n_cores = Inf))
@@ -55,10 +70,5 @@ test_that("errors with incorrect input", {
   expect_error(tester(cache = 1))
   expect_error(tester(cache = NA))
   expect_error(tester(cache = c(TRUE, TRUE)))
-
-  expect_error(tester(resultado_completo = 1))
-  expect_error(tester(resultado_completo = NA))
-  expect_error(tester(resultado_completo = c(TRUE, TRUE)))
-
 })