From 2c6998835d41ab687081a24871f338be77bd1a39 Mon Sep 17 00:00:00 2001 From: temi Date: Mon, 20 May 2024 09:58:24 +1000 Subject: [PATCH] #951 - fixed a logic flaw --- .../au/org/ala/ecodata/SpeciesReMatchService.groovy | 2 +- .../au/org/ala/ecodata/SpeciesReMatchServiceSpec.groovy | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/grails-app/services/au/org/ala/ecodata/SpeciesReMatchService.groovy b/grails-app/services/au/org/ala/ecodata/SpeciesReMatchService.groovy index b7fb38aad..d02361bc5 100644 --- a/grails-app/services/au/org/ala/ecodata/SpeciesReMatchService.groovy +++ b/grails-app/services/au/org/ala/ecodata/SpeciesReMatchService.groovy @@ -93,7 +93,7 @@ class SpeciesReMatchService { Map searchByName (String name, boolean addDetails = false, boolean useVernacularSearch = false ) { Map result - if (useVernacularSearch) + if (!useVernacularSearch) result = searchNameMatchingServer(name) else result = searchByVernacularNameOnNameMatchingServer(name) diff --git a/src/test/groovy/au/org/ala/ecodata/SpeciesReMatchServiceSpec.groovy b/src/test/groovy/au/org/ala/ecodata/SpeciesReMatchServiceSpec.groovy index 09dbddcde..159c70f22 100644 --- a/src/test/groovy/au/org/ala/ecodata/SpeciesReMatchServiceSpec.groovy +++ b/src/test/groovy/au/org/ala/ecodata/SpeciesReMatchServiceSpec.groovy @@ -97,7 +97,7 @@ class SpeciesReMatchServiceSpec extends Specification implements ServiceUnitTest "noIssue" ] ] - service.webService.getJson(_) >> resp + service.webService.getJson({it.contains("search?q=")}) >> resp when: def result = service.searchByName("name") @@ -109,7 +109,7 @@ class SpeciesReMatchServiceSpec extends Specification implements ServiceUnitTest def result2 = service.searchByName("name") then: - service.webService.getJson(_) >> resp + service.webService.getJson({it.contains("search?q=")}) >> resp result2 == [ scientificName: "Red", commonName: null, @@ -122,7 +122,7 @@ class SpeciesReMatchServiceSpec extends Specification implements ServiceUnitTest def result3 = service.searchByName("name", false, true) then: - service.webService.getJson(_) >> resp + service.webService.getJson({it.contains("searchByVernacularName")}) >> resp result3 == [ scientificName: "Red", commonName: null,