test(fix): skip when SDA fails (#461)

Author: AndrewBrown-USDA

R/SoilDataViewer.R

@@ -27,7 +27,6 @@ get_SDV_legend_elements <- function(WHERE,
                                    FROM sdvattribute WHERE ", ak))
 
     if (inherits(x, 'try-error')) {
-      message(x[1])
       return(invisible(x))
     }
 
@@ -42,6 +41,12 @@ get_SDV_legend_elements <- function(WHERE,
     })
   })
 
+  # check for try-error
+  err <- sapply(y, inherits, "try-error")
+  if (any(err)) {
+    return(y[[which(err)[1]]])
+  }
+  
   if ((length(y) == 1) && length(y[[1]]) == 1 && simplify) {
     return(y[[1]][[1]])
   } else if (simplify) return(do.call('c', y))

tests/testthat/test-SoilDataViewer.R

@@ -9,6 +9,8 @@ test_that("get_SDV_legend_elements works", {
   # simplify=TRUE, one where clause returning one legend
   res <- get_SDV_legend_elements("attributekey = 427")
 
+  skip_if(inherits(res, 'try-error'))
+  
   expect_true(inherits(res, 'data.frame'))
 
   # simplify=TRUE, two where clauses returning list of length 3 = 2 + 1 legends

tests/testthat/test-fetchSDA_spatial.R

@@ -11,7 +11,7 @@ test_that("fetchSDA_spatial basic mupolygon functionality", {
   # expect 3, relatively non-extensive join delineations
   single.mukey <- fetchSDA_spatial(x = "2924882", by.col = 'mukey')
 
-  skip_if(inherits(single.mukey, 'try-error'))
+  skip_if(is.null(single.mukey) || inherits(single.mukey, 'try-error'))
 
   expect_equivalent(nrow(single.mukey), 3)
 

tests/testthat/test-get_SDA_interpretation.R

@@ -19,7 +19,13 @@ test_that("dynamically determine target row counts", {
   r1 <- SDA_query(sprintf(q, area_in))
   r2a <- SDA_query(sprintf(q, comp_in[1]))
 
-  expect_true(inherits(r1, 'data.frame') || is.null(r1))
+  # ensure fixtures exist
+  target_area_rows <<- NULL
+  target_area_rows_all <<- NULL
+  
+  skip_if(is.null(r1) || inherits(r1, 'try-error'))
+  
+  expect_true(inherits(r1, 'data.frame'))
 
   target_area_rows <<- nrow(r1) # 1:1 with mukey
   target_area_rows_all <<- nrow(r2a) # 1:1 with component

tests/testthat/test-get_SDA_property.R

@@ -6,7 +6,7 @@ test_that("dynamically determine target row counts", {
   skip_if_offline()
 
   skip_on_cran()
-
+  
   q <- "SELECT areasymbol, mapunit.mukey, muname FROM mapunit
         INNER JOIN legend ON mapunit.lkey = legend.lkey 
         %s"
@@ -23,8 +23,14 @@ test_that("dynamically determine target row counts", {
   r2c <- SDA_query(sprintf(q, comp_in[3]))
   r3a <- SDA_query(sprintf(q, chor_in[1]))
   r3b <- SDA_query(sprintf(q, chor_in[2]))
-
-  expect_true(inherits(r1, 'data.frame') || is.null(r1))
+  
+  # ensure fixtures exist
+  target_area_rows <<- NULL
+  target_area_rows_all <<- NULL
+  
+  skip_if(is.null(r1) || inherits(r1, 'try-error'))
+  
+  expect_true(inherits(r1, 'data.frame'))
 
   target_area_rows <<- nrow(r1) # 1:1 with mukey
   target_area_rows_all <<- nrow(r2a) # 1:1 with component