Merge pull request #48 from BiodiversiteQuebec/refactor_req_tests

Migrate to newapi V2

Author: vcameron1

R/coleo_api_utils.R

@@ -17,7 +17,7 @@ server <- function(){
 base <- function() {
   path <- Sys.getenv("COLEOAPI_PATH")
   if (path==''){
-    path="/newapi/v1"
+    path="/newapi/v2"
   }
   return(path)
 }

tests/testthat/test-coleo_api_utils.R

@@ -3,7 +3,7 @@ test_that("api utils do the right thing", {
   setup_call <- coleo_begin_req("api")
   expect_s3_class(setup_call, class = "httr2_request")
 
-  expect_equal(setup_call$url, "https://coleo.biodiversite-quebec.ca/newapi/v1")
+  expect_equal(setup_call$url, "https://coleo.biodiversite-quebec.ca/newapi/v2")
 
 })
 

tests/testthat/test-coleo_request.R

@@ -4,99 +4,66 @@ without_internet({
   test_that("coleo_request makes a good request", {
 
     expect_GET(coleo_request_general(endpoint = "cells", response_as_df = FALSE, schema = "public", 'cell_code' = "eq.foo"),
-               url = "https://coleo.biodiversite-quebec.ca/newapi/v1/cells?cell_code=eq.foo")
+               url = "https://coleo.biodiversite-quebec.ca/newapi/v2/cells?cell_code=eq.foo")
   })
 })
 
 
-with_mock_dir("coleo_request", {
-  test_that("no answer for a nonsense code", {
-    nonsense_request <- coleo_request_general(endpoint = "cells", response_as_df = FALSE, schema = "public", 'cell_code' = "eq.foo")
-
-    expect_equal(httr2::resp_body_json(nonsense_request), list())
-  })
+test_that("no answer for a nonsense code", {
+  nonsense_request <- coleo_request_general(endpoint = "cells", response_as_df = FALSE, schema = "public", 'cell_code' = "eq.foo")
+  expect_equal(httr2::resp_body_json(nonsense_request), list())
 })
 
 # query for a real site
-
-with_mock_dir("coleo_request_real", {
-  test_that("returns answer for a real code",{
-    real_site <- coleo_request_general(endpoint = "cells", schema = "public", "cell_code" = "eq.139_87")
-
-    answer <- httr2::resp_body_json(real_site)[[1]]
-
-    expect_equal(length(answer), 6)
-
-  })
+test_that("returns answer for a real code",{
+  real_site <- coleo_request_general(endpoint = "cells", schema = "public", "cell_code" = "eq.139_87")
+  answer <- httr2::resp_body_json(real_site)[[1]]
+  expect_equal(length(answer), 6)
 })
 
 
-with_mock_dir("coleo_request_real", {
-    real_cell <- coleo_request_general(endpoint = "cells", schema = "public", "cell_code" = "eq.139_87")
-    real_cell_df <- coleo_request_general(endpoint = "cells", schema = "public", "cell_code" = "eq.139_87", response_as_df = TRUE)
-
-    resp_body <- httr2::resp_body_json(real_cell)[[1]]
-
-
-    test_that("response is in expected format", {
-      expect_equal(length(resp_body), 6)
-
-      # can pluck one id successfully from site request
-      expect_equal(coleo_extract_id(real_cell), 161)
-
-      expect_type(real_cell_df, "list")
-
-    })
-
+real_cell <- coleo_request_general(endpoint = "cells", schema = "public", "cell_code" = "eq.139_87")
+real_cell_df <- coleo_request_general(endpoint = "cells", schema = "public", "cell_code" = "eq.139_87", response_as_df = TRUE)
+resp_body <- httr2::resp_body_json(real_cell)[[1]]
+test_that("response is in expected format", {
+  expect_equal(length(resp_body), 6)
+  # can pluck one id successfully from site request
+  expect_equal(coleo_extract_id(real_cell), 161)
+  expect_type(real_cell_df, "list")
 })
 
 test_that("errors for bad endpoint", {
   expect_error(coleo_request_general(endpoint = "not_an_endpoint"))
 })
 
-with_mock_dir("site id download and extraction", {
-
-  real_site <- coleo_request_general(endpoint = "sites", schema = "public", "site_code" = "eq.139_87_F01")
-
-  test_that("request_general works for a valid site", {
-
-
-    resp_body <- httr2::resp_body_json(real_site)[[1]]
-
-    # should be 11 columns of info for this site
-    expect_equal(length(names(resp_body)), 11)
-
-  })
-
-  test_that("can coleo_pluck_id correctly", {
-    expect_equal(coleo_extract_id(real_site), 94)
-  })
-
-  })
-
-
-with_mock_dir("Site processing works correctly", {
-
-  resp_df <- coleo_request_general(endpoint = "sites", response_as_df = TRUE, schema = "public", "site_code" = "eq.137_107_H02")
-
-  test_that("resp is easily processed", {
-    # This processing step returns everything in one row
-    expect_equal(nrow(resp_df), 1)
-    # things should be unnested now; here is one example
-    expect_equal(length(resp_df$id), 1)
-    # coluns should be of the right class
-    expect_type(resp_df$type, "character")
-  })
-
+# Site id download and extraction
+real_site <- coleo_request_general(endpoint = "sites", schema = "public", "site_code" = "eq.139_87_F01")
+test_that("request_general works for a valid site", {
+  resp_body <- httr2::resp_body_json(real_site)[[1]]
+  # should be 11 columns of info for this site
+  expect_equal(length(names(resp_body)), 12)
+})
+test_that("can coleo_pluck_id correctly", {
+  expect_equal(coleo_extract_id(real_site), 94)
+})
 
+# Site processing works correctly
+resp_df <- coleo_request_general(endpoint = "sites", response_as_df = TRUE, schema = "public", "site_code" = "eq.137_107_H02")
+test_that("resp is easily processed", {
+  # This processing step returns everything in one row
+  expect_equal(nrow(resp_df), 1)
+  # things should be unnested now; here is one example
+  expect_equal(length(resp_df$id), 1)
+  # coluns should be of the right class
+  expect_type(resp_df$type, "character")
 })
 
 
 test_that("coleo_request_data returns expected output", {
   # Test case 1: survey_type = 'vegetation', view = 'short'
   result1 <- coleo_request_data(survey_type = 'vegetation', view = 'short')
   expect_is(result1, "tbl_df")
-  expect_equal(ncol(result1), 18) # Assuming there are 18 columns of data for vegetation inventory
+  expect_equal(ncol(result1), 20) # Assuming there are 18 columns of data for vegetation inventory
 
   # Test case 2: survey_type = 'acoustique_anoures', view = 'long'
   result2 <- coleo_request_data(survey_type = 'acoustique_anoures', view = 'long')