fix name conflict

ropensci · Apr 20, 2016 · 0dc2c84 · 0dc2c84
1 parent 4ba5639
commit 0dc2c84
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/R/match_names.R b/R/match_names.R
@@ -246,7 +246,7 @@ match_names_method_factory <- function(list_name) {
 
 }
 
-match_names_method_factory <- function(.f) {
+match_names_taxon_method_factory <- function(.f) {
     function(tax, row_number, taxon_name, ott_id, ...) {
         extract_tax_list <- match_names_method_factory("taxon")
         tax_info <- extract_tax_list(tax, row_number = row_number,
@@ -295,12 +295,12 @@ match_names_method_factory <- function(.f) {
 ##' }
 ##' @export
 ##' @rdname match_names-methods
-ott_id.match_names <- match_names_method_factory(.tax_ott_id)
+ott_id.match_names <- match_names_taxon_method_factory(.tax_ott_id)
 
 
 ##' @export
 ##' @rdname match_names-methods
-flags.match_names <- match_names_method_factory(.tax_flags)
+flags.match_names <- match_names_taxon_method_factory(.tax_flags)
 
 ##' When querying the Taxonomic Name Resolution Services for a
 ##' particular taxonomic name, the API returns as possible matches all
@@ -339,22 +339,22 @@ flags.match_names <- match_names_method_factory(.tax_flags)
 ##'    synonyms(echino, ott_id=337928)
 ##' }
 ##' @export
-synonyms.match_names <- match_names_method_factory(.tax_synonyms)
+synonyms.match_names <- match_names_taxon_method_factory(.tax_synonyms)
 
 ##' @export
-tax_sources.match_names <- match_names_method_factory(.tax_sources)
+tax_sources.match_names <- match_names_taxon_method_factory(.tax_sources)
 
 ##' @export
-tax_rank.match_names <- match_names_method_factory(.tax_rank)
+tax_rank.match_names <- match_names_taxon_method_factory(.tax_rank)
 
 
 ##' @export
-is_suppressed.match_names <- match_names_method_factory(.tax_is_suppressed)
+is_suppressed.match_names <- match_names_taxon_method_factory(.tax_is_suppressed)
 
 
 ##' @export
-unique_name.match_names <- match_names_method_factory(.tax_unique_name)
+unique_name.match_names <- match_names_taxon_method_factory(.tax_unique_name)
 
 
 ##' @export
-tax_name.match_names <- match_names_method_factory(.tax_name)
+tax_name.match_names <- match_names_taxon_method_factory(.tax_name)
diff --git a/tests/testthat/test-match_names.R b/tests/testthat/test-match_names.R
@@ -177,7 +177,8 @@ test_that("synonyms", {
     skip_on_cran()
     tt <- synonyms(rsp)
     expect_true(inherits(tt, "list"))
-    expect_equal(names(tt), tax_rsp)
+    expect_equal(names(tt),
+                 c("Holothuria", "Diadema (genus in Holozoa)", "Fromia"))
 })
 
 
@@ -216,7 +217,8 @@ test_that("synonyms", {
     skip_on_cran()
     tt <- synonyms(rsp_na)
     expect_true(inherits(tt, "list"))
-    expect_equal(names(tt), tax_rsp)
+    expect_equal(names(tt),
+                 c("Holothuria", "Diadema (genus in Holozoa)", "Fromia"))
 })