Merge pull request #309 from ropensci/tests

Move tests' dependencies to setup.R
ropensci · Feb 7, 2023 · 5036746 · 5036746
2 parents 07334e1 + 963c007
commit 5036746
Show file tree

Hide file tree

Showing 9 changed files with 371 additions and 39 deletions.
diff --git a/tests/testthat.R b/tests/testthat.R
@@ -1,5 +1,4 @@
 library(testthat)
-library(httptest2)
 library(osmdata)
 
 test_check("osmdata")
diff --git a/tests/testthat/mock_osm_sc/overpass-api.de/api/interpreter-f7f678-POST.R b/tests/testthat/mock_osm_sc/overpass-api.de/api/interpreter-f7f678-POST.R
diff --git a/tests/testthat/mock_osm_sc/overpass-api.de/api/status.txt b/tests/testthat/mock_osm_sc/overpass-api.de/api/status.txt
@@ -0,0 +1,6 @@
+Connected as: 123456789
+Current time: 2022-01-01T00:00:00Z
+Announced endpoint: z.overpass-api.de/api/
+Rate limit: 3
+3 slots available now.
+Currently running queries (pid, space limit, time limit, start time):
diff --git a/tests/testthat/setup.R b/tests/testthat/setup.R
@@ -0,0 +1,5 @@
+library(httptest2)
+
+set_overpass_url ("https://overpass-api.de/api/interpreter")
+
+test_all <- Sys.getenv ("GITHUB_WORKFLOW") != "R-CMD-check"
diff --git a/tests/testthat/test-elevation.R b/tests/testthat/test-elevation.R
@@ -1,10 +1,5 @@
 has_internet <- curl::has_internet ()
 
-test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") |
-    identical (Sys.getenv ("GITHUB_WORKFLOW"), "test-coverage"))
-
-set_overpass_url ("https://overpass-api.de/api/interpreter")
-
 test_that ("elevation", {
 
     # elevation can't actually be tested, because it only works with a full SRTM

diff --git a/tests/testthat/test-features.R b/tests/testthat/test-features.R
@@ -4,11 +4,6 @@
 # small sample only. Post-process of features is done in the test call; tags are
 # done via separate fn defined below.
 
-test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") |
-    identical (Sys.getenv ("GITHUB_WORKFLOW"), "test-coverage"))
-
-set_overpass_url ("https://overpass-api.de/api/interpreter")
-
 test_that ("available_features", {
 
     expect_error (available_features (1), "unused argument")

diff --git a/tests/testthat/test-getbb.R b/tests/testthat/test-getbb.R
@@ -1,10 +1,5 @@
 has_internet <- curl::has_internet ()
 
-test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") |
-    identical (Sys.getenv ("GITHUB_WORKFLOW"), "test-coverage"))
-
-set_overpass_url ("https://overpass-api.de/api/interpreter")
-
 test_that ("bbox", {
 
     expect_error (bbox_to_string (), "bbox must be provided")

diff --git a/tests/testthat/test-osmdata.R b/tests/testthat/test-osmdata.R
@@ -1,10 +1,5 @@
 has_internet <- curl::has_internet ()
 
-test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") |
-    identical (Sys.getenv ("GITHUB_WORKFLOW"), "test-coverage"))
-
-set_overpass_url ("https://overpass-api.de/api/interpreter")
-
 test_that ("query-construction", {
 
     q0 <- opq (bbox = c (-0.12, 51.51, -0.11, 51.52))
@@ -325,21 +320,30 @@ test_that ("make_query", {
 
 test_that ("query-no-quiet", {
 
-    qry <- opq (bbox = c (-0.118, 51.514, -0.115, 51.517))
+    qry <- opq (bbox = c (-0.116, 51.516, -0.115, 51.517))
     qry <- add_osm_feature (qry, key = "highway")
-    # switched off until mock results for httr2 reinstanted for #272
-    # expect_message (x <- osmdata_xml (qry, quiet = FALSE),
-    #                "Issuing query to Overpass API")
 
     if (test_all) {
-        # expect_message (x <- osmdata_sp (qry, quiet = FALSE),
-        #                "Issuing query to Overpass API")
-        # expect_message (x <- osmdata_sf (qry, quiet = FALSE),
-        #                "Issuing query to Overpass API")
-        # expect_message (x <- osmdata_sc (qry, quiet = FALSE),
-        #                "Issuing query to Overpass API")
-        # expect_message (x <- osmdata_data_frame (qry, quiet = FALSE),
-        #                "Issuing query to Overpass API")
+        with_mock_dir ("mock_osm_xml", {
+            expect_message (x <- osmdata_xml (qry, quiet = FALSE),
+                           "Issuing query to Overpass API")
+        })
+        with_mock_dir ("mock_osm_sp", {
+            expect_message (x <- osmdata_sp (qry, quiet = FALSE),
+                           "Issuing query to Overpass API")
+        })
+        with_mock_dir ("mock_osm_sf", {
+            expect_message (x <- osmdata_sf (qry, quiet = FALSE),
+                           "Issuing query to Overpass API")
+        })
+        with_mock_dir ("mock_osm_sc", {
+            expect_message (x <- osmdata_sc (qry, quiet = FALSE),
+                           "Issuing query to Overpass API")
+        })
+        with_mock_dir ("mock_osm_df", {
+            expect_message (x <- osmdata_data_frame (qry, quiet = FALSE),
+                           "Issuing query to Overpass API")
+        })
     }
 })
 

diff --git a/tests/testthat/test-unname.R b/tests/testthat/test-unname.R
@@ -1,13 +1,9 @@
 context ("unname-osmdata-sf")
 
-has_internet <- curl::has_internet ()
-skip_if (!has_internet)
-
-test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") |
-    identical (Sys.getenv ("GITHUB_WORKFLOW"), "test-coverage"))
 skip_if (!test_all)
 
-set_overpass_url ("https://overpass-api.de/api/interpreter")
+has_internet <- curl::has_internet ()
+skip_if (!has_internet)
 
 require (sf)