lint test files

Author: mpadge

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: osmdata
 Title: Import 'OpenStreetMap' Data as Simple Features or Spatial Objects
-Version: 0.1.9.054
+Version: 0.1.9.055
 Authors@R: c(
     person("Mark", "Padgham", , "[email protected]", role = c("aut", "cre")),
     person("Bob", "Rudis", role = "aut"),

codemeta.json

@@ -11,7 +11,7 @@
   "codeRepository": "https://github.com/ropensci/osmdata/",
   "issueTracker": "https://github.com/ropensci/osmdata/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.1.9.054",
+  "version": "0.1.9.055",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",

tests/testthat/test-opq.R

@@ -59,7 +59,10 @@ test_that ("opq_string", {
     )
     expect_message (
         s0 <- opq_string_intern (q0, quiet = FALSE),
-        "The overpass server is intended to be used to extract specific features"
+        paste0 (
+            "The overpass server is intended to ",
+            "be used to extract specific features"
+        )
     )
     expect_type (s0, "character")
     expect_length (s0, 1L)
@@ -189,7 +192,9 @@ test_that ("opq_around", {
     expect_true (grepl ("key", x_key))
     expect_false (grepl ("value", x_key))
 
-    expect_silent (x_key_val <- opq_around (lon, lat, key = "key", value = "val"))
+    expect_silent (
+        x_key_val <- opq_around (lon, lat, key = "key", value = "val")
+    )
     expect_true (!identical (x_key, x_key_val))
     expect_true (grepl ("key", x_key_val))
     expect_true (grepl ("val", x_key_val))

tests/testthat/test-osmdata.R

@@ -61,7 +61,12 @@ test_that ("add feature", {
     bbox <- c (-0.118, 51.514, -0.115, 51.517)
     qry <- opq (bbox = bbox)
     bbox2 <- bbox + c (0.01, 0.01, -0.01, -0.01)
-    qry6 <- add_osm_feature (qry, bbox = bbox2, key = "highway", value = "!primary")
+    qry6 <- add_osm_feature (
+        qry,
+        bbox = bbox2,
+        key = "highway",
+        value = "!primary"
+    )
     expect_true (!identical (qry$bbox, qry6$bbox))
 })
 
@@ -214,7 +219,10 @@ test_that ("add_osm_features", {
     qry <- opq (bbox = c (-0.118, 51.514, -0.115, 51.517))
     expect_error (
         qry <- add_osm_features (qry, features = "a"),
-        "features must be enclosed in escape-delimited quotations \\(see example\\)"
+        paste0 (
+            "features must be enclosed in escape-delimited ",
+            "quotations \\(see example\\)"
+        )
     )
 
     bbox <- c (-0.118, 51.514, -0.115, 51.517)

tests/testthat/test-sf-construction.R

@@ -18,7 +18,10 @@ make_sfc <- function (x, type) {
     }
     xvals <- xy [, 1]
     yvals <- xy [, 2]
-    bb <- structure (rep (NA_real_, 4), names = c ("xmin", "ymin", "xmax", "ymax"))
+    bb <- structure (
+        rep (NA_real_, 4),
+        names = c ("xmin", "ymin", "xmax", "ymax")
+    )
     bb [1:4] <- c (min (xvals), min (yvals), max (xvals), max (yvals))
     class (bb) <- "bbox"
     if (type == "POLYGON") {
@@ -45,14 +48,14 @@ make_sfc <- function (x, type) {
     attr (x, "bbox") <- bb
 
     if (packageVersion ("sf") < 0.9) {
-        NA_crs_ <- structure (list (
+        NA_crs_ <- structure (list ( # nolint
             epsg = NA_integer_, # nolint
             proj4string = NA_character_
         ), # nolint
         class = "crs"
         )
     } else {
-        NA_crs_ <- structure (list (
+        NA_crs_ <- structure (list ( # nolint
             input = NA_character_, # nolint
             wkt = NA_character_
         ), # nolint

tests/testthat/test-sf-osm.R

@@ -4,13 +4,16 @@ test_all <- (identical (Sys.getenv ("MPADGE_LOCAL"), "true") |
     identical (Sys.getenv ("GITHUB_WORKFLOW"), "test-coverage"))
 
 test_that ("multipolygon", {
-    x_sf <- sf::st_read (test_path ("fixtures", "osm-multi.osm"),
+    osm_multi <- test_path ("fixtures", "osm-multi.osm")
+    x_sf <- sf::st_read (
+        osm_multi,
         layer = "multipolygons",
         stringsAsFactors = FALSE,
         quiet = TRUE
     )
     q0 <- opq (bbox = c (1, 1, 5, 5))
-    x <- osmdata_sf (q0, test_path ("fixtures", "osm-multi.osm"))$osm_multipolygons
+    x <- osmdata_sf (q0, osm_multi)$osm_multipolygons
+
     # GDAL spits out a whole lot of generic field names, so first the
     # two have to be reduced to common fields.
     x <- x [, which (names (x) %in% names (x_sf))]
@@ -47,13 +50,15 @@ test_that ("multipolygon", {
 
 
 test_that ("multilinestring", {
-    x_sf <- sf::st_read (test_path ("fixtures", "osm-multi.osm"),
+    osm_multi <- test_path ("fixtures", "osm-multi.osm")
+    x_sf <- sf::st_read (
+        osm_multi,
         layer = "multilinestrings",
         stringsAsFactors = FALSE,
         quiet = TRUE
     )
     q0 <- opq (bbox = c (1, 1, 5, 5))
-    x <- osmdata_sf (q0, test_path ("fixtures", "osm-multi.osm"))$osm_multilines
+    x <- osmdata_sf (q0, osm_multi)$osm_multilines
     x <- x [, which (names (x) %in% names (x_sf))]
     x_sf <- x_sf [, which (names (x_sf) %in% names (x))]
     rownames (x_sf) <- rownames (x)
@@ -80,13 +85,15 @@ test_that ("multilinestring", {
 })
 
 test_that ("ways", {
-    x_sf <- sf::st_read (test_path ("fixtures", "osm-ways.osm"),
+    osm_ways <- test_path ("fixtures", "osm-ways.osm")
+    x_sf <- sf::st_read (
+        osm_ways,
         layer = "lines",
         stringsAsFactors = FALSE,
         quiet = TRUE
     )
     q0 <- opq (bbox = c (1, 1, 5, 5))
-    x <- osmdata_sf (q0, test_path ("fixtures", "osm-ways.osm"))$osm_lines
+    x <- osmdata_sf (q0, osm_ways)$osm_lines
     x <- x [, which (names (x) %in% names (x_sf))]
     x_sf <- x_sf [, which (names (x_sf) %in% names (x))]
     rownames (x_sf) <- rownames (x)

tests/testthat/test-sp-osm.R

@@ -1,12 +1,11 @@
 context ("sp-osm")
 
 test_that ("multipolygon", {
-    x_sf <- sf::st_read (test_path ("fixtures", "osm-multi.osm"),
-        layer = "multipolygons", quiet = TRUE
-    )
+    osm_multi <- test_path ("fixtures", "osm-multi.osm")
+    x_sf <- sf::st_read (osm_multi, layer = "multipolygons", quiet = TRUE)
     x_sp <- as (x_sf, "Spatial")
     q0 <- opq (bbox = c (1, 1, 5, 5))
-    x <- osmdata_sp (q0, test_path ("fixtures", "osm-multi.osm"))$osm_multipolygons
+    x <- osmdata_sp (q0, osm_multi)$osm_multipolygons
     # GDAL spits out a whole lot of generic field names, so first the
     # two have to be reduced to common fields.
     x <- x [, which (names (x) %in% names (x_sp))]
@@ -59,12 +58,11 @@ test_that ("multipolygon", {
 
 
 test_that ("multilinestring", {
-    x_sf <- sf::st_read (test_path ("fixtures", "osm-multi.osm"),
-        layer = "multilinestrings", quiet = TRUE
-    )
+    osm_multi <- test_path ("fixtures", "osm-multi.osm")
+    x_sf <- sf::st_read (osm_multi, layer = "multilinestrings", quiet = TRUE)
     x_sp <- as (x_sf, "Spatial")
     q0 <- opq (bbox = c (1, 1, 5, 5))
-    x <- osmdata_sp (q0, test_path ("fixtures", "osm-multi.osm"))$osm_multilines
+    x <- osmdata_sp (q0, osm_multi)$osm_multilines
     x <- x [, which (names (x) %in% names (x_sp))]
     x_sp <- x_sp [, which (names (x_sp) %in% names (x))]
     rownames (slot (x, "data")) <- rownames (slot (x_sp, "data"))
@@ -96,12 +94,11 @@ test_that ("multilinestring", {
 })
 
 test_that ("ways", {
-    x_sf <- sf::st_read (test_path ("fixtures", "osm-ways.osm"),
-        layer = "lines", quiet = TRUE
-    )
+    osm_ways <- test_path ("fixtures", "osm-ways.osm")
+    x_sf <- sf::st_read (osm_ways, layer = "lines", quiet = TRUE)
     x_sp <- as (x_sf, "Spatial")
     q0 <- opq (bbox = c (1, 1, 5, 5))
-    x <- osmdata_sp (q0, test_path ("fixtures", "osm-ways.osm"))$osm_lines
+    x <- osmdata_sp (q0, osm_ways)$osm_lines
     x <- x [, which (names (x) %in% names (x_sp))]
     x_sp <- x_sp [, which (names (x_sp) %in% names (x))]
     np <- length (slot (slot (x, "lines") [[1]], "Lines"))

tests/testthat/test-trim.R

@@ -4,8 +4,9 @@ skip_on_os ("mac")
 skip_on_os ("windows")
 
 test_that ("trim_osm_data", {
+    osm_multi <- test_path ("fixtures", "osm-multi.osm")
     q0 <- opq (bbox = c (1, 1, 5, 5))
-    x0 <- osmdata_sf (q0, test_path ("fixtures", "osm-multi.osm"))
+    x0 <- osmdata_sf (q0, osm_multi)
     bb <- cbind (c (2, 3), c (2, 3))
     require (sf)
     expect_error (
@@ -36,7 +37,7 @@ test_that ("trim_osm_data", {
     expect_true (nrow (x1$osm_multipolygons) ==
         nrow (x0$osm_multipolygons))
 
-    expect_silent (x0_sc <- osmdata_sc (q0, test_path ("fixtures", "osm-multi.osm")))
+    expect_silent (x0_sc <- osmdata_sc (q0, osm_multi))
     expect_silent (x1 <- trim_osmdata (x0_sc, bb_poly = bb))
     expect_equal (nrow (x1$object), 0)
     expect_equal (nrow (x1$object_link_edge), 0)