From 23f4cd725a335460d15d59b8f5d8bcfce11a6f2b Mon Sep 17 00:00:00 2001 From: Clinton Mccrowey Date: Thu, 23 May 2024 16:46:47 -0400 Subject: [PATCH] fix testing credentials in unit tests --- MD5 | 22 +++++++++++----------- R/AQSAPI_helperfunctions.R | 2 +- README.md | 2 +- tests/testthat/test-RAQSAPlistfunctions.R | 4 ++-- tests/testthat/test-byCBSA.R | 4 ++-- tests/testthat/test-byMA.R | 4 ++-- tests/testthat/test-bybox.R | 4 ++-- tests/testthat/test-bycounty.R | 4 ++-- tests/testthat/test-bypqao.R | 4 ++-- tests/testthat/test-bysite.R | 4 ++-- tests/testthat/test-bystate.R | 4 ++-- tests/testthat/test-helperfunctions.R | 4 ++-- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/MD5 b/MD5 index 29b6c6f..ab259a2 100644 --- a/MD5 +++ b/MD5 @@ -118,7 +118,7 @@ ed42e3fbd7cc30bc6ca8fa9b658e24a8 *man/figures/lifecycle-stable.svg bf2f1ad432ecccee3400afe533404113 *man/figures/lifecycle-superseded.svg 792c28b91a2c0b5e0b060a2f18a20464 *man/RAQSAPI.Rd eef9bd75f39b496fcfd63a36be7fb5a8 *NAMESPACE -f5bb0087a67a6d8912e802b5e53e025a *R/AQSAPI_helperfunctions.R +68f4c551ed9b572bb7c6a3ab9228b75c *R/AQSAPI_helperfunctions.R a3558975d0256839b174ab7868833075 *R/bybox.R bd8b36cc7325d4fc8b8ed894f0046678 *R/bycbsa.R 253ea551f88c65c1c49feff3cb33f552 *R/bycounty.R @@ -133,7 +133,7 @@ e6e3b87e48f4403642382987b0f40714 *R/setupfunctions.R 6e659bb3bbf313dc819d4c029f0b22d0 *R/zzz.R 25bf50b0ec79d01de8b83b7b5801b4ac *RAQSAPI.code-workspace a69de5455537022556f014579766be59 *RAQSAPI.Rproj -f6cb61c1475f001928bd1c27d5d1fcc7 *README.md +9f1bd2ef6f1343108dfae0fa0d6d9cac *README.md b2370e0e3f63a29557cd8f74746d74f6 *README.Rmd 7ed08f3fb96a77ec01c95c2ad7964250 *revdep/data.sqlite 34952a5944548ea4fc132a9899f8e6ab *revdep/email.yml @@ -1320,15 +1320,15 @@ b2d403f29050e86e8efa021931ef8649 *revdep/README.md 84732d71bac50c96565c4894a24ecc59 *tests/testthat.R 89ff48b08754c7fc927acb5b6691bdb1 *tests/testthat/helper.R 2a4012f9bf99ddc63f745bd8e4f845dc *tests/testthat/local.R -522ea3f8b07f6f4d206ce3fe38f1fbd8 *tests/testthat/test-bybox.R -67192eeb2606380b3c349f08851ef9e6 *tests/testthat/test-byCBSA.R -50d37429e9bf99ad5be17e09d92e16e8 *tests/testthat/test-bycounty.R -19a199f8020db0329fe289a41aa71598 *tests/testthat/test-byMA.R -f7ea691da1baf266047ed7af4b0c4629 *tests/testthat/test-bypqao.R -41e407548ac72ec4f41e678d23a566dd *tests/testthat/test-bysite.R -051416af24d0386f084eb13a14053ce1 *tests/testthat/test-bystate.R -014b81fb9c8d2350e1347841f41b24a3 *tests/testthat/test-helperfunctions.R -e897203bb026b43141e5bc00dfe3cecd *tests/testthat/test-RAQSAPlistfunctions.R +309a8c9de99e4f0c0d5c280cb7583dd6 *tests/testthat/test-bybox.R +635cfa38957358d566d9e5d17057df7b *tests/testthat/test-byCBSA.R +61e14922bc589edf93a461a7fe4112cc *tests/testthat/test-bycounty.R +bfcb21038f480e4e9638486f99b45efa *tests/testthat/test-byMA.R +16213bfccb07c9052826097a6b24407c *tests/testthat/test-bypqao.R +257512f5b5e206aa789cf85fd3f616dd *tests/testthat/test-bysite.R +273dda836db047478bc65a94c7e0a05d *tests/testthat/test-bystate.R +9ac730cce5b9a3d7b4b877512bc4de25 *tests/testthat/test-helperfunctions.R +2391f6b331d4bc3e5e9e6a0b73980eba *tests/testthat/test-RAQSAPlistfunctions.R a55434f85eb9ec8d1c4706997b49cc10 *vignettes/Acknowledgements.html 1798121e142b3da718a2e54435a7ef9a *vignettes/Acknowledgements.Rmd 22d607e5d49e10047a911e5d42183c34 *vignettes/acs-nano.csl diff --git a/R/AQSAPI_helperfunctions.R b/R/AQSAPI_helperfunctions.R index e034720..176a3a9 100644 --- a/R/AQSAPI_helperfunctions.R +++ b/R/AQSAPI_helperfunctions.R @@ -349,7 +349,7 @@ RAQSAPI_error_msg <- function(AQSresponse) #debug msg <- glue("At server request time: {AQSresponse$headers$Date} RAQSAPI experienced an error while processing the following url: - {str_replace_all(AQSresponse$url, pattern='(.)', '\\1_')}\n + {AQSresponse$url} with status_code: {AQSresponse$status_code} and status message: {AQSresponse$status} Server error message: {AQSerr$Header[[1]]$error}") diff --git a/README.md b/README.md index 47a1d4b..bea07e4 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ status](https://www.r-pkg.org/badges/version/RAQSAPI)](https://CRAN.R-project.or downloads](https://cranlogs.r-pkg.org/badges/RAQSAPI)](https://cran.r-project.org/package=RAQSAPI) [![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/#maturing) [![license](https://img.shields.io/badge/license-CC0-lightgrey.svg)](https://choosealicense.com/) -“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--05--15-yellowgreen.svg)](/commits/master)” +“[![Last-changedate](https://img.shields.io/badge/last%20change-%202024--05--23-yellowgreen.svg)](/commits/master)” # EPA Disclaimer diff --git a/tests/testthat/test-RAQSAPlistfunctions.R b/tests/testthat/test-RAQSAPlistfunctions.R index 52e7483..e7ca0ac 100644 --- a/tests/testthat/test-RAQSAPlistfunctions.R +++ b/tests/testthat/test-RAQSAPlistfunctions.R @@ -12,8 +12,8 @@ test_that("list functions", { datamartAPI_user <- AQScredentials$datamartAPI_user datamartAPI_key <- AQScredentials$datamartAPI_key } else { - datamartAPI_user <- Sys.getenv("RAQSAPIKEY", names = TRUE) - datamartAPI_key <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_user <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_key <- Sys.getenv("RAQSAPIKEY", names = TRUE) } RAQSAPI::aqs_credentials(username = datamartAPI_user, key = datamartAPI_key diff --git a/tests/testthat/test-byCBSA.R b/tests/testthat/test-byCBSA.R index 94a45c7..383109f 100644 --- a/tests/testthat/test-byCBSA.R +++ b/tests/testthat/test-byCBSA.R @@ -11,8 +11,8 @@ test_that("byCBSA functions", { datamartAPI_user <- AQScredentials$datamartAPI_user datamartAPI_key <- AQScredentials$datamartAPI_key } else { - datamartAPI_user <- Sys.getenv("RAQSAPIKEY", names = TRUE) - datamartAPI_key <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_user <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_key <- Sys.getenv("RAQSAPIKEY", names = TRUE) } RAQSAPI::aqs_credentials(username = datamartAPI_user, key = datamartAPI_key diff --git a/tests/testthat/test-byMA.R b/tests/testthat/test-byMA.R index 47cb27e..e0e5f2c 100644 --- a/tests/testthat/test-byMA.R +++ b/tests/testthat/test-byMA.R @@ -11,8 +11,8 @@ test_that("byMA functions", { datamartAPI_user <- AQScredentials$datamartAPI_user datamartAPI_key <- AQScredentials$datamartAPI_key } else { - datamartAPI_user <- Sys.getenv("RAQSAPIKEY", names = TRUE) - datamartAPI_key <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_user <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_key <- Sys.getenv("RAQSAPIKEY", names = TRUE) } RAQSAPI::aqs_credentials(username = datamartAPI_user, key = datamartAPI_key diff --git a/tests/testthat/test-bybox.R b/tests/testthat/test-bybox.R index 445206a..61f173c 100644 --- a/tests/testthat/test-bybox.R +++ b/tests/testthat/test-bybox.R @@ -11,8 +11,8 @@ testthat::skip_if_offline() datamartAPI_user <- AQScredentials$datamartAPI_user datamartAPI_key <- AQScredentials$datamartAPI_key } else { - datamartAPI_user <- Sys.getenv("RAQSAPIKEY", names = TRUE) - datamartAPI_key <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_user <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_key <- Sys.getenv("RAQSAPIKEY", names = TRUE) } RAQSAPI::aqs_credentials(username = datamartAPI_user, key = datamartAPI_key diff --git a/tests/testthat/test-bycounty.R b/tests/testthat/test-bycounty.R index 74c8a7e..300297b 100644 --- a/tests/testthat/test-bycounty.R +++ b/tests/testthat/test-bycounty.R @@ -11,8 +11,8 @@ test_that("bycounty functions", { datamartAPI_user <- AQScredentials$datamartAPI_user datamartAPI_key <- AQScredentials$datamartAPI_key } else { - datamartAPI_user <- Sys.getenv("RAQSAPIKEY", names = TRUE) - datamartAPI_key <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_user <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_key <- Sys.getenv("RAQSAPIKEY", names = TRUE) } RAQSAPI::aqs_credentials(username = datamartAPI_user, key = datamartAPI_key diff --git a/tests/testthat/test-bypqao.R b/tests/testthat/test-bypqao.R index 352469f..9662f77 100644 --- a/tests/testthat/test-bypqao.R +++ b/tests/testthat/test-bypqao.R @@ -11,8 +11,8 @@ test_that("bypqao functions", { datamartAPI_user <- AQScredentials$datamartAPI_user datamartAPI_key <- AQScredentials$datamartAPI_key } else { - datamartAPI_user <- Sys.getenv("RAQSAPIKEY", names = TRUE) - datamartAPI_key <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_user <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_key <- Sys.getenv("RAQSAPIKEY", names = TRUE) } RAQSAPI::aqs_credentials(username = datamartAPI_user, key = datamartAPI_key diff --git a/tests/testthat/test-bysite.R b/tests/testthat/test-bysite.R index 9f2c556..23b5d2f 100644 --- a/tests/testthat/test-bysite.R +++ b/tests/testthat/test-bysite.R @@ -11,8 +11,8 @@ test_that("bysite functions", { datamartAPI_user <- AQScredentials$datamartAPI_user datamartAPI_key <- AQScredentials$datamartAPI_key } else { - datamartAPI_user <- Sys.getenv("RAQSAPIKEY", names = TRUE) - datamartAPI_key <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_user <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_key <- Sys.getenv("RAQSAPIKEY", names = TRUE) } RAQSAPI::aqs_credentials(username = datamartAPI_user, key = datamartAPI_key diff --git a/tests/testthat/test-bystate.R b/tests/testthat/test-bystate.R index a9a9383..23212a7 100644 --- a/tests/testthat/test-bystate.R +++ b/tests/testthat/test-bystate.R @@ -12,8 +12,8 @@ test_that("bystate functions", { datamartAPI_user <- AQScredentials$datamartAPI_user datamartAPI_key <- AQScredentials$datamartAPI_key } else { - datamartAPI_user <- Sys.getenv("RAQSAPIKEY", names = TRUE) - datamartAPI_key <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_user <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_key <- Sys.getenv("RAQSAPIKEY", names = TRUE) } RAQSAPI::aqs_credentials(username = datamartAPI_user, key = datamartAPI_key diff --git a/tests/testthat/test-helperfunctions.R b/tests/testthat/test-helperfunctions.R index f5e0f9c..0d49c0c 100644 --- a/tests/testthat/test-helperfunctions.R +++ b/tests/testthat/test-helperfunctions.R @@ -13,8 +13,8 @@ if(file.exists("local.R")) datamartAPI_user <- AQScredentials$datamartAPI_user datamartAPI_key <- AQScredentials$datamartAPI_key } else { - datamartAPI_user <- Sys.getenv("RAQSAPIKEY", names = TRUE) - datamartAPI_key <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_user <- Sys.getenv("RAQSAPIUSERNAME", names = TRUE) + datamartAPI_key <- Sys.getenv("RAQSAPIKEY", names = TRUE) } RAQSAPI::aqs_credentials(username = datamartAPI_user, key = datamartAPI_key