[med-svn] [r-cran-ritis] 01/05: New upstream version 0.7.0

Andreas Tille tille at debian.org
Thu Nov 9 13:41:17 UTC 2017


This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository r-cran-ritis.

commit 2edf95727422076bfadf9ed4456c96743c85b34b
Author: Andreas Tille <tille at debian.org>
Date:   Thu Nov 9 14:20:36 2017 +0100

    New upstream version 0.7.0
---
 DESCRIPTION                          |  12 ++++++------
 MD5                                  |  33 +++++++++++++++++----------------
 NEWS.md                              |   9 +++++++++
 R/itis_facet.R                       |  12 ++++++++----
 R/itis_group.R                       |  13 +++++++++----
 R/itis_highlight.R                   |  12 ++++++++----
 R/itis_search.R                      |  17 +++++++++++++----
 R/onload.R                           |   6 ++++++
 R/solr.R                             |  16 ++++++++--------
 R/zzz.R                              |   6 ++++++
 build/vignette.rds                   | Bin 208 -> 208 bytes
 man/itis_facet.Rd                    |  12 ++++++++++--
 man/itis_group.Rd                    |  12 ++++++++++--
 man/itis_highlight.Rd                |  12 ++++++++++--
 man/itis_search.Rd                   |  12 ++++++++++--
 man/solr.Rd                          |  13 +++++++------
 tests/testthat/test-itis_facet.R     |   6 ++++--
 tests/testthat/test-itis_highlight.R |  13 +++++++------
 18 files changed, 148 insertions(+), 68 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 4d35906..9f94d95 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -2,22 +2,22 @@ Package: ritis
 Title: Integrated Taxonomic Information System Client
 Description: An interface to the Integrated Taxonomic Information System ('ITIS')
     (<https://www.itis.gov>). Includes functions to work with the 'ITIS' REST
-    API methods (<https://www.itis.gov/ws_description.html>), as well as the
+    'API' methods (<https://www.itis.gov/ws_description.html>), as well as the
     'Solr' web service (<https://www.itis.gov/solr_documentation.html>).
-Version: 0.6.0
+Version: 0.7.0
 License: MIT + file LICENSE
 URL: https://github.com/ropensci/ritis
 BugReports: https://github.com/ropensci/ritis/issues
 Authors at R: c(person("Scott", "Chamberlain", role = c("aut", "cre"),
     email = "myrmecocystus at gmail.com"))
 VignetteBuilder: knitr
-Imports: solrium (>= 0.3.0), crul (>= 0.3.8), jsonlite (>= 0.9.22),
-        data.table (>= 1.9.6), tibble (>= 1.0)
+Imports: solrium (>= 1.0.0), crul (>= 0.4.0), jsonlite (>= 1.5),
+        data.table (>= 1.9.6), tibble (>= 1.3.4)
 Suggests: roxygen2 (>= 6.0.1), testthat, knitr
 RoxygenNote: 6.0.1
 NeedsCompilation: no
-Packaged: 2017-09-27 05:34:59 UTC; sacmac
+Packaged: 2017-11-02 22:24:33 UTC; sacmac
 Author: Scott Chamberlain [aut, cre]
 Maintainer: Scott Chamberlain <myrmecocystus at gmail.com>
 Repository: CRAN
-Date/Publication: 2017-09-27 20:35:53 UTC
+Date/Publication: 2017-11-03 12:20:09 UTC
diff --git a/MD5 b/MD5
index fead52b..2bfe8e4 100644
--- a/MD5
+++ b/MD5
@@ -1,7 +1,7 @@
-2f881dfd2a7faeba4170e4b8b5481c9d *DESCRIPTION
+c9bf29ab781edacc3ce92f248e42e004 *DESCRIPTION
 c5af52351472a750055a760a8924ce71 *LICENSE
 f190feff6fed516a9a30de61c46237fb *NAMESPACE
-7736067eb235d8c3507ef1e9b73dfacc *NEWS.md
+e0362e855353a1830b14d444a293b0fb *NEWS.md
 74410f0479c425f47a87e7e4e9e11568 *R/accepted_names.R
 ca9e4b76afebbbe08150094095a04de4 *R/any_match_count.R
 2798e9e20801bc91e54ec6c42f7f5720 *R/comment_detail.R
@@ -18,14 +18,15 @@ c28b73d93a3f0396452ea0cd9e5208c5 *R/experts.R
 6366f584c43f834dca6ae479beb04a6c *R/geographic_values.R
 4ae3bea1b347fe0434115b340a5fa25c *R/global_species_completeness.R
 d62168a72cc1c63ecd577e1ef3ff0fc2 *R/hierarchy.R
-02cb6e662cd49f628d091e5014f9cf30 *R/itis_facet.R
-4ec641f6a5c7bc03de5cf1304c445a36 *R/itis_group.R
-531bc11230cac9ad23318c3164fe7f80 *R/itis_highlight.R
-4bb7de6788bb27d73e228e305042bdf8 *R/itis_search.R
+07fb2b26ce20174fdc16b49569e85668 *R/itis_facet.R
+393fa3195d513b0c8a5e908b6b16c105 *R/itis_group.R
+48893248bc5321fa84c77da4dfa58fea *R/itis_highlight.R
+b46d36af9ba34cc0cffdc91ec218862a *R/itis_search.R
 c122cb71976d24a9dacc7c3a18dcca87 *R/jurisdiction.R
 9a1bd0aa0a4c47ad17265a3e714facc3 *R/kingdoms.R
 5562fe5b96733bfd8aa169b65b77f357 *R/last_change_date.R
 1489aba816debc43c183068bac05c612 *R/lsid2tsn.R
+991d5518f53538a1bc9611c8338a4e5a *R/onload.R
 c295b8b74dfafa2ba5edc189fd4fa551 *R/other_sources.R
 ae4cb35f12886fe6ad8aff201e30ebb5 *R/parent_tsn.R
 6a155b0a7288f3113c0b5bfcaf67af68 *R/publications.R
@@ -39,7 +40,7 @@ adfbba5223b9cd14841ab1f78f497cbf *R/search_any_match_paged.R
 4aff10fa25c21da56d5e844b78456afa *R/search_anymatch.R
 6d9b707d24a4deaec5cad9e8f4c1ca72 *R/search_common.R
 06ca45f837150df59d9f28261716ee50 *R/search_scientific.R
-d4bc1c873805bab04c7e0f66eea6f88c *R/solr.R
+dfead5cf85ca3c37aec06b16991c854b *R/solr.R
 af838c0db478551cdb3477181dbf501a *R/synonym_names.R
 73b04e7b055f9379a3300ac926c30c63 *R/taxon_authorship.R
 c813a41b2ec7f5f896d6b1c2ac561f31 *R/terms.R
@@ -48,9 +49,9 @@ c97573e0c0656ec6e8783ec062b654f4 *R/tsn_by_vernacular_language.R
 646d9b37cbb94549d22e6319b4f3b73e *R/unacceptability_reason.R
 2e07efe5b6307ce0429108512180467b *R/usage.R
 0de47bbe5d47656743847efc327eec80 *R/vernacular_languages.R
-7ff81d15f578cd6d5d84aafa5adf5534 *R/zzz.R
+efc39dccf1425d5f8a3e2618ef8b2661 *R/zzz.R
 e909169c0268918e5ad4de7c13e40aed *README.md
-faa7ebd652266cd770ce46ff6cd9f7c3 *build/vignette.rds
+4367ec7cd86f59ef0df494a1616eaab2 *build/vignette.rds
 9e0a7a3907c8fe78e848f173265e6260 *inst/doc/ritis_vignette.Rmd
 9eb3081bad62974cb4df49627f05dfb4 *inst/doc/ritis_vignette.html
 b5fc1b86f9d86ee10387c0ee4d6cf0f7 *inst/vign/ritis_vignette.Rmd
@@ -71,10 +72,10 @@ e894281f6185ff19b71348a8218319e5 *man/experts.Rd
 b40dde847702309abaa021810b79f8d0 *man/geographic_values.Rd
 e22bc6fbd5ce7c0d3e24aef38196e6a8 *man/global_species_completeness.Rd
 2d955fa84b9083d4dff2340e52647b55 *man/hierarchy.Rd
-4611e6b3883a18725111ee0f4da209d8 *man/itis_facet.Rd
-863025397e09c419b88e4a5d107156cc *man/itis_group.Rd
-2c3787b7587d084e6850b1ed3d193969 *man/itis_highlight.Rd
-9f5329ac82b40e1c9a36fe22168ecee0 *man/itis_search.Rd
+12bb244f41c5ed7e5ed42ec6039f209e *man/itis_facet.Rd
+4c6c51e3237e50a589a4e7039df7199f *man/itis_group.Rd
+b5fcc9d2d5871fe960f7252f364aa79f *man/itis_highlight.Rd
+7c0a10382898fe6d991fa819d79117ef *man/itis_search.Rd
 0d2b5dbe219ece066e73f4a1448df23e *man/jurisdiction.Rd
 3b24d916468554786a89b7239238676d *man/kingdoms.Rd
 aaa3237126fd53202cab9604be9c426e *man/last_change_date.Rd
@@ -92,7 +93,7 @@ f9903631109208b6d8e0ecd29916b96f *man/search_any_match_paged.Rd
 6a52c7b7a0219685bc624e13d667a653 *man/search_anymatch.Rd
 07c2b60c86cdbb7f07ae9ef0471c122d *man/search_common.Rd
 b9f2eb978b2ed794f4e4cfcb4ca10060 *man/search_scientific.Rd
-be22e8c42c7deaff439e663559f809e4 *man/solr.Rd
+8506ba065229c0a47e8e3f83fac89a94 *man/solr.Rd
 f5adf95f0cef804e6d89644ca192c522 *man/synonym_names.Rd
 39bf9901a673fd9292cef751653d16c9 *man/taxon_authorship.Rd
 501020759b9f5f328c378e5e109e5b9d *man/terms.Rd
@@ -105,9 +106,9 @@ f8a48aa42210f6e5ef37725e8b875ff1 *man/vernacular_languages.Rd
 6de6bfda4529c5811788f56ef88d257b *tests/testthat/helper.R
 16d6cb8e540be05d6dd4b9c38b1dc29c *tests/testthat/test-any_match_count.R
 fe3efb1dc47b16fcc31016d5fbbb899f *tests/testthat/test-hierarchy.R
-40830184ec4355aeba4c067f2af3ec86 *tests/testthat/test-itis_facet.R
+9fbd19b29c97b3e699b1f098227a5cf0 *tests/testthat/test-itis_facet.R
 8f0cc9f23a1b5d1d63e57c5b79102f19 *tests/testthat/test-itis_group.R
-7b947d7b545d2ea498fe387b0fd8cfef *tests/testthat/test-itis_highlight.R
+db34802164dd07e259d73716dd1a8887 *tests/testthat/test-itis_highlight.R
 b8d1e69d7cf3eec4ffa405bb73f3773a *tests/testthat/test-itis_search.R
 1f9a7d5cae81492d825c0b80407aafa4 *tests/testthat/test-jurisdiction.R
 6c7c1dc2a53bce55306459126d9236b4 *tests/testthat/test-kingdoms.R
diff --git a/NEWS.md b/NEWS.md
index c7a8325..dc4c0cf 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,12 @@
+ritis 0.7.0
+===========
+
+### NEW FEATURES
+
+* Now using new version of `solrium` package - users shouldn't
+see any differences (#9)
+
+
 ritis 0.6.0
 ===========
 
diff --git a/R/itis_facet.R b/R/itis_facet.R
index d7e6f9a..87b0222 100644
--- a/R/itis_facet.R
+++ b/R/itis_facet.R
@@ -1,7 +1,9 @@
 #' ITIS Solr facet
 #'
 #' @export
-#' @param ... Args passed to \code{\link[solrium]{solr_facet}}
+#' @param ... Arguments passed on to the `params` parameter of
+#' the [solrium::solr_facet()] function
+#' @inheritParams itis_search
 #' @examples \dontrun{
 #' itis_facet(q = "rank:Species", rows = 0, facet.field = "kingdom")$facet_fields
 #'
@@ -10,7 +12,9 @@
 #'    rows = 0)
 #' head(x$facet_pivot$`nameWInd,vernacular`)
 #' }
-itis_facet <- function(...) {
-  invisible(solrium::solr_connect(url = itis_solr_url()))
-  solrium::solr_facet(...)
+itis_facet <- function(..., proxy = NULL, callopts=list()) {
+  if (!is.null(proxy)) conn_dc <- make_itis_conn(proxy)
+  args <- list(...)
+	if (!is.null(args$fl)) args$fl <- paste(args$fl, collapse = ",")
+  conn_itis$facet(params = args, callopts = callopts)
 }
diff --git a/R/itis_group.R b/R/itis_group.R
index 864f6f1..a6343ad 100644
--- a/R/itis_group.R
+++ b/R/itis_group.R
@@ -1,13 +1,18 @@
 #' ITIS Solr group search
 #'
 #' @export
-#' @param ... Args passed to \code{\link[solrium]{solr_group}}
+#' @param ... Arguments passed on to the `params` parameter of
+#' the [solrium::solr_group()] function
+#' @inheritParams itis_search
 #' @examples \dontrun{
 #' x <- itis_group(q = "nameWOInd:/[A-Za-z0-9]*[%20]{1,1}[A-Za-z0-9]*/",
 #'    group.field = 'rank', group.limit = 3)
 #' head(x)
 #' }
-itis_group <- function(...) {
-  invisible(solrium::solr_connect(url = itis_solr_url()))
-  solrium::solr_group(...)
+itis_group <- function(..., proxy = NULL, callopts=list()) {
+
+  if (!is.null(proxy)) conn_dc <- make_itis_conn(proxy)
+  args <- list(...)
+	if (!is.null(args$fl)) args$fl <- paste(args$fl, collapse = ",")
+  conn_itis$group(params = args, callopts = callopts)
 }
diff --git a/R/itis_highlight.R b/R/itis_highlight.R
index 12d3828..61f6a94 100644
--- a/R/itis_highlight.R
+++ b/R/itis_highlight.R
@@ -1,11 +1,15 @@
 #' ITIS Solr highlight
 #'
 #' @export
-#' @param ... Args passed to \code{\link[solrium]{solr_highlight}}
+#' @param ... Arguments passed on to the `params` parameter of
+#' the [solrium::solr_highlight()] function
+#' @inheritParams itis_search
 #' @examples \dontrun{
 #' itis_highlight(q = "rank:Species", hl.fl = 'rank', rows=10)
 #' }
-itis_highlight <- function(...) {
-  invisible(solrium::solr_connect(url = itis_solr_url()))
-  solrium::solr_highlight(...)
+itis_highlight <- function(..., proxy = NULL, callopts=list()) {
+  if (!is.null(proxy)) conn_dc <- make_itis_conn(proxy)
+  args <- list(...)
+	if (!is.null(args$fl)) args$fl <- paste(args$fl, collapse = ",")
+  conn_itis$highlight(params = args, callopts = callopts)
 }
diff --git a/R/itis_search.R b/R/itis_search.R
index ad60a0d..1ca6983 100644
--- a/R/itis_search.R
+++ b/R/itis_search.R
@@ -1,7 +1,13 @@
 #' ITIS Solr search
 #'
 #' @export
-#' @param ... Args passed to \code{\link[solrium]{solr_search}}
+#' @param ... Arguments passed on to the `params` parameter of
+#' the [solrium::solr_search()] function
+#' @param proxy List of arguments for a proxy connection,
+#' including one or more of: url, port, username, password,
+#' and auth. See [crul::proxy()] for  help, which is used to
+#' construct the proxy connection.
+#' @param callopts Curl options passed on to [crul::HttpClient]
 #' @examples \dontrun{
 #' itis_search(q = "tsn:182662")
 #'
@@ -23,7 +29,10 @@
 #' itis_search(q = "nameWOInd:/[A-Za-z0-9]*[%20]{0,0}*/",
 #'    fl = c('nameWInd', 'tsn'))
 #' }
-itis_search <- function(...) {
-  invisible(solrium::solr_connect(url = itis_solr_url()))
-  solrium::solr_search(...)
+itis_search <- function(..., proxy = NULL, callopts=list()) {
+  if (!is.null(proxy)) conn_dc <- make_itis_conn(proxy)
+  args <- list(...)
+	if (!is.null(args$fl)) args$fl <- paste(args$fl, collapse = ",")
+  conn_itis$search(params = args, minOptimizedRows = FALSE,
+  	callopts = callopts)
 }
diff --git a/R/onload.R b/R/onload.R
new file mode 100644
index 0000000..620b7f4
--- /dev/null
+++ b/R/onload.R
@@ -0,0 +1,6 @@
+conn_itis <- NULL
+.onLoad <- function(libname, pkgname){
+	x <- solrium::SolrClient$new(host = "services.itis.gov",
+		scheme = "https", port = NULL, errors = "complete")
+  conn_itis <<- x
+}
diff --git a/R/solr.R b/R/solr.R
index 03ea4a7..40cf4b5 100644
--- a/R/solr.R
+++ b/R/solr.R
@@ -1,16 +1,16 @@
 #' ITIS Solr Methods
 #'
 #' ITIS provides access to their data via their Solr service described at
-#' \url{http://www.itis.gov/solr_documentation.html}.  This is a powerful
-#' interace to ITIS data as you have access to a very flexible query interface.
+#' <https://www.itis.gov/solr_documentation.html>.  This is a powerful
+#' interace to ITIS data as you have access to a very flexible query
+#' interface.
 #'
 #' @section Functions:
-#' \itemize{
-#'  \item \code{\link{itis_search}} - Search
-#'  \item \code{\link{itis_group}} - Group
-#'  \item \code{\link{itis_highlight}} - Highlight
-#'  \item \code{\link{itis_facet}} - Facet
-#' }
+#'
+#'  - [itis_search()] - Search
+#'  - [itis_group()] - Group
+#'  - [itis_highlight()] - Highlight
+#'  - [itis_facet()] - Facet
 #'
 #' @name solr
 NULL
diff --git a/R/zzz.R b/R/zzz.R
index 1a91407..083b04b 100644
--- a/R/zzz.R
+++ b/R/zzz.R
@@ -100,3 +100,9 @@ pick_cols.list <- function(x, nms) {
     NULL
   }
 }
+
+make_itis_conn <- function(proxy) {
+  solrium::SolrClient$new(host = "services.itis.gov",
+    scheme = "https", port = NULL, errors = "complete",
+    proxy = proxy)
+}
diff --git a/build/vignette.rds b/build/vignette.rds
index f65562a..d15b1d7 100644
Binary files a/build/vignette.rds and b/build/vignette.rds differ
diff --git a/man/itis_facet.Rd b/man/itis_facet.Rd
index e2f426f..f4f062e 100644
--- a/man/itis_facet.Rd
+++ b/man/itis_facet.Rd
@@ -4,10 +4,18 @@
 \alias{itis_facet}
 \title{ITIS Solr facet}
 \usage{
-itis_facet(...)
+itis_facet(..., proxy = NULL, callopts = list())
 }
 \arguments{
-\item{...}{Args passed to \code{\link[solrium]{solr_facet}}}
+\item{...}{Arguments passed on to the \code{params} parameter of
+the \code{\link[solrium:solr_facet]{solrium::solr_facet()}} function}
+
+\item{proxy}{List of arguments for a proxy connection,
+including one or more of: url, port, username, password,
+and auth. See \code{\link[crul:proxy]{crul::proxy()}} for  help, which is used to
+construct the proxy connection.}
+
+\item{callopts}{Curl options passed on to \link[crul:HttpClient]{crul::HttpClient}}
 }
 \description{
 ITIS Solr facet
diff --git a/man/itis_group.Rd b/man/itis_group.Rd
index b23ebd9..d73f6db 100644
--- a/man/itis_group.Rd
+++ b/man/itis_group.Rd
@@ -4,10 +4,18 @@
 \alias{itis_group}
 \title{ITIS Solr group search}
 \usage{
-itis_group(...)
+itis_group(..., proxy = NULL, callopts = list())
 }
 \arguments{
-\item{...}{Args passed to \code{\link[solrium]{solr_group}}}
+\item{...}{Arguments passed on to the \code{params} parameter of
+the \code{\link[solrium:solr_group]{solrium::solr_group()}} function}
+
+\item{proxy}{List of arguments for a proxy connection,
+including one or more of: url, port, username, password,
+and auth. See \code{\link[crul:proxy]{crul::proxy()}} for  help, which is used to
+construct the proxy connection.}
+
+\item{callopts}{Curl options passed on to \link[crul:HttpClient]{crul::HttpClient}}
 }
 \description{
 ITIS Solr group search
diff --git a/man/itis_highlight.Rd b/man/itis_highlight.Rd
index afaf7e1..39fff61 100644
--- a/man/itis_highlight.Rd
+++ b/man/itis_highlight.Rd
@@ -4,10 +4,18 @@
 \alias{itis_highlight}
 \title{ITIS Solr highlight}
 \usage{
-itis_highlight(...)
+itis_highlight(..., proxy = NULL, callopts = list())
 }
 \arguments{
-\item{...}{Args passed to \code{\link[solrium]{solr_highlight}}}
+\item{...}{Arguments passed on to the \code{params} parameter of
+the \code{\link[solrium:solr_highlight]{solrium::solr_highlight()}} function}
+
+\item{proxy}{List of arguments for a proxy connection,
+including one or more of: url, port, username, password,
+and auth. See \code{\link[crul:proxy]{crul::proxy()}} for  help, which is used to
+construct the proxy connection.}
+
+\item{callopts}{Curl options passed on to \link[crul:HttpClient]{crul::HttpClient}}
 }
 \description{
 ITIS Solr highlight
diff --git a/man/itis_search.Rd b/man/itis_search.Rd
index 3c0e700..ab157e4 100644
--- a/man/itis_search.Rd
+++ b/man/itis_search.Rd
@@ -4,10 +4,18 @@
 \alias{itis_search}
 \title{ITIS Solr search}
 \usage{
-itis_search(...)
+itis_search(..., proxy = NULL, callopts = list())
 }
 \arguments{
-\item{...}{Args passed to \code{\link[solrium]{solr_search}}}
+\item{...}{Arguments passed on to the \code{params} parameter of
+the \code{\link[solrium:solr_search]{solrium::solr_search()}} function}
+
+\item{proxy}{List of arguments for a proxy connection,
+including one or more of: url, port, username, password,
+and auth. See \code{\link[crul:proxy]{crul::proxy()}} for  help, which is used to
+construct the proxy connection.}
+
+\item{callopts}{Curl options passed on to \link[crul:HttpClient]{crul::HttpClient}}
 }
 \description{
 ITIS Solr search
diff --git a/man/solr.Rd b/man/solr.Rd
index 1335d0e..d355e1d 100644
--- a/man/solr.Rd
+++ b/man/solr.Rd
@@ -5,16 +5,17 @@
 \title{ITIS Solr Methods}
 \description{
 ITIS provides access to their data via their Solr service described at
-\url{http://www.itis.gov/solr_documentation.html}.  This is a powerful
-interace to ITIS data as you have access to a very flexible query interface.
+\url{https://www.itis.gov/solr_documentation.html}.  This is a powerful
+interace to ITIS data as you have access to a very flexible query
+interface.
 }
 \section{Functions}{
 
 \itemize{
-\item \code{\link{itis_search}} - Search
-\item \code{\link{itis_group}} - Group
-\item \code{\link{itis_highlight}} - Highlight
-\item \code{\link{itis_facet}} - Facet
+\item \code{\link[=itis_search]{itis_search()}} - Search
+\item \code{\link[=itis_group]{itis_group()}} - Group
+\item \code{\link[=itis_highlight]{itis_highlight()}} - Highlight
+\item \code{\link[=itis_facet]{itis_facet()}} - Facet
 }
 }
 
diff --git a/tests/testthat/test-itis_facet.R b/tests/testthat/test-itis_facet.R
index 14d9565..329efd1 100644
--- a/tests/testthat/test-itis_facet.R
+++ b/tests/testthat/test-itis_facet.R
@@ -20,7 +20,9 @@ test_that("itis_facet basic functionality works", {
 test_that("itis_facet fails well", {
   skip_on_cran()
 
-  expect_null(sm(itis_facet(foo = "bar")))
+  expect_error(itis_facet(foo = "bar"),
+    "didn't detect any facet. fields")
 
-  expect_error(sm(itis_facet(wt = "asdfaddf")))
+  expect_error(itis_facet(wt = "asdfaddf"),
+    "wt must be one of")
 })
diff --git a/tests/testthat/test-itis_highlight.R b/tests/testthat/test-itis_highlight.R
index 8271d01..3781f01 100644
--- a/tests/testthat/test-itis_highlight.R
+++ b/tests/testthat/test-itis_highlight.R
@@ -5,17 +5,18 @@ test_that("itis_highlight basic functionality works", {
 
   aa <- sm(itis_highlight(q = "rank:Species", hl.fl = 'rank', rows = 10))
 
-  expect_is(aa, "list")
-  expect_is(aa[[1]], "list")
-  expect_is(aa[[1]][[1]], "character")
-  expect_named(aa[[1]], "rank")
+  expect_is(aa, "tbl_df")
+  expect_is(aa$rank[1], "character")
+  expect_is(aa$names[1], "character")
+  expect_named(aa, c("names", "rank"))
 })
 
 test_that("itis_highlight fails well", {
   skip_on_cran()
 
   expect_error(sm(itis_highlight(foo = "bar")),
-               "unused argument")
+               "some keys not in acceptable set")
 
-  expect_error(sm(itis_highlight(wt = "asdfaddf")))
+  expect_error(sm(itis_highlight(wt = "asdfaddf")),
+    "wt must be one of")
 })

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-ritis.git



More information about the debian-med-commit mailing list