Skip to content

Commit

Permalink
tests improvement
Browse files Browse the repository at this point in the history
  • Loading branch information
sckott committed Nov 2, 2015
1 parent a50e3ce commit dbab6d6
Show file tree
Hide file tree
Showing 7 changed files with 93 additions and 14 deletions.
2 changes: 1 addition & 1 deletion pygbif/registry/datasets.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def datasets(data = 'all', type = None, uuid = None, query = None, id = None,
>>> registry.datasets(data=['deleted','duplicate'])
>>> registry.datasets(data=['deleted','duplicate'], limit=1)
'''
args = {'q': query, 'limit': limit, 'offset': start}
args = {'q': query, 'type': type, 'limit': limit, 'offset': start}
data_choices = ['all', 'organization', 'contact', 'endpoint',
'identifier', 'tag', 'machinetag', 'comment',
'constituents', 'document', 'metadata', 'deleted',
Expand Down
14 changes: 7 additions & 7 deletions test/test-occurrences-count.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,46 +25,46 @@
u'2000']

def test_count():
"Basic test of occurrences.count"
"occurrences.count - basic test"
res = occurrences.count(taxonKey = 3329049)
assert int == res.__class__

def test_count_basisofrecord():
"Basic test of occurrences.count_basisofrecord"
"occurrences.count_basisofrecord - basic test"
res = occurrences.count_basisofrecord()
assert dict == res.__class__
assert 9 == len(res)
assert brecord_res == res.keys()

def test_count_year():
"Basic test of occurrences.count_year"
"occurrences.count_year - basic test"
res = occurrences.count_year(year = '1990,2000')
assert dict == res.__class__
assert 11 == len(res)
assert year_res == res.keys()

def test_count_datasets():
"Basic test of occurrences.count_datasets"
"occurrences.count_datasets - basic test"
res = occurrences.count_datasets(country = "DE")
assert dict == res.__class__
assert unicode == res.keys()[0].__class__

def test_count_countries():
"Basic test of occurrences.count_countries"
"occurrences.count_countries - basic test"
res = occurrences.count_countries(publishingCountry = "DE")
assert dict == res.__class__
assert unicode == res.keys()[0].__class__
assert int == res.values()[0].__class__

def test_count_schema():
"Basic test of occurrences.count_schema"
"occurrences.count_schema - basic test"
res = occurrences.count_schema()
assert list == res.__class__
assert dict == res[0].__class__
assert "dimensions" == res[0].keys()[0]

def test_count_publishingcountries():
"Basic test of occurrences.count_publishingcountries"
"occurrences.count_publishingcountries - basic test"
res = occurrences.count_publishingcountries(country = "DE")
assert dict == res.__class__
assert unicode == res.keys()[0].__class__
Expand Down
6 changes: 3 additions & 3 deletions test/test-occurrences-get.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
from pygbif import occurrences

def test_get():
"Basic test of occurrences.get"
"occurrences.get - basic test"
res = occurrences.get(taxonKey = 252408386)
assert 'dict' == res.__class__.__name__
assert 30 == len(res)
assert 252408386 == res['key']

def test_get_verbatim():
"Basic test of occurrences.get_verbatim"
"occurrences.get_verbatim - basic test"
res = occurrences.get_verbatim(taxonKey = 252408386)
assert 'dict' == res.__class__.__name__
assert 24 == len(res)
assert 252408386 == res['key']

def test_get_fragment():
"Basic test of occurrences.get_fragment"
"occurrences.get_fragment - basic test"
res = occurrences.get_fragment(taxonKey = 1052909293)
assert 'dict' == res.__class__.__name__
assert 41 == len(res)
Expand Down
6 changes: 3 additions & 3 deletions test/test-occurrences-search.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
from pygbif import occurrences

def test_search():
"Basic test of occurrences.search"
"occurrences.search - basic test"
res = occurrences.search(taxonKey = 3329049)
assert 'dict' == res.__class__.__name__
assert 5 == len(res)
assert [u'count', u'endOfRecords', u'limit', u'results', u'offset'] == res.keys()

def test_search_():
"Basic test of occurrences.search"
"occurrences.search - diff taxonKey"
res = occurrences.search(taxonKey = 252408386)
assert 'dict' == res.__class__.__name__
assert 24 == len(res)
assert 252408386 == res['key']

def test_search_():
"Basic test of occurrences.search"
"occurrences.search - diff taxonKey2"
res = occurrences.search(taxonKey = 1052909293)
assert 'dict' == res.__class__.__name__
assert 5 == len(res)
39 changes: 39 additions & 0 deletions test/test-registry-datasets.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
"""Tests for registry module - datasets methods"""
import os
from pygbif import registry

def test_datasets():
"registry.datasets - basic test"
res = registry.datasets()
assert dict == res.__class__

def test_datasets_limit():
"registry.datasets - limit param"
res = registry.datasets(limit=1)
assert dict == res.__class__
assert 1 == len(res['results'])

res = registry.datasets(limit=3)
assert dict == res.__class__
assert 3 == len(res['results'])

def test_datasets_type():
"registry.datasets - type param"
res = registry.datasets(type="OCCURRENCE")
vv = [ x['type'] for x in res['results'] ]
assert dict == res.__class__
assert 100 == len(res['results'])
assert 'OCCURRENCE' == list(set(vv))[0]

def test_dataset_metrics():
"registry.dataset_metrics - basic test"
res = registry.dataset_metrics(uuid='3f8a1297-3259-4700-91fc-acc4170b27ce')
assert dict == res.__class__
assert 19 == len(res)

def test_dataset_metrics_multiple_uuids():
"registry.dataset_metrics - multiple uuids"
uuids = ['3f8a1297-3259-4700-91fc-acc4170b27ce', '66dd0960-2d7d-46ee-a491-87b9adcfe7b1']
res = registry.dataset_metrics(uuids)
assert list == res.__class__
assert 2 == len(res)
23 changes: 23 additions & 0 deletions test/test-registry-nodes.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# """Tests for registry module - nodes methods"""
# import os
# from pygbif import registry

# def test_nodes():
# "Basic test of registry.nodes"
# res = registry.nodes()
# assert 'dict' == res.__class__.__name__
# assert 5 == len(res)
# assert [u'count', u'endOfRecords', u'limit', u'results', u'offset'] == res.keys()

# def test_nodes_limit():
# "limit param in registry.nodes"
# res = registry.nodes(limit=5)
# assert 'dict' == res.__class__.__name__
# assert 24 == len(res)
# assert 252408386 == res['key']

# def test_nodes_return():
# "data param in registry.nodes"
# res = registry.nodes(taxonKey = 1052909293)
# assert 'dict' == res.__class__.__name__
# assert 5 == len(res)
17 changes: 17 additions & 0 deletions test/test-species-name_backbone.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
"""Tests for species module - name_backbone methods"""
import os
from pygbif import species

def test_name_backbone():
"species.name_backbone - basic test"
res = species.name_backbone(name='Helianthus annuus')
assert dict == res.__class__
assert 22 == len(res)
assert 'Helianthus annuus' == res['species']

def test_name_backbone_multiple_matches():
"species.name_backbone - multiple matches"
res = species.name_backbone(name='Aso')
assert dict == res.__class__
assert 4 == len(res)
assert 'Multiple equal matches for Aso' == res['note']

0 comments on commit dbab6d6

Please sign in to comment.