shorten tests

mps9506 · Aug 5, 2018 · 196b106 · 196b106
1 parent de7aa0b
commit 196b106
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/tests/testthat/test-expected_errors.R b/tests/testthat/test-expected_errors.R
@@ -2,7 +2,7 @@ context("core functions return expected errors")
 
 test_that("core functions returns expected errors", {
   expect_error(echoAirGetFacilityInfo(), "No valid arguments supplied")
-  expect_error(echoAirGetFacilityInfo(p_pid = "NC0000003706500036", output = "JSON", verbose = FALSE))
+  expect_error(echoAirGetFacilityInfo(p_pid = "NC0000003706500036", output = "JSON"))
   expect_error(echoGetReports(program = "sdw"))
   expect_error(echoSDWGetSystems())
 

diff --git a/tests/testthat/test-expected_objects.R b/tests/testthat/test-expected_objects.R
@@ -4,7 +4,8 @@ test_that("core functions return tbl_df", {
 
   skip_on_cran()
 
-  x <- echoAirGetFacilityInfo(p_pid = "NC0000003706500036", output = "df", verbose = FALSE)
+  x <- echoAirGetFacilityInfo(p_pid = "NC0000003706500036", output = "df",
+                              qcolumns = "3,4,5")
   expect_s3_class(x, "tbl_df")
 
   x <- echoSDWGetMeta(verbose = FALSE)
@@ -30,7 +31,8 @@ test_that("core functions return tbl_df", {
   x <- echoSDWGetSystems(p_co = "Brazos", p_st = "tx", verbose = FALSE)
   expect_s3_class(x, "tbl_df")
 
-  x <- echoWaterGetFacilityInfo(p_pid = "ALR040033", output = "df", verbose = FALSE)
+  x <- echoWaterGetFacilityInfo(p_pid = "ALR040033", output = "df",
+                                qcolumns = "3,4,5")
   expect_s3_class(x, "tbl_df")
 
   x <- echoWaterGetParams(term = "Oxygen, dissolved")
@@ -39,7 +41,8 @@ test_that("core functions return tbl_df", {
   x <- echoWaterGetParams(code = "00300")
   expect_s3_class(x, "tbl_df")
 
-  x <- echoGetFacilities(program = "cwa", p_pid = "ALR040033", output = "df", verbose = FALSE, qcolumns = "1,2,3")
+  x <- echoGetFacilities(program = "cwa", p_pid = "ALR040033", output = "df",
+                         qcolumns = "1,2,3")
   expect_s3_class(x, "tbl_df")
 
 })